diff --git a/hazelcast-spring-tests/src/test/java/com/hazelcast/spring/TestFullApplicationContext.java b/hazelcast-spring-tests/src/test/java/com/hazelcast/spring/TestFullApplicationContext.java
index 8c6b379cf2695..a38405f273c8a 100644
--- a/hazelcast-spring-tests/src/test/java/com/hazelcast/spring/TestFullApplicationContext.java
+++ b/hazelcast-spring-tests/src/test/java/com/hazelcast/spring/TestFullApplicationContext.java
@@ -319,7 +319,7 @@ public void testCacheConfig() {
WanReplicationRef wanRef = cacheConfig.getWanReplicationRef();
assertEquals("testWan", wanRef.getName());
- assertEquals("PUT_IF_ABSENT", wanRef.getMergePolicyClassName());
+ assertEquals("PutIfAbsentMergePolicy", wanRef.getMergePolicyClassName());
assertEquals(1, wanRef.getFilters().size());
assertEquals("com.example.SampleFilter", wanRef.getFilters().get(0));
}
@@ -404,7 +404,7 @@ public void testMapConfig() {
// test testMapConfig2's WanReplicationConfig
WanReplicationRef wanReplicationRef = testMapConfig2.getWanReplicationRef();
assertEquals("testWan", wanReplicationRef.getName());
- assertEquals("PUT_IF_ABSENT", wanReplicationRef.getMergePolicyClassName());
+ assertEquals("PutIfAbsentMergePolicy", wanReplicationRef.getMergePolicyClassName());
assertTrue(wanReplicationRef.isRepublishingEnabled());
assertEquals(1000, testMapConfig2.getEvictionConfig().getSize());
@@ -471,7 +471,7 @@ public void testMapNoWanMergePolicy() {
// test testMapConfig2's WanReplicationConfig
WanReplicationRef wanReplicationRef = testMapConfig2.getWanReplicationRef();
assertEquals("testWan", wanReplicationRef.getName());
- assertEquals("PUT_IF_ABSENT", wanReplicationRef.getMergePolicyClassName());
+ assertEquals("PutIfAbsentMergePolicy", wanReplicationRef.getMergePolicyClassName());
}
@Test
diff --git a/hazelcast-spring-tests/src/test/resources/com/hazelcast/spring/fullConfig-applicationContext-hazelcast.xml b/hazelcast-spring-tests/src/test/resources/com/hazelcast/spring/fullConfig-applicationContext-hazelcast.xml
index 97ca14fc02009..d83c5c06b2c08 100644
--- a/hazelcast-spring-tests/src/test/resources/com/hazelcast/spring/fullConfig-applicationContext-hazelcast.xml
+++ b/hazelcast-spring-tests/src/test/resources/com/hazelcast/spring/fullConfig-applicationContext-hazelcast.xml
@@ -374,7 +374,7 @@
implementation="dummyMapStore"
write-delay-seconds="0"
initial-mode="LAZY"/>
-
+
@@ -508,7 +508,7 @@
-
com.example.SampleFilter