Author: ptahchiev
Date: Fri Apr  4 14:44:58 2008
New Revision: 644944

URL: http://svn.apache.org/viewvc?rev=644944&view=rev
Log:
Moved the cactus tests to the java folder.

Added:
    jakarta/cactus/trunk/samples/jetty/src/main/java/org/
    jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/
    jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/
    jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/
    
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/
    
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
   (with props)
Removed:
    jakarta/cactus/trunk/samples/jetty/src/main/cactus/
Modified:
    jakarta/cactus/trunk/samples/jetty/pom.xml

Modified: jakarta/cactus/trunk/samples/jetty/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/pom.xml?rev=644944&r1=644943&r2=644944&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/pom.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/pom.xml Fri Apr  4 14:44:58 2008
@@ -50,6 +50,12 @@
                        <version>${version}</version>
                </dependency>
                <dependency>
+                       <groupId>org.apache.cactus</groupId>
+                       <artifactId>cactus.samples.servlet</artifactId>
+                       <type>war</type>
+                       <version>${version}</version>
+               </dependency>
+               <dependency>
                        <groupId>xerces</groupId>
                        <artifactId>xercesImpl</artifactId>
                        <version>2.6.2</version>

Added: 
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java?rev=644944&view=auto
==============================================================================
--- 
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
 (added)
+++ 
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
 Fri Apr  4 14:44:58 2008
@@ -0,0 +1,59 @@
+/* 
+ * ========================================================================
+ * 
+ * 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.cactus.sample.jetty;
+
+import org.apache.cactus.extension.jetty.JettyTestSetup;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Run all tests inside the Jetty container.
+ *
+ * @version $Id: TestJettyAll.java 238816 2004-02-29 16:36:46Z vmassol $
+ */
+public class TestJettyAll extends TestCase
+{
+    /**
+     * @return a <code>JettyTestSetup</code> test suite that wraps all our
+     *         tests so that Jetty will be started before the tests execute
+     */
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite(
+            "Cactus unit tests executing in Jetty");
+
+        // Functional tests
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleServlet.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleServletConfig.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleTag.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleBodyTag.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleFilter.class);
+
+        return new JettyTestSetup(suite);
+    }
+}

Propchange: 
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to