geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1165684 - in /geronimo/server/trunk/testsuite/enterprise-testsuite: ./ jms-tests/jms-ear/src/main/filtered-resources/META-INF/ sec-tests/sec-ear/ sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/
Date Tue, 06 Sep 2011 14:36:26 GMT
Author: xiaming
Date: Tue Sep  6 14:36:25 2011
New Revision: 1165684

URL: http://svn.apache.org/viewvc?rev=1165684&view=rev
Log:
GERONIMO-5459 Open disabled cases and fix failed cases caused by logging issue

Modified:
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=1165684&r1=1165683&r2=1165684&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Tue Sep  6 14:36:25 2011
@@ -33,7 +33,6 @@
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.configs</dep:groupId>
                 <dep:artifactId>activemq-broker-blueprint</dep:artifactId>
-                <dep:version>${version}</dep:version>
                 <dep:type>car</dep:type>
             </dep:dependency>
         </dep:dependencies>
@@ -68,7 +67,6 @@
         <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <dep:groupId>org.apache.geronimo.modules</dep:groupId>
             <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
-            <dep:version>${version}</dep:version>
             <dep:type>rar</dep:type>
         </external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=1165684&r1=1165683&r2=1165684&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Tue Sep  6 14:36:25 2011
@@ -47,27 +47,24 @@
     </description>
 
     <modules>
-<!--
         <module>ejb-tests</module>
         <module>jms-tests</module>
         <module>sec-tests</module>
--->
         <module>jpa-tests</module>
         <module>sec-client-tests</module>
         <module>appname-tests</module>
         <module>bundle-inject-test</module>
     </modules>
         
-    <profiles>
+    <!--<profiles>
         <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to
run on all projects -->
+            <id>all-subprojects</id>            
             <modules>
                 <module>ejb-tests</module>
                 <module>jms-tests</module>
                 <module>sec-tests</module>
             </modules>
         </profile>
-    </profiles>
+    </profiles>-->
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=1165684&r1=1165683&r2=1165684&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Tue Sep
 6 14:36:25 2011
@@ -147,6 +147,10 @@
                             </systemProperties>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java?rev=1165684&r1=1165683&r2=1165684&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java
(original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java
Tue Sep  6 14:36:25 2011
@@ -42,11 +42,11 @@ public class ClientTest extends TestSupp
             assertTrue("Expected Hello World", output.indexOf("Hello World!") != -1);
             assertTrue("Expected Principal", output.indexOf("Principal: org.apache.geronimo.security.IdentificationPrincipal")
!= -1);
             assertTrue("Expected Private Credential", output.indexOf("Private Credential:
org.apache.geronimo.openejb.ServerIdentityToken") != -1);
-            assertTrue("wrong server response", output.endsWith("Test EJB principal: bar\n"
+
+            assertTrue("wrong server response", output.indexOf("Test EJB principal: bar\n"
+
                     "TestSession isCallerInRole foo: false\n" +
                     "TestSession isCallerInRole bar: true\n" +
                     "TestSession isCallerInRole baz: false\n" +
-                    "Correctly received security exception on testAccessFoo method\n"));
+                    "Correctly received security exception on testAccessFoo method\n") !=
-1);
         } finally {
             if (in != null) {
                 in.close();



Mime
View raw message