svn commit: r1744390 - /sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java

[kwin]

Author: kwin
Date: Wed May 18 11:15:59 2016
New Revision: 1744390

URL: http://svn.apache.org/viewvc?rev=1744390&view=rev
Log:
SLING-5677 prevent test from removing the mandatory default system properties

Modified:
    
sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java

Modified: 
sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java?rev=1744390&r1=1744389&r2=1744390&view=diff
==============================================================================
--- 
sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
 (original)
+++ 
sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
 Wed May 18 11:15:59 2016
@@ -34,7 +34,16 @@ public class DefaultPropertyBasedCustomi
     
     @Before
     public void setUp() {
-        System.setProperties(null);
+        // remove all properties starting with "ClientSideTeleporter."
+        // removing all properties without conditions would prevent other java 
code from being executed without errors, because some java code at least relies 
on "java.home" being set!
+        Properties oldProperties = System.getProperties();
+        Properties newProperties = new Properties();
+        for (Object key : oldProperties.keySet()) {
+            if (!((String)key).startsWith("ClientSideTeleporter.")) {
+                newProperties.put(key, oldProperties.get(key));
+            }
+        }
+        System.setProperties(newProperties);
     }
 
     @Test(expected=AssertionError.class)
@@ -45,24 +54,20 @@ public class DefaultPropertyBasedCustomi
 
     @Test(expected=AssertionError.class)
     public void testEmptyBaseUrl() {
-        Properties props = new Properties();
-        props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, "  
 ");
-        System.setProperties(props);
+        System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, " 
  ");
         customizer = new DefaultPropertyBasedCustomizer();
         customizer.customize(clientSideTeleporter, null);
     }
 
     @Test
     public void testSettingAllProperties() {
-        Properties props = new Properties();
-        props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, 
"base-url");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_INCLUDE_DEPENDENCY_PREFIXES,
 "include-dependency1,include-dependency2");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EXCLUDE_DEPENDENCY_PREFIXES,
 "exclude-dependency1,exclude-dependency2");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EMBED_CLASSES, 
"org.apache.sling.testing.teleporter.client.ClassResourceVisitor,org.apache.sling.testing.teleporter.client.ClientSideTeleporter");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_TESTREADY_TIMEOUT_SECONDS,
 "50");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_SERVER_USERNAME, 
"adminuser");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_SERVER_PASSWORD, 
"adminpassword");
-        System.setProperties(props);
+        System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, 
"base-url");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_INCLUDE_DEPENDENCY_PREFIXES,
 "include-dependency1,include-dependency2");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EXCLUDE_DEPENDENCY_PREFIXES,
 "exclude-dependency1,exclude-dependency2");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EMBED_CLASSES, 
"org.apache.sling.testing.teleporter.client.ClassResourceVisitor,org.apache.sling.testing.teleporter.client.ClientSideTeleporter");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_TESTREADY_TIMEOUT_SECONDS,
 "50");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_SERVER_USERNAME, 
"adminuser");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_SERVER_PASSWORD, 
"adminpassword");
         customizer = new DefaultPropertyBasedCustomizer();
         customizer.customize(clientSideTeleporter, null);
         Mockito.verify(clientSideTeleporter).setBaseUrl("base-url");
@@ -78,10 +83,8 @@ public class DefaultPropertyBasedCustomi
 
     @Test(expected=AssertionError.class)
     public void testEmbeddingInvalidClass() {
-        Properties props = new Properties();
-        props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, 
"base-url");
-        
props.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EMBED_CLASSES, 
"org.apache.sling.testing.teleporter.client.InvalidClass");
-        System.setProperties(props);
+        System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_BASE_URL, 
"base-url");
+        
System.setProperty(DefaultPropertyBasedCustomizer.PROPERTY_EMBED_CLASSES, 
"org.apache.sling.testing.teleporter.client.InvalidClass");
         customizer = new DefaultPropertyBasedCustomizer();
         customizer.customize(clientSideTeleporter, null);
     }