[jboss-svn-commits] JBossWS SVN: r828 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse

[jboss-svn-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2006-08-24 07:50:39 -0400 (Thu, 24 Aug 2006)
New Revision: 828

Modified:
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java
Log:
Manually remove the system properties instead of calling clearProperty or setProperty("x",null).


Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java	2006-08-24 11:43:21 UTC (rev 827)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java	2006-08-24 11:50:39 UTC (rev 828)
@@ -22,6 +22,7 @@
 package org.jboss.test.ws.wsse;
 
 import java.rmi.RemoteException;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
 import javax.xml.rpc.Service;
@@ -68,12 +69,13 @@
     */
    public void testEndpointNoProperties() throws Exception
    {
-      System.setProperty("org.jboss.ws.wsse.keyStore", null);
-      System.setProperty("org.jboss.ws.wsse.trustStore", null);
-      System.setProperty("org.jboss.ws.wsse.keyStorePassword", null);
-      System.setProperty("org.jboss.ws.wsse.trustStorePassword", null);
-      System.setProperty("org.jboss.ws.wsse.keyStoreType", null);
-      System.setProperty("org.jboss.ws.wsse.trustStoreType", null);
+      Properties props = System.getProperties();
+      props.remove("org.jboss.ws.wsse.keyStore");
+      props.remove("org.jboss.ws.wsse.trustStore");
+      props.remove("org.jboss.ws.wsse.keyStorePassword");
+      props.remove("org.jboss.ws.wsse.trustStorePassword");
+      props.remove("org.jboss.ws.wsse.keyStoreType");
+      props.remove("org.jboss.ws.wsse.trustStoreType");
 
       InitialContext iniCtx = getInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java	2006-08-24 11:43:21 UTC (rev 827)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java	2006-08-24 11:50:39 UTC (rev 828)
@@ -22,6 +22,7 @@
 package org.jboss.test.ws.wsse;
 
 import java.rmi.RemoteException;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
 import javax.xml.rpc.Service;
@@ -60,12 +61,13 @@
          ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog");
       }
 
-      System.setProperty("org.jboss.ws.wsse.keyStore", null);
-      System.setProperty("org.jboss.ws.wsse.trustStore", null);
-      System.setProperty("org.jboss.ws.wsse.keyStorePassword", null);
-      System.setProperty("org.jboss.ws.wsse.trustStorePassword", null);
-      System.setProperty("org.jboss.ws.wsse.keyStoreType", null);
-      System.setProperty("org.jboss.ws.wsse.trustStoreType", null);
+      Properties props = System.getProperties();
+      props.remove("org.jboss.ws.wsse.keyStore");
+      props.remove("org.jboss.ws.wsse.trustStore");
+      props.remove("org.jboss.ws.wsse.keyStorePassword");
+      props.remove("org.jboss.ws.wsse.trustStorePassword");
+      props.remove("org.jboss.ws.wsse.keyStoreType");
+      props.remove("org.jboss.ws.wsse.trustStoreType");
    }
 
    public void testEchoString() throws Exception