[seam-commits] Seam SVN: r12179 - in branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen: utils and 1 other directory.

[seam-commits at lists.jboss.org]

Author: jharting
Date: 2010-03-11 05:56:33 -0500 (Thu, 11 Mar 2010)
New Revision: 12179

Modified:
   branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java
   branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java
   branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java
   branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
Log:
JBPAPP-3861

Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java	2010-03-11 10:04:56 UTC (rev 12178)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/HotDeploymentNewFormTest.java	2010-03-11 10:56:33 UTC (rev 12179)
@@ -37,7 +37,14 @@
    @Override
    protected void prepareData()
    {
-      newComponentProperties = new String[] { "hi", "HiLocal", "Hi", "hi", "hiPage" };
+      if (WAR)
+      {
+         newComponentProperties = new String[] { "hi", "Hi", "hi", "hiPage" };
+      }
+      else
+      {
+         newComponentProperties = new String[] { "hi", "HiLocal", "Hi", "hi", "hiPage" };
+      }
    }
 
    @Override

Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java	2010-03-11 10:04:56 UTC (rev 12178)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewActionTest.java	2010-03-11 10:56:33 UTC (rev 12179)
@@ -49,7 +49,7 @@
    public void testNewComponent()
    {
       String form = "id=" + newComponentProperties[0] + "Form";
-      String button = form + ":" + newComponentProperties[3];
+      String button = form + ":" + newComponentProperties[newComponentProperties.length - 2];
       
       browser.open(getComponentPath());
 
@@ -60,7 +60,7 @@
       browser.clickAndWait(button);
 
       assertTrue(browser.isElementPresent(MESSAGES));
-      assertTrue(browser.getText(MESSAGES).contains(newComponentProperties[3]));
+      assertTrue(browser.getText(MESSAGES).contains(newComponentProperties[newComponentProperties.length - 2]));
    }
 
    public void generateNewComponent()
@@ -69,11 +69,18 @@
    }
    
    protected void prepareData() {
-      newComponentProperties = new String[]{ "ping", "PingLocal", "Ping", "ping", "pingPage" };
+      if (WAR)
+      {
+         newComponentProperties = new String[]{ "ping", "Ping", "ping", "pingPage" };
+      }
+      else
+      {
+         newComponentProperties = new String[]{ "ping", "PingLocal", "Ping", "ping", "pingPage" };
+      }
    }
    
    public String getComponentPath() {
-      return "/" + APP_NAME + "/" + newComponentProperties[4] + ".seam";
+      return "/" + APP_NAME + "/" + newComponentProperties[newComponentProperties.length - 1] + ".seam";
    }
    
    protected void deployNewComponent() {

Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java	2010-03-11 10:04:56 UTC (rev 12178)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewFormTest.java	2010-03-11 10:56:33 UTC (rev 12179)
@@ -40,7 +40,7 @@
    {
       
       String form = "id=" + newComponentProperties[0] + "Form";
-      String button = form + ":" + newComponentProperties[3];
+      String button = form + ":" + newComponentProperties[newComponentProperties.length - 2];
       String field = form + ":" + "valueField:value";
       String value = "world";
       
@@ -55,12 +55,19 @@
       browser.clickAndWait(button);
 
       assertTrue(browser.isElementPresent(MESSAGES), "Message not found.");
-      assertEquals(browser.getText(MESSAGES), newComponentProperties[3] + " " + value, "Unexpected form output.");
+      assertEquals(browser.getText(MESSAGES), newComponentProperties[newComponentProperties.length - 2] + " " + value, "Unexpected form output.");
    }
 
    @Override
    protected void prepareData() {
-      newComponentProperties = new String[]{ "hello", "HelloLocal", "Hello", "hello", "helloPage" };
+      if (WAR)
+      {
+         newComponentProperties = new String[]{ "hello", "Hello", "hello", "helloPage" };
+      }
+      else
+      {
+         newComponentProperties = new String[]{ "hello", "HelloLocal", "Hello", "hello", "helloPage" };
+      }
    }
  
    @Override

Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2010-03-11 10:04:56 UTC (rev 12178)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2010-03-11 10:56:33 UTC (rev 12179)
@@ -198,6 +198,7 @@
    class InputStreamEater extends Thread
    {
       private static final String INPUT_CHALLENGE = "[input]";
+      private static final String FALSE_INPUT_CHALLENGE = "skipping input";
       private BufferedReader stream;
       private OutputStreamFeeder feederToNotify;
       private PrintStream out;
@@ -219,7 +220,7 @@
             while ((line = stream.readLine()) != null)
             {
                out.println(line);
-               if (feederToNotify != null && line.contains(INPUT_CHALLENGE))
+               if (feederToNotify != null && line.contains(INPUT_CHALLENGE) && !line.contains(FALSE_INPUT_CHALLENGE))
                {
                   // notify OutputStreamFeeder to send an input
                   feederToNotify.feed();