You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/09/17 15:42:13 UTC
svn commit: r1625584 - in
/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it:
ForwardReplicationTest.java ReplicationIntegrationTestBase.java
ReverseReplicationTest.java
Author: tommaso
Date: Wed Sep 17 13:42:12 2014
New Revision: 1625584
URL: http://svn.apache.org/r1625584
Log:
SLING-3937 - added wait before checking if agents exist during IT initialization
Modified:
sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java
sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java
sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java?rev=1625584&r1=1625583&r2=1625584&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ForwardReplicationTest.java Wed Sep 17 13:42:12 2014
@@ -21,7 +21,10 @@ package org.apache.sling.replication.it;
import org.apache.sling.replication.communication.ReplicationActionType;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.*;
+import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
+import static org.apache.sling.replication.it.ReplicationUtils.assertNotExits;
+import static org.apache.sling.replication.it.ReplicationUtils.createRandomNode;
+import static org.apache.sling.replication.it.ReplicationUtils.replicate;
/**
* Integration test for forward replication
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java?rev=1625584&r1=1625583&r2=1625584&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java Wed Sep 17 13:42:12 2014
@@ -21,6 +21,7 @@ package org.apache.sling.replication.it;
import org.apache.sling.testing.tools.sling.SlingClient;
import org.apache.sling.testing.tools.sling.SlingInstance;
import org.apache.sling.testing.tools.sling.SlingInstanceManager;
+import org.junit.BeforeClass;
import static org.apache.sling.replication.it.ReplicationUtils.agentConfigUrl;
import static org.apache.sling.replication.it.ReplicationUtils.agentUrl;
@@ -40,7 +41,8 @@ public abstract class ReplicationIntegra
static SlingClient authorClient;
static SlingClient publishClient;
- static {
+ @BeforeClass
+ public static void setUpBefore() {
SlingInstanceManager slingInstances = new SlingInstanceManager("author", "publish");
author = slingInstances.getInstance("author");
publish = slingInstances.getInstance("publish");
@@ -78,10 +80,12 @@ public abstract class ReplicationIntegra
"packageImporter", "packageBuilder/username=admin",
"packageImporter", "packageBuilder/password=admin");
+ Thread.sleep(3000);
assertExists(authorClient, agentUrl("publish"));
assertExists(authorClient, agentConfigUrl("publish-reverse"));
+
String remoteExporterUrl = publish.getServerBaseUrl() + exporterUrl("reverse");
setAgentProperties(author, "publish-reverse",
"packageExporter", "type=remote",
@@ -93,13 +97,14 @@ public abstract class ReplicationIntegra
"packageExporter", "packageBuilder/type=vlt",
"packageExporter", "packageBuilder/username=admin",
"packageExporter", "packageBuilder/password=admin");
+
+ Thread.sleep(3000);
assertExists(authorClient, agentUrl("publish-reverse"));
} catch (Exception ex) {
throw new RuntimeException(ex);
}
-
}
}
Modified: sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java?rev=1625584&r1=1625583&r2=1625584&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReverseReplicationTest.java Wed Sep 17 13:42:12 2014
@@ -22,12 +22,16 @@ package org.apache.sling.replication.it;
import org.apache.sling.replication.communication.ReplicationActionType;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.*;
+import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
+import static org.apache.sling.replication.it.ReplicationUtils.assertNotExits;
+import static org.apache.sling.replication.it.ReplicationUtils.createRandomNode;
+import static org.apache.sling.replication.it.ReplicationUtils.replicate;
/**
* Integration test for reverse replication
*/
public class ReverseReplicationTest extends ReplicationIntegrationTestBase {
+
@Test
public void testAddContent() throws Exception {
String nodePath = createRandomNode(publishClient, "/content/reverse_add_" + System.nanoTime());
@@ -36,7 +40,6 @@ public class ReverseReplicationTest exte
assertExists(authorClient, nodePath);
}
-
@Test
public void testDeleteContent() throws Exception {
String nodePath = createRandomNode(authorClient, "/content/reverse_del_" + System.nanoTime());