You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/09/28 20:53:45 UTC
svn commit: r580458 - in
/geronimo/server/branches/2.0/testsuite/web-testsuite: test-2.1-jsps/
test-2.1-jsps/src/main/webapp/
test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/
test-2.5-servlets/ test-2.5-servlets/src/main/java/com/ test-2...
Author: gawor
Date: Fri Sep 28 11:53:44 2007
New Revision: 580458
URL: http://svn.apache.org/viewvc?rev=580458&view=rev
Log:
merge some more testsuite fixes from trunk
Added:
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/
- copied from r580452, geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/
Modified:
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/pom.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/pom.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/pom.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/pom.xml Fri Sep 28 11:53:44 2007
@@ -62,6 +62,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
<extensions>true</extensions>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp Fri Sep 28 11:53:44 2007
@@ -23,9 +23,6 @@
<c:set var="var2" value="value2" scope="request"/>
<c:set var="var3" value="value3" scope="session"/>
<c:set var="var4" value="value4" scope="application"/>
-<c:out value='${pageScope.var1}' />
-<c:out value='${requestScope.var2}' />
-<c:out value='${sessionScope.var3}' />
-<c:out value='${applicationScope.var4}' />
+<c:out value='${pageScope.var1} ${requestScope.var2} ${sessionScope.var3} ${applicationScope.var4}' />
</body>
</html>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java Fri Sep 28 11:53:44 2007
@@ -32,7 +32,7 @@
selenium.waitForPageToLoad("30000");
//throw new Exception(selenium.getText("xpath=/html/body"));
- assertEquals("One Two", selenium.getText("xpath=/html/body"));
+ assertEquals("OneTwo", selenium.getText("xpath=/html/body"));
}
@Test
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/pom.xml Fri Sep 28 11:53:44 2007
@@ -56,6 +56,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
<extensions>true</extensions>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml Fri Sep 28 11:53:44 2007
@@ -46,9 +46,7 @@
</servlet-mapping>
<filter-mapping>
<filter-name>Sample Filter</filter-name>
- <servlet-name>*</servlet-name>
- <!-- servlet-name>SampleServlet</servlet-name>
- <servlet-name>SampleServlet2</servlet-name -->
+ <url-pattern>/*</url-pattern>
</filter-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/pom.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/pom.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/pom.xml Fri Sep 28 11:53:44 2007
@@ -56,6 +56,11 @@
<id>child</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml Fri Sep 28 11:53:44 2007
@@ -58,12 +58,9 @@
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <reference name="LoginService">
- <name>JaasLoginService</name>
- </reference>
<xml-reference name="LoginModuleConfiguration">
<log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
- <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+ <log:login-module control-flag="REQUIRED" wrap-principals="false">
<log:login-domain-name>demo-properties-realm</log:login-domain-name>
<log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
<log:option name="usersURI">var/security/demo_users.properties</log:option>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java Fri Sep 28 11:53:44 2007
@@ -28,12 +28,12 @@
@Test
public void testSecurity() throws Exception {
selenium.open("/demo/protect/hello.html");
- selenium.type("j_username", "system");
- selenium.type("j_password", "manager");
- selenium.click("submit");
- selenium.waitForPageToLoad("30000");
- assertEquals("hello world.", selenium.getText("xpath=/html"));
+ selenium.type("j_username", "george");
+ selenium.type("j_password", "bone");
+ selenium.click("submit");
+ selenium.waitForPageToLoad("30000");
+ assertEquals("hello world.", selenium.getText("xpath=/html"));
}
-}
\ No newline at end of file
+}
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml Fri Sep 28 11:53:44 2007
@@ -56,6 +56,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<modules>
@@ -83,6 +88,30 @@
</configuration>
</plugin>
+ <!-- "ear" packaging doesn't compile test classes -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- "ear" packaging doesn't process test resources -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml Fri Sep 28 11:53:44 2007
@@ -34,7 +34,7 @@
</dep:dependency>
<dep:dependency>
<dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>activemq</dep:artifactId>
+ <dep:artifactId>activemq-ra</dep:artifactId>
</dep:dependency>
</dep:dependencies>
</dep:environment>
@@ -44,9 +44,12 @@
<context-root>/webref</context-root>
<ejb-ref>
<ref-name>ejb/TestBean</ref-name>
+ <ejb-link>TestBean</ejb-link>
+<!--
<pattern>
<name>TestBean</name>
</pattern>
+-->
</ejb-ref>
<resource-ref>
<ref-name>jdbc/MyDataSource</ref-name>
Modified: geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java?rev=580458&r1=580457&r2=580458&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java (original)
+++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java Fri Sep 28 11:53:44 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.testsuite.deployment;
+package org.apache.geronimo.testsuite.web.references;
import org.apache.geronimo.testsupport.SeleniumTestSupport;
import org.testng.annotations.Test;
@@ -36,7 +36,7 @@
selenium.open("/webref/TomcatTestServlet");
selenium.waitForPageToLoad("30000");
assertEquals("Sample application to check references", selenium.getTitle());
- assertEquals(" Check EJB Reference : Call to bean method returned ->bean Test", selenium.getText("xpath=/html/body/font"));
+ assertEquals("Check EJB Reference : Call to bean method returned ->bean Test", selenium.getText("xpath=/html/body/font"));
}
}