Author: alessio.soldano(a)jboss.com Date: 2013-05-30 11:47:29 -0400 (Thu, 30 May 2013) New Revision: 17635 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java Log: Merging commit 17619 from jbossws-cxf stack upstream; do not set system properties on tests run concurrently! (that sys prop change is actually not even needed anymore) Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2013-05-30 15:46:29 UTC (rev 17634) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2013-05-30 15:47:29 UTC (rev 17635) @@ -54,8 +54,6 @@ private String CLASSES_DIR; private String TEST_DIR; - private String origJavaHome; - protected void setUp() throws Exception { super.setUp(); @@ -64,23 +62,8 @@ CLASSES_DIR = System.getProperty("test.classes.directory"); ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.jbws2528.JBWS2528Endpoint"; TEST_DIR = createResourceFile("..").getAbsolutePath(); - origJavaHome = System.getProperty("java.home"); - - - // the script requires the system JAVA_HOME, which points to the JDK not the JRE - if(origJavaHome.indexOf(FS + "jre")!=-1) - { - String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre")); - System.setProperty("java.home", JDK_HOME); - } } - protected void tearDown() throws Exception - { - // reset surefire's JAVA_HOME - System.setProperty("java.home", origJavaHome); - } - public void test() throws Exception { File destDir = new File(TEST_DIR, "wsprovide" + FS + "java"); Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2013-05-30 15:46:29 UTC (rev 17634) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2013-05-30 15:47:29 UTC (rev 17635) @@ -52,8 +52,6 @@ private String CLASSES_DIR; private String TEST_DIR; - private String origJavaHome; - protected void setUp() throws Exception { super.setUp(); @@ -62,23 +60,8 @@ CLASSES_DIR = System.getProperty("test.classes.directory"); ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.jbws2529.JBWS2529Endpoint"; TEST_DIR = createResourceFile("..").getAbsolutePath(); - origJavaHome = System.getProperty("java.home"); - - - // the script requires the system JAVA_HOME, which points to the JDK not the JRE - if(origJavaHome.indexOf(FS + "jre")!=-1) - { - String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre")); - System.setProperty("java.home", JDK_HOME); - } } - protected void tearDown() throws Exception - { - // reset surefire's JAVA_HOME - System.setProperty("java.home", origJavaHome); - } - public void test() throws Exception { File destDir = new File(TEST_DIR, "wsprovide" + FS + "java"); Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java 2013-05-30 15:46:29 UTC (rev 17634) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java 2013-05-30 15:47:29 UTC (rev 17635) @@ -46,30 +46,14 @@ private String JBOSS_HOME; private String TEST_DIR; - private String origJavaHome; - protected void setUp() throws Exception { super.setUp(); JBOSS_HOME = System.getProperty("jboss.home"); TEST_DIR = createResourceFile("..").getAbsolutePath(); - origJavaHome = System.getProperty("java.home"); - - // the script requires the system JAVA_HOME, which points to the JDK not the JRE - if (origJavaHome.indexOf(FS + "jre") != -1) - { - String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre")); - System.setProperty("java.home", JDK_HOME); - } } - protected void tearDown() throws Exception - { - // reset surefire's JAVA_HOME - System.setProperty("java.home", origJavaHome); - } - public void testWSConsumeFromCommandLine() throws Exception { // use absolute path for the output to be re-usable Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java 2013-05-30 15:46:29 UTC (rev 17634) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java 2013-05-30 15:47:29 UTC (rev 17635) @@ -48,30 +48,14 @@ private String JBOSS_HOME; private String TEST_DIR; - private String origJavaHome; - protected void setUp() throws Exception { super.setUp(); JBOSS_HOME = System.getProperty("jboss.home"); TEST_DIR = createResourceFile("..").getAbsolutePath(); - origJavaHome = System.getProperty("java.home"); - - // the script requires the system JAVA_HOME, which points to the JDK not the JRE - if (origJavaHome.indexOf(FS + "jre") != -1) - { - String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre")); - System.setProperty("java.home", JDK_HOME); - } } - protected void tearDown() throws Exception - { - // reset surefire's JAVA_HOME - System.setProperty("java.home", origJavaHome); - } - public void testRPC() throws Exception { this.internalTest(true); Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2013-05-30 15:46:29 UTC (rev 17634) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2013-05-30 15:47:29 UTC (rev 17635) @@ -48,8 +48,6 @@ protected String CLASSES_DIR; protected String TEST_DIR; - protected String origJavaHome; - protected void setUp() throws Exception { super.setUp(); @@ -59,15 +57,6 @@ //JBWS-2479 ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean"; TEST_DIR = createResourceFile("..").getAbsolutePath(); - origJavaHome = System.getProperty("java.home"); - - - // the script requires the system JAVA_HOME, which points to the JDK not the JRE - if(origJavaHome.indexOf(FS + "jre")!=-1) - { - String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre")); - System.setProperty("java.home", JDK_HOME); - } } public void testScritpsAvailable() @@ -77,10 +66,4 @@ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".bat").exists()); } - - protected void tearDown() throws Exception - { - // reset surefire's JAVA_HOME - System.setProperty("java.home", origJavaHome); - } }