[ignite-3] branch main updated: IGNITE-17223 Fixed indeterminate unit test results due to order dependencies. Fixes #888

[sk0x50]

This is an automated email from the ASF dual-hosted git repository.

sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 81851d38f IGNITE-17223 Fixed indeterminate unit test results due to 
order dependencies. Fixes #888
81851d38f is described below

commit 81851d38f6197ea414552148d9db372c09b43eb8
Author: Kaiyao Ke <47203510+kaiya...@users.noreply.github.com>
AuthorDate: Wed Jul 6 01:11:47 2022 +0300

    IGNITE-17223 Fixed indeterminate unit test results due to order 
dependencies. Fixes #888
    
    Signed-off-by: Slava Koptilin <slava.kopti...@gmail.com>
---
 .../ignite/cli/commands/cliconfig/CliConfigSubCommandTest.java       | 5 ++---
 .../org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java     | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSubCommandTest.java
 
b/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSubCommandTest.java
index 635badfc1..b5e979e6d 100644
--- 
a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSubCommandTest.java
+++ 
b/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSubCommandTest.java
@@ -35,11 +35,10 @@ class CliConfigSubCommandTest extends CliCommandTestBase {
     void noKey() {
         execute();
 
-        String expectedResult = "ignite.cluster-url=test_cluster_url" + 
System.lineSeparator()
-                + "ignite.jdbc-url=test_jdbc_url" + System.lineSeparator();
         assertAll(
                 this::assertExitCodeIsZero,
-                () -> assertOutputIs(expectedResult),
+                () -> 
assertOutputContains("ignite.cluster-url=test_cluster_url"),
+                () -> assertOutputContains("ignite.jdbc-url=test_jdbc_url"),
                 this::assertErrOutputIsEmpty
         );
     }
diff --git 
a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
 
b/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
index 28c1b851d..39dcdb889 100644
--- 
a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
+++ 
b/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
@@ -27,10 +27,12 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockserver.matchers.MatchType.ONLY_MATCHING_FIELDS;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.mockserver.model.HttpStatusCode.INTERNAL_SERVER_ERROR_500;
 import static org.mockserver.model.HttpStatusCode.OK_200;
+import static org.mockserver.model.JsonBody.json;
 
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.env.Environment;
@@ -414,7 +416,7 @@ public class IgniteCliInterfaceTest extends AbstractCliTest 
{
                     .when(request()
                             .withMethod("POST")
                             .withPath("/management/v1/cluster/init")
-                            .withBody(expectedSentContent)
+                            .withBody(json(expectedSentContent, 
ONLY_MATCHING_FIELDS))
                             .withContentType(MediaType.APPLICATION_JSON_UTF_8)
                     )
                     .respond(response(null));