You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/02/09 14:59:36 UTC
svn commit: r1729382 - in
/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core:
cluster/DbClusterTestJCR3162.java config/RepositoryConfigTest.java
Author: reschke
Date: Tue Feb 9 13:59:35 2016
New Revision: 1729382
URL: http://svn.apache.org/viewvc?rev=1729382&view=rev
Log:
OAK-3949: fix DbClusterTestJCR3162 to restore system property SYSTEM_PROPERTY_NODE_ID to previous value
Modified:
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java?rev=1729382&r1=1729381&r2=1729382&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java Tue Feb 9 13:59:35 2016
@@ -53,6 +53,8 @@ public class DbClusterTestJCR3162 extend
private String clusterId1 = UUID.randomUUID().toString();
private String clusterId2 = UUID.randomUUID().toString();
+ private String prevClusterId;
+
public void setUp() throws Exception {
deleteAll();
FileUtils
@@ -66,7 +68,7 @@ public class DbClusterTestJCR3162 extend
"./src/test/resources/org/apache/jackrabbit/core/cluster/repository-h2.xml"),
new File("./target/dbClusterTest/node2/repository.xml"));
- System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, clusterId1);
+ prevClusterId = System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, clusterId1);
rep1 = RepositoryImpl.create(RepositoryConfig.create(new File(
"./target/dbClusterTest/node1")));
@@ -75,6 +77,14 @@ public class DbClusterTestJCR3162 extend
}
public void tearDown() throws Exception {
+ // revert change to system property
+ if (prevClusterId == null) {
+ System.clearProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID);
+ }
+ else {
+ System.setProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID, prevClusterId);
+ }
+
try {
rep1.shutdown();
if (rep2 != null) {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java?rev=1729382&r1=1729381&r2=1729382&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java Tue Feb 9 13:59:35 2016
@@ -245,6 +245,10 @@ public class RepositoryConfigTest extend
public void testAutomaticClusterNodeIdCreation() throws Exception {
final long syncDelay = 12;
+ assertNull(
+ "This test requires the system property " + ClusterNode.SYSTEM_PROPERTY_NODE_ID + " not to be set; found value: "
+ + System.getProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID) + " (leftover from broken unit test?)",
+ System.getProperty(ClusterNode.SYSTEM_PROPERTY_NODE_ID));
System.setProperty("cluster.syncDelay", Long.toString(syncDelay));
try {
File file = new File(DIR, "cluster_node.id");