diff --git oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java index ba79a71..3c14eec 100644 --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java @@ -78,11 +78,6 @@ public class FailoverIPRangeTest extends TestBase { } @Test - public void testFailoverInvalidName() throws Exception { - createTestWithConfig(new String[]{"foobar"}, false); - } - - @Test public void testFailoverValidIPRangeStart() throws Exception { createTestWithConfig(new String[]{"127.0.0.1-127.0.0.2"}, true); } @@ -104,39 +99,39 @@ public class FailoverIPRangeTest extends TestBase { @Test public void testFailoverCorrectList() throws Exception { - createTestWithConfig(new String[]{"foobar","127-128","126.0.0.1", "127.0.0.0-127.255.255.255"}, true); + createTestWithConfig(new String[]{"127-128","126.0.0.1", "127.0.0.0-127.255.255.255"}, true); } @Test public void testFailoverCorrectListIPv6() throws Exception { if (!noDualStackSupport) { - createTestWithConfig(new String[]{"foobar", "122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); + createTestWithConfig(new String[]{"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); } } @Test public void testFailoverWrongList() throws Exception { - createTestWithConfig(new String[]{"foobar", "126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false); + createTestWithConfig(new String[]{"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false); } @Test public void testFailoverCorrectListUseIPv6() throws Exception { if (!noDualStackSupport) { - createTestWithConfig("::1", new String[]{"foobar","127-128", "0:0:0:0:0:0:0:1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); + createTestWithConfig("::1", new String[]{"127-128", "0:0:0:0:0:0:0:1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); } } @Test public void testFailoverCorrectListIPv6UseIPv6() throws Exception { if (!noDualStackSupport) { - createTestWithConfig("::1", new String[]{"foobar", "122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); + createTestWithConfig("::1", new String[]{"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); } } @Test public void testFailoverWrongListUseIPv6() throws Exception { if (!noDualStackSupport) { - createTestWithConfig("::1", new String[]{"foobar", "126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false); + createTestWithConfig("::1", new String[]{"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false); } } diff --git oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java index 0b450d1..2cdbc1c 100644 --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java @@ -18,7 +18,9 @@ */ package org.apache.jackrabbit.oak.segment.standby; -import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.SegmentTestUtils; import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; @@ -28,9 +30,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertEquals; - public class FailoverMultipleClientsTestIT extends TestBase { @Before