You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2023/05/04 09:14:43 UTC
[ignite] branch master updated: IGNITE-19416 Fix JavaThinCompatibilityTest.testCurrentClientToOldServer(Version 2.14.0) - Fixes #10699.
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 69849bf2084 IGNITE-19416 Fix JavaThinCompatibilityTest.testCurrentClientToOldServer(Version 2.14.0) - Fixes #10699.
69849bf2084 is described below
commit 69849bf20841ded68d4b5fd4031e236fedecdff0
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Thu May 4 12:10:41 2023 +0300
IGNITE-19416 Fix JavaThinCompatibilityTest.testCurrentClientToOldServer(Version 2.14.0) - Fixes #10699.
Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
.../clients/JavaThinCompatibilityTest.java | 23 ++++++++--------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
index ad666ced379..030257f9714 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
@@ -449,8 +449,8 @@ public class JavaThinCompatibilityTest extends AbstractClientCompatibilityTest {
}
}
- if (clientVer.compareTo(VER_2_15_0) >= 0)
- testDataReplicationOperations(serverVer.compareTo(VER_2_15_0) >= 0);
+ if (minVer.compareTo(VER_2_15_0) >= 0)
+ testDataReplicationOperations();
if (clientVer.compareTo(VER_2_14_0) >= 0)
new JavaThinIndexQueryCompatibilityTest().testIndexQueries(ADDR, serverVer.compareTo(VER_2_14_0) >= 0);
@@ -508,8 +508,8 @@ public class JavaThinCompatibilityTest extends AbstractClientCompatibilityTest {
}
}
- /** @param supported {@code True} if feature supported. */
- private void testDataReplicationOperations(boolean supported) {
+ /** */
+ private void testDataReplicationOperations() {
X.println(">>>> Testing cache replication");
try (IgniteClient client = Ignition.startClient(new ClientConfiguration().setAddresses(ADDR))) {
@@ -521,20 +521,13 @@ public class JavaThinCompatibilityTest extends AbstractClientCompatibilityTest {
Map<Object, GridCacheVersion> rmvs = F.asMap(1, new GridCacheVersion(1, 1, 1, 2));
- if (supported) {
- cache.putAllConflict(puts);
+ cache.putAllConflict(puts);
- assertEquals(1, cache.get(1));
+ assertEquals(1, cache.get(1));
- cache.removeAllConflict(rmvs);
+ cache.removeAllConflict(rmvs);
- assertFalse(cache.containsKey(1));
- }
- else {
- assertThrowsWithCause(() -> cache.putAllConflict(puts), ClientFeatureNotSupportedByServerException.class);
-
- assertThrowsWithCause(() -> cache.removeAllConflict(rmvs), ClientFeatureNotSupportedByServerException.class);
- }
+ assertFalse(cache.containsKey(1));
}
}