This is an automated email from the ASF dual-hosted git repository.
apkhmv 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 3005f4cf31 IGNITE-20101 Relax CLI metric tests (#2379)
3005f4cf31 is described below
commit 3005f4cf31d33972e36fa5e5133c6be3c78a20ea
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Tue Aug 1 19:20:21 2023 +0300
IGNITE-20101 Relax CLI metric tests (#2379)
---
.../ignite/internal/cli/call/metric/ItEnabledMetricCallsTest.java | 4 ++--
.../apache/ignite/internal/cli/call/metric/ItMetricCallsTest.java | 2 +-
.../cli/commands/metric/ItEnabledNodeMetricCommandTest.java | 6 +++---
.../internal/cli/commands/metric/ItNodeMetricCommandTest.java | 8 +++++---
.../apache/ignite/internal/rest/ItGeneratedRestClientTest.java | 8 ++++----
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItEnabledMetricCallsTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItEnabledMetricCallsTest.java
index a28b33b4e3..a297eb0a8a 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItEnabledMetricCallsTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItEnabledMetricCallsTest.java
@@ -73,7 +73,7 @@ class ItEnabledMetricCallsTest extends
CallInitializedIntegrationTestBase {
};
// And
-
assertThat(output.body()).containsExactlyInAnyOrder(expectedMetricSources);
+ assertThat(output.body()).contains(expectedMetricSources);
}
@Test
@@ -100,7 +100,7 @@ class ItEnabledMetricCallsTest extends
CallInitializedIntegrationTestBase {
assertAll(
() -> assertThat(output.body()).hasSize(1),
() ->
assertThat(output.body().get(0).getName()).isEqualTo("jvm"),
- () ->
assertThat(output.body().get(0).getMetrics()).containsExactlyInAnyOrder(expectedMetrics)
+ () ->
assertThat(output.body().get(0).getMetrics()).contains(expectedMetrics)
);
}
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItMetricCallsTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItMetricCallsTest.java
index fdfeffd1f6..6e16d56714 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItMetricCallsTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/metric/ItMetricCallsTest.java
@@ -59,7 +59,7 @@ class ItMetricCallsTest extends
CallInitializedIntegrationTestBase {
};
// And
-
assertThat(output.body()).containsExactlyInAnyOrder(expectedMetricSources);
+ assertThat(output.body()).contains(expectedMetricSources);
}
@Test
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItEnabledNodeMetricCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItEnabledNodeMetricCommandTest.java
index 6a4eb2c5be..c1302cc56b 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItEnabledNodeMetricCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItEnabledNodeMetricCommandTest.java
@@ -56,9 +56,9 @@ class ItEnabledNodeMetricCommandTest extends
CliCommandTestInitializedIntegratio
assertAll(
this::assertExitCodeIsZero,
this::assertErrOutputIsEmpty,
- () -> assertOutputIs("Set name\tEnabled" + NL
- + "jvm\tenabled" + NL
- + "client.handler\tdisabled" + NL)
+ () -> assertOutputContains("Set name\tEnabled" + NL),
+ () -> assertOutputContains("jvm\tenabled" + NL),
+ () -> assertOutputContains("client.handler\tdisabled" + NL)
);
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItNodeMetricCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItNodeMetricCommandTest.java
index 97a10a783a..d948bed6b0 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItNodeMetricCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/metric/ItNodeMetricCommandTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
/** Tests for node metric commands. */
class ItNodeMetricCommandTest extends CliCommandTestInitializedIntegrationBase
{
+ private static final String NL = System.lineSeparator();
+
@Test
@DisplayName("Should display disabled jvm metric source when valid
node-url is given")
void nodeMetricList() {
@@ -35,9 +37,9 @@ class ItNodeMetricCommandTest extends
CliCommandTestInitializedIntegrationBase {
assertAll(
this::assertExitCodeIsZero,
this::assertErrOutputIsEmpty,
- () -> assertOutputIs("Set name\tEnabled" +
System.lineSeparator()
- + "jvm\tdisabled" + System.lineSeparator()
- + "client.handler\tdisabled" + System.lineSeparator())
+ () -> assertOutputContains("Set name\tEnabled" + NL),
+ () -> assertOutputContains("jvm\tdisabled" + NL),
+ () -> assertOutputContains("client.handler\tdisabled" + NL)
);
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
index 5d44d4f543..3dcf550149 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
@@ -25,10 +25,10 @@ import static
org.apache.ignite.rest.client.model.DeploymentStatus.UPLOADING;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -363,12 +363,12 @@ public class ItGeneratedRestClientTest {
@Test
void nodeMetricSourcesList() throws ApiException {
- List<MetricSource> metricSources = List.of(
+ MetricSource[] expectedMetricSources = {
new MetricSource().name("jvm").enabled(false),
new MetricSource().name("client.handler").enabled(false)
- );
+ };
- assertThat(nodeMetricApi.listNodeMetricSources(),
containsInAnyOrder(metricSources.toArray()));
+ assertThat(nodeMetricApi.listNodeMetricSources(),
hasItems(expectedMetricSources));
}
@Test
