Author: ptahchiev
Date: Fri Mar 7 06:53:57 2008
New Revision: 634700
URL: http://svn.apache.org/viewvc?rev=634700&view=rev
Log:
Some testcases added.
Added:
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
Modified:
jakarta/cactus/trunk/samples/servlet/build.xml
Modified: jakarta/cactus/trunk/samples/servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/build.xml?rev=634700&r1=634699&r2=634700&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/build.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/build.xml Fri Mar 7 06:53:57 2008
@@ -190,7 +190,8 @@
</configuration>
</cargo>
</containerset>
-
+ <sysproperty key="prop1" value="value1"/>
+ <sysproperty key="prop2" value="value2"/>
<formatter type="${cactus.formatter.type}"/>
<batchtest todir="${reports.dir}">
<fileset dir="${cactus.src.dir}">
Added:
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java?rev=634700&view=auto
==============================================================================
---
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java
(added)
+++
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java
Fri Mar 7 06:53:57 2008
@@ -0,0 +1,52 @@
+/*
+ * ========================================================================
+ *
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.integration.maven.test;
+
+import java.util.Map;
+
+import org.apache.cactus.ServletTestCase;
+import org.apache.cactus.WebRequest;
+
+/**
+ * Verify that properties defined by the
+ * <code>cactus.sysproperties</code> are found in the resulting
+ * cactified WAR. Note that we're testing this by executing this code inside
+ * the container.
+ *
+ * @version $Id: TestProperties.java 239081 2004-11-08 22:02:37Z felipeal $
+ */
+public class TestProperties extends ServletTestCase
+{
+
+ /**
+ * Verify that the properties were set correctly.
+ */
+ public void testProperties()
+ {
+ String prop1 = System.getProperty("prop1");
+ String prop2 = System.getProperty("prop2");
+ assertNotNull( prop1 );
+ assertNotNull( prop2 );
+ assertEquals( "value1", prop1 );
+ assertEquals( "value2", prop2 );
+ }
+
+}
Added:
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java?rev=634700&view=auto
==============================================================================
---
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
(added)
+++
jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
Fri Mar 7 06:53:57 2008
@@ -0,0 +1,92 @@
+/*
+ * ========================================================================
+ *
+ * Copyright 2001-2003 The Apache Software Foundation.
+ *
+ * Licensed 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.servlet.unit;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.cactus.ServletTestCase;
+
+/**
+ * Test the HtmlpUnit integration.
+ *
+ * @version $Id$
+ */
+public class TestHtmlUnitIntegration extends ServletTestCase
+{
+ /**
+ * Verify that the HtmlUnit integration works.
+ *
+ * @exception IOException on test failure
+ */
+ public void testHtmlUnitGetText() throws IOException
+ {
+ PrintWriter pw = response.getWriter();
+
+ pw.print("something to return for the test");
+ }
+
+ /**
+ * Verify that HttpUnit integration works
+ *
+ * @param theResponse the response from the server side.
+ *
+ * @exception IOException on test failure
+ */
+ public void endHtmlUnitGetText(
+ com.gargoylesoftware.htmlunit.WebResponse theResponse) throws
IOException
+ {
+ String text = theResponse.getContentAsString();
+
+ assertEquals("something to return for the test", text);
+ }
+
+ //-------------------------------------------------------------------------
+// TODO: I have never use HtmlUnit and I don't find the real equivalent for
+// this test. The next method failed.
+// /**
+// * Verify that we can set several headers in the response and
+// * assert them in endXXX().
+// */
+// public void testResponseAddHeadersHtmlUnit()
+// {
+// response.addHeader("X-Access-Header1", "value1");
+// response.addHeader("X-Access-Header2", "value2");
+// }
+//
+// /**
+// * Verify that we can set several headers in the response and
+// * assert them in endXXX().
+// *
+// * @param theResponse the response from the server side.
+// */
+// public void endResponseAddHeadersHtmlUnit(
+// com.gargoylesoftware.htmlunit.WebResponse theResponse)
+// {
+// String value1 =
+// theResponse.getResponseHeaderValue("X-Access-Header1");
+// String value2 =
+// theResponse.getResponseHeaderValue("X-Access-Header2");
+//
+// assertEquals("value1", value1);
+// assertEquals("value2", value2);
+// }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
