update tests

aerospike · Jan 8, 2025 · aea3523 · aea3523
1 parent 4edc630
commit aea3523
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/org/springframework/data/aerospike/server/version/ServerVersionSupport.java b/src/main/java/org/springframework/data/aerospike/server/version/ServerVersionSupport.java
@@ -90,7 +90,7 @@ public boolean isServerVersionGtOrEq7() {
     /**
      * @return true if Server version is 8.0 or greater
      */
-    public boolean isMRTSupported() {
+    public boolean isTxnSupported() {
         return ModuleDescriptor.Version.parse(getServerVersion())
             .compareTo(SERVER_VERSION_8_0_0_0) >= 0;
     }

diff --git a/...mework/data/aerospike/transaction/reactive/ReactiveAerospikeTemplateTransactionTests.java b/...mework/data/aerospike/transaction/reactive/ReactiveAerospikeTemplateTransactionTests.java
@@ -66,7 +66,7 @@ public class ReactiveAerospikeTemplateTransactionTests extends BaseReactiveInteg
 
     @BeforeAll
     public void beforeAll() {
-        TestUtils.checkAssumption(serverVersionSupport.isMRTSupported(),
+        TestUtils.checkAssumption(serverVersionSupport.isTxnSupported(),
             "Skipping transactions tests because Aerospike Server 8.0.0+ is required", log);
     }
 
@@ -164,7 +164,7 @@ public void verifyMultipleWritesInTransactionWithTimeoutExpired() {
             .as(StepVerifier::create)
             .verifyErrorMatches(throwable -> {
                 if (throwable instanceof RecoverableDataAccessException) {
-                    return throwable.getMessage().contains("MRT expired");
+                    return throwable.getMessage().contains("Transaction expired");
                 }
                 return false;
             });
@@ -185,7 +185,7 @@ public void verifyMultipleWritesInTransactionWithDefaultTimeoutExpired() {
             .as(StepVerifier::create)
             .verifyErrorMatches(throwable -> {
                 if (throwable instanceof RecoverableDataAccessException) {
-                    return throwable.getMessage().contains("MRT expired");
+                    return throwable.getMessage().contains("Transaction expired");
                 }
                 return false;
             });

diff --git a/...rk/data/aerospike/transaction/reactive/ReactiveAerospikeTemplateTransactionUnitTests.java b/...rk/data/aerospike/transaction/reactive/ReactiveAerospikeTemplateTransactionUnitTests.java
@@ -76,7 +76,7 @@ public class ReactiveAerospikeTemplateTransactionUnitTests extends BaseReactiveI
 
     @BeforeAll
     public void beforeAll() {
-        TestUtils.checkAssumption(serverVersionSupport.isMRTSupported(),
+        TestUtils.checkAssumption(serverVersionSupport.isTxnSupported(),
             "Skipping transactions tests because Aerospike Server 8.0.0+ is required", log);
         when(mockTxManager.getReactiveTransaction(any()))
             .thenReturn(Mono.just(

diff --git a/...rg/springframework/data/aerospike/transaction/sync/AerospikeTemplateTransactionTests.java b/...rg/springframework/data/aerospike/transaction/sync/AerospikeTemplateTransactionTests.java
@@ -65,7 +65,7 @@ public class AerospikeTemplateTransactionTests extends BaseBlockingIntegrationTe
 
     @BeforeAll
     public void beforeAll() {
-        TestUtils.checkAssumption(serverVersionSupport.isMRTSupported(),
+        TestUtils.checkAssumption(serverVersionSupport.isTxnSupported(),
             "Skipping transactions tests because Aerospike Server 8.0.0+ is required", log);
     }
 
@@ -139,7 +139,7 @@ public void multipleWritesInTransactionWithTimeoutExpired() {
             template.save(new SampleClasses.DocumentWithIntegerId(115, "test2"));
         }))
             .isInstanceOf(RecoverableDataAccessException.class)
-            .hasMessageContaining("MRT expired");
+            .hasMessageContaining("Transaction expired");
 
         SampleClasses.DocumentWithIntegerId result = template.findById(115, SampleClasses.DocumentWithIntegerId.class);
         assertThat(result).isNull(); // No record is written because all commands were in the same transaction
@@ -154,7 +154,7 @@ public void multipleWritesInTransactionWithDefaultTimeoutExpired() {
             template.save(new SampleClasses.DocumentWithIntegerId(124, "test2"));
         }))
             .isInstanceOf(RecoverableDataAccessException.class)
-            .hasMessageContaining("MRT expired");
+            .hasMessageContaining("Transaction expired");
 
         SampleClasses.DocumentWithIntegerId result = template.findById(124, SampleClasses.DocumentWithIntegerId.class);
         assertThat(result).isNull(); // No record is written because all commands were in the same transaction

diff --git a/...pringframework/data/aerospike/transaction/sync/AerospikeTemplateTransactionUnitTests.java b/...pringframework/data/aerospike/transaction/sync/AerospikeTemplateTransactionUnitTests.java
@@ -61,7 +61,7 @@ public class AerospikeTemplateTransactionUnitTests extends BaseBlockingIntegrati
 
     @BeforeAll
     public void beforeAll() {
-        TestUtils.checkAssumption(serverVersionSupport.isMRTSupported(),
+        TestUtils.checkAssumption(serverVersionSupport.isTxnSupported(),
             "Skipping transactions tests because Aerospike Server 8.0.0+ is required", log);
         utils = new AerospikeTransactionTestUtils(client, template);
     }

diff --git a/...pringframework/data/aerospike/transaction/sync/AerospikeTransactionalAnnotationTests.java b/...pringframework/data/aerospike/transaction/sync/AerospikeTransactionalAnnotationTests.java
@@ -48,7 +48,7 @@ public class AerospikeTransactionalAnnotationTests extends BaseBlockingIntegrati
 
     @BeforeAll
     public void beforeAll() {
-        TestUtils.checkAssumption(serverVersionSupport.isMRTSupported(),
+        TestUtils.checkAssumption(serverVersionSupport.isTxnSupported(),
             "Skipping transactions tests because Aerospike Server 8.0.0+ is required", log);
     }
 
@@ -180,7 +180,7 @@ public void verifyTransaction_multipleInserts_withTimeoutExpired() {
         AwaitilityUtils.wait(3, SECONDS); // wait more than the given timeout
         assertThatThrownBy(() -> template.insert(new SampleClasses.DocumentWithPrimitiveIntId(306)))
             .isInstanceOf(RecoverableDataAccessException.class)
-            .hasMessageContaining("MRT expired");
+            .hasMessageContaining("Transaction expired");
     }
 
     @Test
@@ -234,7 +234,7 @@ public void verifyTransaction_multipleBatchInserts_withTimeoutExpired() {
             template.insertAll(List.of(new SampleClasses.DocumentWithPrimitiveIntId(310),
                 new SampleClasses.DocumentWithPrimitiveIntId(410)));
         } catch (AerospikeException.BatchRecordArray e) {
-            System.out.println("MRT expired");
+            System.out.println("Transaction expired");
         }
     }