You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/06/19 16:55:50 UTC
svn commit: r548754 - in
/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests: ./
jca-cms-ear/ jca-cms-ear/src/test/ jca-cms-ear/src/test/java/
jca-cms-ear/src/test/java/org/ jca-cms-ear/src/test/java/org/apache/
jca-cms-ear/src/test/jav...
Author: djencks
Date: Tue Jun 19 07:55:49 2007
New Revision: 548754
URL: http://svn.apache.org/viewvc?view=rev&rev=548754
Log:
GERONIMO-3083 clean up the test app for j2ca container managed security, but I don't know how to get the selenium test to run
Added:
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/
- copied from r548734, geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/manifestcp-ear/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java (with props)
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/
- copied from r548734, geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/manifestcp-war/
Removed:
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/manifestcp-ear/
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/manifestcp-war/
Modified:
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?view=diff&rev=548754&r1=548734&r2=548754
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Tue Jun 19 07:55:49 2007
@@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>manifestcp-tests</artifactId>
+ <artifactId>jca-cms-tests</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jca-cms-ear</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
+ <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
<packaging>ear</packaging>
<dependencies>
Added: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java?view=auto&rev=548754
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java (added)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java Tue Jun 19 07:55:49 2007
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.testsuite.jmc-cms;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+@Test
+public class CmsTest
+ extends SeleniumTestSupport
+{
+ @Test
+ public void testPageContent() throws Exception {
+ selenium.open("/jca-cms/servlet");
+ selenium.waitForPageToLoad("30000");
+ //TODO the line separators might well be wrong???
+ assertEquals("Successfully got configured connection\n\nSuccessfully got container managed connection\n", selenium.getText("xpath=/html/body"));
+ }
+}
+
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jca-cms/CmsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?view=diff&rev=548754&r1=548734&r2=548754
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Tue Jun 19 07:55:49 2007
@@ -26,7 +26,7 @@
</parent>
<artifactId>jca-cms-war</artifactId>
- <name>Geronimo TestSuite :: Deployment Testsuite :: j2ca cms WAR</name>
+ <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security WAR</name>
<packaging>war</packaging>
<build>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml?view=diff&rev=548754&r1=548753&r2=548754
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml Tue Jun 19 07:55:49 2007
@@ -31,8 +31,8 @@
<profile>
<id>child</id>
<modules>
- <module>manifestcp-war</module>
- <module>manifestcp-ear</module>
+ <module>jca-cms-war</module>
+ <module>jca-cms-ear</module>
</modules>
</profile>
</profiles>