You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2022/09/01 13:35:28 UTC
[ignite-3] branch main updated: IGNITE-17596 Fix ItThinClientComputeTest on Windows (#1046)
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn 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 efda0215c8 IGNITE-17596 Fix ItThinClientComputeTest on Windows (#1046)
efda0215c8 is described below
commit efda0215c8a6dc9193b6f94da905c3f1db02f920
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Thu Sep 1 16:35:22 2022 +0300
IGNITE-17596 Fix ItThinClientComputeTest on Windows (#1046)
* Use the same `testNodeName` on Windows and Linux.
* Make it shorter to avoid hitting Windows MAX_PATH limit.
---
.../internal/testframework/IgniteTestUtils.java | 8 ++++----
.../runner/app/client/ItThinClientComputeTest.java | 20 ++++++++++----------
.../app/client/ItThinClientConnectionTest.java | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java
index d7338121cf..608144afbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java
@@ -665,11 +665,11 @@ public final class IgniteTestUtils {
*/
public static String testNodeName(TestInfo testInfo, int idx) {
String testMethodName = testInfo.getTestMethod().map(Method::getName).orElse("null");
+ String testClassName = testInfo.getTestClass().map(Class::getSimpleName).orElse("null");
- return isWindowsOs() ? shortTestMethodName(testMethodName) + "_" + idx :
- IgniteStringFormatter.format("{}_{}_{}",
- testInfo.getTestClass().map(Class::getSimpleName).orElse("null"),
- testMethodName,
+ return IgniteStringFormatter.format("{}_{}_{}",
+ shortTestMethodName(testClassName),
+ shortTestMethodName(testMethodName),
idx);
}
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java
index 219ec61ab6..519d1409cb 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java
@@ -69,11 +69,11 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
assertEquals(2, nodes.size());
- assertEquals("ItThinClientComputeTest_null_3344", nodes.get(0).name());
+ assertEquals("itcct_n_3344", nodes.get(0).name());
assertEquals(3344, nodes.get(0).address().port());
assertTrue(nodes.get(0).id().length() > 10);
- assertEquals("ItThinClientComputeTest_null_3345", nodes.get(1).name());
+ assertEquals("itcct_n_3345", nodes.get(1).name());
assertEquals(3345, nodes.get(1).address().port());
assertTrue(nodes.get(1).id().length() > 10);
}
@@ -83,15 +83,15 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
String res1 = client().compute().execute(Set.of(node(0)), NodeNameJob.class).join();
String res2 = client().compute().execute(Set.of(node(1)), NodeNameJob.class).join();
- assertEquals("ItThinClientComputeTest_null_3344", res1);
- assertEquals("ItThinClientComputeTest_null_3345", res2);
+ assertEquals("itcct_n_3344", res1);
+ assertEquals("itcct_n_3345", res2);
}
@Test
void testExecuteOnRandomNode() {
String res = client().compute().execute(new HashSet<>(sortedNodes()), NodeNameJob.class).join();
- assertTrue(Set.of("ItThinClientComputeTest_null_3344", "ItThinClientComputeTest_null_3345").contains(res));
+ assertTrue(Set.of("itcct_n_3344", "itcct_n_3345").contains(res));
}
@Test
@@ -106,7 +106,7 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
String res = futuresPerNode.get(node(1)).join();
- assertEquals("ItThinClientComputeTest_null_3345__123", res);
+ assertEquals("itcct_n_3345__123", res);
}
@Test
@@ -122,8 +122,8 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
String res1 = futuresPerNode.get(node(0)).join();
String res2 = futuresPerNode.get(node(1)).join();
- assertEquals("ItThinClientComputeTest_null_3344__123", res1);
- assertEquals("ItThinClientComputeTest_null_3345__123", res2);
+ assertEquals("itcct_n_3344__123", res1);
+ assertEquals("itcct_n_3345__123", res2);
}
@Test
@@ -181,7 +181,7 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
}
@ParameterizedTest
- @CsvSource({"1,3345", "2,3345", "3,3344", "4,3344"})
+ @CsvSource({"1,3345", "2,3345", "3,3344", "4,3345"})
void testExecuteColocatedRunsComputeJobOnKeyNode(int key, int port) {
var table = String.format("%s.%s", SCHEMA_NAME, TABLE_NAME);
var keyTuple = Tuple.create().set(COLUMN_KEY, key);
@@ -190,7 +190,7 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest {
String tupleRes = client().compute().executeColocated(table, keyTuple, NodeNameJob.class).join();
String pojoRes = client().compute().executeColocated(table, keyPojo, Mapper.of(TestPojo.class), NodeNameJob.class).join();
- String expectedNode = "ItThinClientComputeTest_null_" + port;
+ String expectedNode = "itcct_n_" + port;
assertEquals(expectedNode, tupleRes);
assertEquals(expectedNode, pojoRes);
}
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
index 83aaf9bb95..5164307db1 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientConnectionTest.java
@@ -68,7 +68,7 @@ public class ItThinClientConnectionTest extends ItAbstractThinClientTest {
List<ClusterNode> nodes = client.connections();
assertEquals(1, nodes.size());
- assertThat(nodes.get(0).name(), startsWith("ItThinClientConnectionTest_null_"));
+ assertThat(nodes.get(0).name(), startsWith("itcct_n_"));
}
}
}