[seam-commits] Seam SVN: r11220 - in branches/community/Seam_2_2/src/test/ftest: seamgen/src/main/org/jboss/seam/test/functional/seamgen and 1 other directories.

[seam-commits at lists.jboss.org]

Author: jharting
Date: 2009-06-29 10:23:44 -0400 (Mon, 29 Jun 2009)
New Revision: 11220

Modified:
   branches/community/Seam_2_2/src/test/ftest/ftest.properties
   branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
   branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
Log:
JBQA-2232

Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.properties	2009-06-29 12:16:11 UTC (rev 11219)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.properties	2009-06-29 14:23:44 UTC (rev 11220)
@@ -68,6 +68,10 @@
 # seam-gen specific properties
 #seamgen.delete.project=true
 
+# If set to true, the container is launched automatically prior to testsuite execution and shut down after it finishes
+# The container has to be run manually otherwise 
+seamgen.control.container=false
+
 # workspace for new projects
 workspace.home=
 

Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java	2009-06-29 12:16:11 UTC (rev 11219)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java	2009-06-29 14:23:44 UTC (rev 11220)
@@ -76,6 +76,8 @@
    protected static boolean WAR;
 
    protected static boolean DELETE_PROJECT;
+   
+   protected static boolean CONTROL_CONTAINER;
 
    protected static String TEST_SEAMGEN_PROPERTIES_FILE;
 
@@ -123,7 +125,9 @@
       loadFtestProperties();
       createOutputDir();
       startSeleniumServer();
-      container = startContainer(CONTAINER, CONTAINER_LOCATION);
+      if (CONTROL_CONTAINER) {
+         container = startContainer(CONTAINER, CONTAINER_LOCATION);
+      }
    }
 
    @AfterSuite
@@ -177,6 +181,7 @@
       CONTAINER_LOCATION = ftestProperties.getProperty(CONTAINER + ".home");
       DEPLOY_TIMEOUT = Integer.parseInt(ftestProperties.getProperty(CONTAINER + ".deploy.waittime")) * 1000; // miliseconds
       DELETE_PROJECT = Boolean.valueOf(ftestProperties.getProperty("seamgen.delete.project", "false"));
+      CONTROL_CONTAINER = Boolean.valueOf(ftestProperties.getProperty("seamgen.control.container", "false"));
 
       // load selenium constants
       SELENIUM_HOST = ftestProperties.getProperty("selenium.host");

Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2009-06-29 12:16:11 UTC (rev 11219)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2009-06-29 14:23:44 UTC (rev 11220)
@@ -96,7 +96,7 @@
 
    public void generateEntities()
    {
-      getAntCall().executeTarget("generate-entities");
+      getAntCall().executeTarget("generate");
    }
 
    /**