geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r936331 - in /geronimo/server/trunk/testsuite: ./ commands-testsuite/deploy/ commands-testsuite/shutdown/ security-testsuite/ security-testsuite/test-security/ security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/sec...
Date Wed, 21 Apr 2010 14:41:17 GMT
Author: gawor
Date: Wed Apr 21 14:41:16 2010
New Revision: 936331

URL: http://svn.apache.org/viewvc?rev=936331&view=rev
Log:
GERONIMO-5262: enable some tests in security-testsuite

Modified:
    geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml
    geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
    geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
    geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/resources/testng.xml

Modified: geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/deploy/pom.xml Wed Apr 21 14:41:16
2010
@@ -32,4 +32,18 @@
         Test for the deploy.bat/sh
     </description>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/shutdown/pom.xml Wed Apr 21 14:41:16
2010
@@ -32,4 +32,18 @@
         Test for the shutdown.bat/sh
     </description>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 21 14:41:16 2010
@@ -154,8 +154,8 @@
         <module>corba-testsuite</module>
         <module>deployment-testsuite</module>
         <module>enterprise-testsuite</module>
-        <module>security-testsuite</module>
 -->
+        <module>security-testsuite</module>
         <module>web-testsuite</module>
         <module>webservices-testsuite</module>
     </modules>
@@ -273,10 +273,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Wed Apr 21 14:41:16 2010
@@ -43,7 +43,7 @@
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
                     <configuration>
                         <suiteXmlFiles>
                             <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
@@ -54,14 +54,8 @@
         </pluginManagement>
     </build>
 
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to
run on all projects -->
-            <modules>
-                <module>test-security</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>test-security</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Wed Apr 21 14:41:16
2010
@@ -72,36 +72,46 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
 
-                    <execution>
-                        <id>undeploy</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
(original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
Wed Apr 21 14:41:16 2010
@@ -82,7 +82,7 @@ public class TestConsoleSecurity extends
         selenium.click("submit");
         waitForPageLoad();
         
-        assertTrue(selenium.isTextPresent("Invalid Username and"));
+        assertTrue(selenium.isTextPresent("Invalid User Name and"));
     }
     
 }

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
(original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
Wed Apr 21 14:41:16 2010
@@ -34,6 +34,7 @@ public class TestSecurity extends Seleni
         waitForPageLoad();
         assertEquals("hello world.", selenium.getText("xpath=/html"));
         selenium.deleteAllVisibleCookies();
+        selenium.refresh();
     }
 
     @Test
@@ -68,6 +69,7 @@ public class TestSecurity extends Seleni
     
     private void testFailure(String username, String password) throws Exception {
         selenium.open("/demo/protect/hello.html");
+        waitForPageLoad();
         if (username != null) {
             selenium.type("j_username", username);
         }

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/resources/testng.xml?rev=936331&r1=936330&r2=936331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/resources/testng.xml
(original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/resources/testng.xml
Wed Apr 21 14:41:16 2010
@@ -24,8 +24,15 @@
 
 <suite name="Suite1" verbose="5">
     <test name="security-testsuite.security">
+<!--
         <packages>
             <package name="org.apache.geronimo.testsuite.security"/>
         </packages>
+-->
+        <classes>
+            <class name="org.apache.geronimo.testsuite.security.TestConsoleSecurity"/>
+            <class name="org.apache.geronimo.testsuite.security.TestJMXSecurity"/>
+            <class name="org.apache.geronimo.testsuite.security.TestSecurity"/>
+        </classes>
     </test>
 </suite>



Mime
View raw message