[seam-commits] Seam SVN: r14028 - in branches/community/Seam_2_2/src/test/ftest: src/main/org/jboss/seam/example/common/test/booking/cluster/selenium and 1 other directories.

[seam-commits at lists.jboss.org]

Author: mgencur at redhat.com
Date: 2011-01-26 11:30:43 -0500 (Wed, 26 Jan 2011)
New Revision: 14028

Modified:
   branches/community/Seam_2_2/src/test/ftest/examples/build.xml
   branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/cluster/selenium/FailoverTest.java
   branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
JBSEAM-4771, fix failover cluster test for booking for JBossAS 6

Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml	2011-01-26 15:00:27 UTC (rev 14027)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml	2011-01-26 16:30:43 UTC (rev 14028)
@@ -161,6 +161,7 @@
 			<sysproperty key="openid.password" value="${openid.password}" />
 			<sysproperty key="seam.dir" value="${seam.dir}" />
 			<sysproperty key="jboss.home" value="${container.home}" />
+			<sysproperty key="container" value="${container}" />
 		</testng>
 	</target>
 

Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/cluster/selenium/FailoverTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/cluster/selenium/FailoverTest.java	2011-01-26 15:00:27 UTC (rev 14027)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/cluster/selenium/FailoverTest.java	2011-01-26 16:30:43 UTC (rev 14028)
@@ -115,8 +115,17 @@
     
     public void shutdownMasterJBossInstance()
     {
-      String command = JBOSS_HOME + "/bin/shutdown.sh -s localhost:1099 -S";
-      //System.out.println("Command:" + command);
+      String command = ""; 
+      
+      if (CONTAINER.contains("jboss6"))
+      {
+         command = JBOSS_HOME + "/bin/shutdown.sh -s service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi -S";
+      }
+      else
+      {
+         command = JBOSS_HOME + "/bin/shutdown.sh -s localhost:1099 -S";
+      }
+
       try
       {
          Process process = Runtime.getRuntime().exec(command);

Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java	2011-01-26 15:00:27 UTC (rev 14027)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java	2011-01-26 16:30:43 UTC (rev 14028)
@@ -55,6 +55,7 @@
     protected static String APP_NAME;
     protected static String OUTPUT_DIR;
     protected static String JBOSS_HOME;
+    protected static String CONTAINER;
     
     
     //protected SeamSelenium
@@ -63,9 +64,10 @@
     @BeforeClass
     @Parameters( { "selenium.host", "selenium.server.port", "selenium.browser",
             "selenium.browser.url", "selenium.speed", "selenium.timeout",
-            "PROPERTY_FILE", "example.context.path", "seam.dir", "jboss.home" })
+            "PROPERTY_FILE", "example.context.path", "seam.dir", "jboss.home", "container"})
     public void setParameters(String host, String port, String browser,
-            String browserUrl, String speed, String timeout, String propertyFile, @Optional("") String contextPath, String seamDir, String jbossHome) {
+            String browserUrl, String speed, String timeout, String propertyFile,
+            @Optional("") String contextPath, String seamDir, String jbossHome, String container) {
         HOST = host;
         PORT = Integer.parseInt(port);
         BROWSER = browser;
@@ -77,6 +79,7 @@
         SEAM_DIR = seamDir;
         OUTPUT_DIR = SEAM_DIR + "/test-output/functional-framework";
         JBOSS_HOME = jbossHome;
+        CONTAINER = container;
     }
 
     @BeforeMethod