geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r991479 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src: main/webapp/ main/webapp/WEB-INF/ main/webapp/templates/ test/java/org/apache/geronimo/testsuite/myfaces2/
Date Wed, 01 Sep 2010 08:51:46 GMT
Author: xiaming
Date: Wed Sep  1 08:51:46 2010
New Revision: 991479

URL: http://svn.apache.org/viewvc?rev=991479&view=rev
Log:
GERONIMO-5528 remove sample header to speed up test execution in case of bad network performance

Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.html
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/templates/masterLayout.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/test/java/org/apache/geronimo/testsuite/myfaces2/TestMyfaces2.java

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/WEB-INF/web.xml?rev=991479&r1=991478&r2=991479&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/WEB-INF/web.xml
Wed Sep  1 08:51:46 2010
@@ -42,8 +42,10 @@
         </session-timeout>
     </session-config>
     <welcome-file-list>
+	<!--
         <welcome-file>index.html</welcome-file>
-        <!--<welcome-file>faces/criteriaapi/index.xhtml</welcome-file>-->
+	-->	
+        <welcome-file>faces/index.xhtml</welcome-file>
     </welcome-file-list>
 
 </web-app>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.html?rev=991479&r1=991478&r2=991479&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.html
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.html
Wed Sep  1 08:51:46 2010
@@ -15,15 +15,19 @@
    limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
class="cell"">
+
 <html>
 <head>
   <title>Apache Geronimo Sample Application</title>
   <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
 </head>
+<body>
+	<br />
+	<br />
+	<br />
+	<a href="./faces/index.xhtml" id="index">Start with Testing JSF2.0 new features</a>
+	<br/>
 
-<FRAMESET rows="86px,*" frameborder="0">
-    <FRAME id="index1" src="./header.html" name="headerFrame" title="Header" frameborder="0"
marginheight="0" marginwidth="0" noresize scrolling="no">
-    <FRAME id="index2" src="./faces/index.xhtml" name="sampleDocumentFrame" title="Sample
Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="yes">
-</FRAMESET>
+</body>
   
 </html>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.xhtml?rev=991479&r1=991478&r2=991479&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.xhtml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/index.xhtml
Wed Sep  1 08:51:46 2010
@@ -15,7 +15,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:f="http://java.sun.com/jsf/core"
@@ -25,8 +27,7 @@
 
 <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<link href="./css/default.css" rel="stylesheet"
-		type="text/css" />
+	<link href="./css/default.css" rel="stylesheet" type="text/css" />
 	<title>Converter Sample</title>
 </h:head>
 
@@ -34,12 +35,8 @@
 
 	<ui:composition template="/templates/masterLayout.xhtml">
 	
-
-
-	
 	<ui:define name="content">
-	<h3> Please input a number, or else you can't get a reply!
-	</h3>
+	<h3> Please input a number, or else you can't get a reply!</h3>
 		<h:form>
 			<h:outputText value="RMB:"/>
 			<h:inputText id="in" value="#{ConverterBean.value}">

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/templates/masterLayout.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/templates/masterLayout.xhtml?rev=991479&r1=991478&r2=991479&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/templates/masterLayout.xhtml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/main/webapp/templates/masterLayout.xhtml
Wed Sep  1 08:51:46 2010
@@ -1,3 +1,4 @@
+<?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
@@ -22,7 +23,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html">
-	<h:head>
+<h:head>
       <title><ui:insert name="title">Apache Geronimo Sample Application</ui:insert></title>
 
       <h:outputStylesheet library="css" name="basic.css"/>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/test/java/org/apache/geronimo/testsuite/myfaces2/TestMyfaces2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/test/java/org/apache/geronimo/testsuite/myfaces2/TestMyfaces2.java?rev=991479&r1=991478&r2=991479&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/test/java/org/apache/geronimo/testsuite/myfaces2/TestMyfaces2.java
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/src/test/java/org/apache/geronimo/testsuite/myfaces2/TestMyfaces2.java
Wed Sep  1 08:51:46 2010
@@ -26,10 +26,9 @@ public class TestMyfaces2 extends Seleni
 	
 	@Test 
 	public void testJSF2() throws Exception {  
-	    selenium.open("/converter-javaee6/index.html");
-		Thread.sleep(3000);
+	    selenium.open("/converter-javaee6/");
+		Thread.sleep(5000);
 		
-		selenium.selectFrame("sampleDocumentFrame");
 		assertTrue(selenium.isTextPresent("Converter-A Facelets and AJAX Example In JSF2.0"));
 		assertTrue(selenium.isTextPresent("Please input a number, or else you can't get a reply!"));

 		selenium.type("j_id1983071270_7ac218fa:in", "1000");



Mime
View raw message