geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r518757 - in /geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src: main/java/org/apache/myfaces/blank/HelloWorldBacking.java main/webapp/WEB-INF/examples-config.xml test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Date Thu, 15 Mar 2007 21:27:05 GMT
Author: pmcmahan
Date: Thu Mar 15 14:27:04 2007
New Revision: 518757

URL: http://svn.apache.org/viewvc?view=rev&rev=518757
Log:
GERONIMO-2960 myfaces test case.  the surefire test still fails because (I think) dependency
injection is not totally working in managed beans yet.


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/WEB-INF/examples-config.xml
    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=518757&r1=518756&r2=518757
==============================================================================
--- 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 14:27:04 2007
@@ -42,7 +42,7 @@
      * default empty constructor
      */
     public HelloWorldBacking(){
-        greeting = "Hello";
+        greeting = "Hello " + testDouble;
     }
 
     @PostConstruct()

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/examples-config.xml?view=diff&rev=518757&r1=518756&r2=518757
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/examples-config.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/WEB-INF/examples-config.xml
Thu Mar 15 14:27:04 2007
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
-
-<faces-config>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
+    version="1.2">
 	
 	<!-- managed beans of the simple hello world app -->
 	<managed-bean>
@@ -36,4 +35,4 @@
 			<to-view-id>/helloWorld.jsp</to-view-id>
 		</navigation-case>
 	</navigation-rule>
-</faces-config>
\ No newline at end of file
+</faces-config>

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=518757&r1=518756&r2=518757
==============================================================================
--- 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 14:27:04 2007
@@ -28,10 +28,9 @@
 
     @Test
     public void testManagedBean() throws Exception {
-        selenium.open("/myfaces/index.jsp");
+        selenium.open("/myfaces");
         selenium.waitForPageToLoad("30000");
-        //     this is not done yet...  need to match the actual output of the JSP here
-        assertEquals("One Two", selenium.getText("xpath=/html/body"));
+        assertEquals("Please enter your name Hello 0.99 Update greeting", selenium.getBodyText());
     }
     
 }



Mime
View raw message