Author: frm
Date: Wed Oct 19 18:10:54 2016
New Revision: 1765692
URL: http://svn.apache.org/viewvc?rev=1765692&view=rev
Log:
OAK-4958 - Turn unit tests interacting with a network into integration tests
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
- copied, changed from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
- copied, changed from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
- copied, changed from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1765692&r1=1765691&r2=1765692&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Wed Oct 19 18:10:54 2016
@@ -88,7 +88,7 @@
<goals>
<goal>reserve-network-port</goal>
</goals>
- <phase>process-test-resources</phase>
+ <phase>pre-integration-test</phase>
<configuration>
<portNames>
<portName>standby.server.port</portName>
@@ -103,10 +103,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
- <systemPropertyVariables>
-
<standby.server.port>${standby.server.port}</standby.server.port>
-
<standby.proxy.port>${standby.proxy.port}</standby.proxy.port>
- </systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
Copied:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
(from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkTest.java&r1=1765680&r2=1765692&rev=1765692&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
Wed Oct 19 18:10:54 2016
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class BrokenNetworkTest extends TestBase {
+public class BrokenNetworkIT extends TestBase {
private TemporaryFolder folder = new TemporaryFolder(new File("target"));
Copied:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
(from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java&r1=1765680&r2=1765692&rev=1765692&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
Wed Oct 19 18:10:54 2016
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class FailoverIPRangeTest extends TestBase {
+public class FailoverIPRangeIT extends TestBase {
private TemporaryFolder folder = new TemporaryFolder(new File("target"));
Copied:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
(from r1765680,
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java&r1=1765680&r2=1765692&rev=1765692&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
Wed Oct 19 18:10:54 2016
@@ -39,7 +39,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-public class MBeanTest extends TestBase {
+public class MBeanIT extends TestBase {
private TemporaryFolder folder = new TemporaryFolder(new File("target"));
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java?rev=1765692&r1=1765691&r2=1765692&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java
Wed Oct 19 18:10:54 2016
@@ -61,64 +61,4 @@ public class StandbyTest extends TestBas
.around(serverFileStore)
.around(clientFileStore);
- @Test
- public void testSync() throws Exception {
- final int mb = 1 * 1024 * 1024;
- final int blobSize = 5 * mb;
- FileStore primary = serverFileStore.fileStore();
- FileStore secondary = clientFileStore.fileStore();
-
- NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
- final StandbyServerSync serverSync = new
StandbyServerSync(getServerPort(), primary);
- serverSync.start();
- byte[] data = addTestContent(store, "server", blobSize, 150);
- primary.flush();
-
- StandbyClientSync clientSync = newStandbyClientSync(secondary);
- clientSync.run();
-
- try {
- assertEquals(primary.getHead(), secondary.getHead());
- } finally {
- serverSync.close();
- clientSync.close();
- }
-
- assertTrue(primary.getStats().getApproximateSize() > blobSize);
- assertTrue(secondary.getStats().getApproximateSize() > blobSize);
-
- PropertyState ps = secondary.getHead().getChildNode("root")
- .getChildNode("server").getProperty("testBlob");
- assertNotNull(ps);
- assertEquals(Type.BINARY.tag(), ps.getType().tag());
- Blob b = ps.getValue(Type.BINARY);
- assertEquals(blobSize, b.length());
-
- byte[] testData = new byte[blobSize];
- ByteStreams.readFully(b.getNewStream(), testData);
- assertArrayEquals(data, testData);
-
- }
-
- private static byte[] addTestContent(NodeStore store, String child, int
size, int dataNodes)
- throws CommitFailedException, IOException {
- NodeBuilder builder = store.getRoot().builder();
- NodeBuilder content = builder.child(child);
- content.setProperty("ts", System.currentTimeMillis());
-
- byte[] data = new byte[size];
- new Random().nextBytes(data);
- Blob blob = store.createBlob(new ByteArrayInputStream(data));
- content.setProperty("testBlob", blob);
-
- for (int i = 0; i < dataNodes; i++) {
- NodeBuilder c = content.child("c" + i);
- for (int j = 0; j < 1000; j++) {
- c.setProperty("p" + i, "v" + i);
- }
- }
-
- store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- return data;
- }
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java?rev=1765692&r1=1765691&r2=1765692&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java
Wed Oct 19 18:10:54 2016
@@ -61,26 +61,43 @@ public class StandbyTestIT extends TestB
.around(serverFileStore)
.around(clientFileStore);
- private static byte[] addTestContent(NodeStore store, String child, int
size, int dataNodes)
- throws CommitFailedException, IOException {
- NodeBuilder builder = store.getRoot().builder();
- NodeBuilder content = builder.child(child);
- content.setProperty("ts", System.currentTimeMillis());
+ @Test
+ public void testSync() throws Exception {
+ final int mb = 1 * 1024 * 1024;
+ final int blobSize = 5 * mb;
+ FileStore primary = serverFileStore.fileStore();
+ FileStore secondary = clientFileStore.fileStore();
- byte[] data = new byte[size];
- new Random().nextBytes(data);
- Blob blob = store.createBlob(new ByteArrayInputStream(data));
- content.setProperty("testBlob", blob);
+ NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
+ final StandbyServerSync serverSync = new
StandbyServerSync(getServerPort(), primary);
+ serverSync.start();
+ byte[] data = addTestContent(store, "server", blobSize, 150);
+ primary.flush();
- for (int i = 0; i < dataNodes; i++) {
- NodeBuilder c = content.child("c" + i);
- for (int j = 0; j < 1000; j++) {
- c.setProperty("p" + i, "v" + i);
- }
+ StandbyClientSync clientSync = newStandbyClientSync(secondary);
+ clientSync.run();
+
+ try {
+ assertEquals(primary.getHead(), secondary.getHead());
+ } finally {
+ serverSync.close();
+ clientSync.close();
}
- store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- return data;
+ assertTrue(primary.getStats().getApproximateSize() > blobSize);
+ assertTrue(secondary.getStats().getApproximateSize() > blobSize);
+
+ PropertyState ps = secondary.getHead().getChildNode("root")
+ .getChildNode("server").getProperty("testBlob");
+ assertNotNull(ps);
+ assertEquals(Type.BINARY.tag(), ps.getType().tag());
+ Blob b = ps.getValue(Type.BINARY);
+ assertEquals(blobSize, b.length());
+
+ byte[] testData = new byte[blobSize];
+ ByteStreams.readFully(b.getNewStream(), testData);
+ assertArrayEquals(data, testData);
+
}
/**
@@ -132,7 +149,28 @@ public class StandbyTestIT extends TestB
byte[] testData = new byte[blobSize];
ByteStreams.readFully(b.getNewStream(), testData);
assertArrayEquals(data, testData);
+ }
+
+ private static byte[] addTestContent(NodeStore store, String child, int
size, int dataNodes)
+ throws CommitFailedException, IOException {
+ NodeBuilder builder = store.getRoot().builder();
+ NodeBuilder content = builder.child(child);
+ content.setProperty("ts", System.currentTimeMillis());
+
+ byte[] data = new byte[size];
+ new Random().nextBytes(data);
+ Blob blob = store.createBlob(new ByteArrayInputStream(data));
+ content.setProperty("testBlob", blob);
+
+ for (int i = 0; i < dataNodes; i++) {
+ NodeBuilder c = content.child("c" + i);
+ for (int j = 0; j < 1000; j++) {
+ c.setProperty("p" + i, "v" + i);
+ }
+ }
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ return data;
}
}
