svn commit: r1813318 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java

[frm]

Author: frm
Date: Wed Oct 25 15:37:24 2017
New Revision: 1813318

URL: http://svn.apache.org/viewvc?rev=1813318&view=rev
Log:
OAK-6829 - Fix initialization order of test primary, standby, and proxy

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java?rev=1813318&r1=1813317&r2=1813318&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
 Wed Oct 25 15:37:24 2017
@@ -63,8 +63,6 @@ public abstract class DataStoreTestBase
 
     static final long GB = 1024 * 1024 * 1024;
 
-    private NetworkErrorProxy proxy;
-
     @Rule
     public TemporaryPort serverPort = new TemporaryPort();
 
@@ -129,12 +127,10 @@ public abstract class DataStoreTestBase
     @Before
     public void before() {
         logger.info("Test begin: {}", testName.getMethodName());
-        proxy = new NetworkErrorProxy(proxyPort.getPort(), getServerHost(), 
serverPort.getPort());
     }
 
     @After
     public void after() {
-        proxy.close();
         logger.info("Test end: {}", testName.getMethodName());
     }
     
@@ -342,32 +338,30 @@ public abstract class DataStoreTestBase
 
         NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
         byte[] data = addTestContent(store, "server", blobSize);
-        try (
-                StandbyServerSync serverSync = new 
StandbyServerSync(serverPort.getPort(), primary, 1 * MB);
-                StandbyClientSync clientSync = newStandbyClientSync(secondary, 
proxyPort.getPort())
-        ) {
-            proxy.skipBytes(skipPosition, skipBytes);
-            proxy.flipByte(flipPosition);
-            proxy.connect();
-
+        try (StandbyServerSync serverSync = new 
StandbyServerSync(serverPort.getPort(), primary, MB)) {
             serverSync.start();
-            primary.flush();
-
-            clientSync.run();
-
-            if (skipBytes > 0 || flipPosition >= 0) {
-                if (!storesShouldBeEqual()) {
-                    assertFalse("stores are not expected to be equal", 
primary.getHead().equals(secondary.getHead()));
-                }
-                proxy.reset();
-                if (intermediateChange) {
-                    blobSize = 2 * MB;
-                    data = addTestContent(store, "server", blobSize);
+            try (NetworkErrorProxy proxy = new 
NetworkErrorProxy(proxyPort.getPort(), getServerHost(), serverPort.getPort())) {
+                proxy.skipBytes(skipPosition, skipBytes);
+                proxy.flipByte(flipPosition);
+                proxy.connect();
+                try (StandbyClientSync clientSync = 
newStandbyClientSync(secondary, proxyPort.getPort())) {
                     primary.flush();
+                    clientSync.run();
+                    if (skipBytes > 0 || flipPosition >= 0) {
+                        if (!storesShouldBeEqual()) {
+                            assertFalse("stores are not expected to be equal", 
primary.getHead().equals(secondary.getHead()));
+                        }
+                        proxy.reset();
+                        if (intermediateChange) {
+                            blobSize = 2 * MB;
+                            data = addTestContent(store, "server", blobSize);
+                            primary.flush();
+                        }
+                        clientSync.run();
+                    }
+                    assertEquals(primary.getHead(), secondary.getHead());
                 }
-                clientSync.run();
             }
-            assertEquals(primary.getHead(), secondary.getHead());
         }
 
         assertTrue(primary.getStats().getApproximateSize() < MB);