geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r518772 - in /geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src: main/java/org/apache/myfaces/blank/HelloWorldBacking.java main/webapp/helloWorld.jsp test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Date Thu, 15 Mar 2007 22:04:24 GMT
Author: pmcmahan
Date: Thu Mar 15 15:04:23 2007
New Revision: 518772

URL: http://svn.apache.org/viewvc?view=rev&rev=518772
Log:
GERONIMO-2960 move the check for the injected variable out of the constructor

Modified:
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java?view=diff&rev=518772&r1=518771&r2=518772
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
Thu Mar 15 15:04:23 2007
@@ -42,7 +42,7 @@
      * default empty constructor
      */
     public HelloWorldBacking(){
-        greeting = "Hello " + testDouble;
+        greeting = "Hello";
     }
 
     @PostConstruct()
@@ -67,6 +67,16 @@
     public void setGreeting(String greeting)
     {
         this.greeting = greeting;
+    }
+
+    public Double getTestDouble()
+    {
+        return testDouble;
+    }
+
+    public void setTestDouble(Double testDouble)
+    {
+        this.testDouble = testDouble;
     }
 
     /**

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp?view=diff&rev=518772&r1=518771&r2=518772
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
Thu Mar 15 15:04:23 2007
@@ -10,7 +10,7 @@
         <f:view>
             <h:form id="form">
               <h:panelGrid id="grid" columns="2">
-                <h:outputText id="output1" value="Please enter your name"/>
+                <h:outputText id="output1" value="#{helloWorldBacking.testDouble} Please
enter your name"/>
                 <h:inputText id="input1" value="#{helloWorldBacking.name}" required="true"/>
                 <h:outputText value="#{helloWorldBacking.greeting}"/>
                 <h:commandButton id="button1" value="press me" action="#{helloWorldBacking.send}"/>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java?view=diff&rev=518772&r1=518771&r2=518772
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Thu Mar 15 15:04:23 2007
@@ -30,7 +30,7 @@
     public void testManagedBean() throws Exception {
         selenium.open("/myfaces");
         selenium.waitForPageToLoad("30000");
-        assertEquals("Please enter your name Hello 0.99 Update greeting", selenium.getBodyText());
+        assertEquals("0.99 Please enter your name Hello Update greeting", selenium.getBodyText());
     }
     
 }



Mime
View raw message