You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/06/06 13:17:12 UTC
svn commit: r1346828 - in /cocoon/cocoon3/trunk:
cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ parent/
Author: ilgrosso
Date: Wed Jun 6 11:17:11 2012
New Revision: 1346828
URL: http://svn.apache.org/viewvc?rev=1346828&view=rev
Log:
Using new cocoon-it-fw 1.0.0-SNAPSHOT, hence annotating IT test methods with @Test
Modified:
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ParameterPassing.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java Wed Jun 6 11:17:11 2012
@@ -17,6 +17,7 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test aggregation.
@@ -26,6 +27,7 @@ public class AggregationTest extends Coc
/**
* A pipeline that uses the IncludeTransformer.
*/
+ @Test
public void testIncludeTransformer() throws Exception {
this.loadXmlPage("aggregation/include-transformer");
assertTrue(this.response.getStatusCode() == 200);
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java Wed Jun 6 11:17:11 2012
@@ -19,6 +19,7 @@ package org.apache.cocoon.it;
import static org.junit.Assert.*;
import org.apache.cocoon.sample.generation.CachingTimestampGenerator;
import org.apache.cocoon.sample.generation.TimestampGenerator;
+import org.junit.Test;
/**
* Test pipeline caching. The tests use the {@link TimestampGenerator} which always takes more 0.5 seconds to produce a
@@ -29,6 +30,7 @@ public class CachingOfPipelinesTest exte
/**
* Test if different matches in the same <map:pipeline>, produce different results.
*/
+ @Test
public void testCachingOfDifferentPipelines() throws Exception {
this.loadResponse("sax-pipeline/simple-1");
String content1 = this.response.getContentAsString();
@@ -46,6 +48,7 @@ public class CachingOfPipelinesTest exte
* This means that the second request has to return the same result but the third a different one because the cache
* key produced by the first result has become invalid in the meantime.
*/
+ @Test
public void testCachingPipeline() throws Exception {
this.loadResponse("caching-pipeline/on");
String content1 = this.response.getContentAsString();
@@ -67,6 +70,7 @@ public class CachingOfPipelinesTest exte
*
* After waiting for another second, a fresh result is returned.
*/
+ @Test
public void testExpiresAsyncCaching() throws Exception {
this.loadResponse("/expires/async-caching-pipeline/on");
String content1 = this.response.getContentAsString();
@@ -89,6 +93,7 @@ public class CachingOfPipelinesTest exte
*
* @see {@link #testExpiresAsyncCaching()}
*/
+ @Test
public void testExpiresCachingPipeline() throws Exception {
Thread.sleep(2000);
this.loadResponse("/expires/caching-pipeline/on");
@@ -102,6 +107,7 @@ public class CachingOfPipelinesTest exte
assertFalse("The response has to be the same as before.", content1.equals(content2));
}
+ @Test
public void testInvalidExpiresCachingPipeline() throws Exception {
this.loadResponse("/expires/caching-pipeline/invalid");
assertEquals(500, this.response.getStatusCode());
@@ -110,6 +116,7 @@ public class CachingOfPipelinesTest exte
/**
* A non-caching pipeline mustn't produce the same result twice.
*/
+ @Test
public void testNonCachingPipeline() throws Exception {
this.loadResponse("caching-pipeline/off");
String content1 = this.response.getContentAsString();
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java Wed Jun 6 11:17:11 2012
@@ -18,6 +18,7 @@ package org.apache.cocoon.it;
import static org.junit.Assert.*;
import org.apache.commons.httpclient.methods.HeadMethod;
+import org.junit.Test;
/**
* Test a SpringRESTController and StringTemplate.
@@ -28,6 +29,7 @@ public class ControllerTest extends Coco
* Test a pipeline that calls a SpringRESTController which delegates to a pipeline that uses a controller
* context-aware StringTemplate generator.
*/
+ @Test
public void testControllerInvocation() throws Exception {
this.loadXmlPage("/controller/abc/foo?reqparam=1");
int statusCode = this.response.getStatusCode();
@@ -42,6 +44,7 @@ public class ControllerTest extends Coco
/**
* Use the HEAD method to access a pipeline that calls a SpringRESTController.
*/
+ @Test
public void testControllerInvocationHead() throws Exception {
HeadMethod headMethod = this.loadHeadResponse("/controller/abc/foo?reqparam=1", 202);
assertEquals("text/xml", headMethod.getResponseHeader("Content-type").getValue());
@@ -52,6 +55,7 @@ public class ControllerTest extends Coco
/**
* Test the conditional GET support for controllers.
*/
+ @Test
public void testControllerConditionalGetInvocation() throws Exception {
this.loadXmlPage("/controller/conditional-get/abc/foo?reqparam=1");
int statusCode = this.response.getStatusCode();
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,14 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test error handling of sitemaps.
*/
public class ErrorHandlingTest extends CocoonHtmlUnitTestCase {
+ @Test
public void testPerSitemap404() throws Exception {
this.loadResponse("12345678901234567890");
int statusCode = this.response.getStatusCode();
@@ -31,6 +33,7 @@ public class ErrorHandlingTest extends C
.indexOf("404 Resource Not Available (Cocoon 3 Integration Tests)") > 0);
}
+ @Test
public void testPerSitemapCustomError() throws Exception {
this.loadResponse("error-handling/custom-error");
int statusCode = this.response.getStatusCode();
@@ -38,6 +41,7 @@ public class ErrorHandlingTest extends C
assertTrue(this.response.getContentAsString().indexOf("Error 500 (Cocoon 3 Integration Tests)") > 0);
}
+ @Test
public void testPerPipelineCustomError() throws Exception {
this.loadResponse("error-handling/custom-error-per-pipeline-error-handling");
int statusCode = this.response.getStatusCode();
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java Wed Jun 6 11:17:11 2012
@@ -17,6 +17,7 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test expression language usage
@@ -26,6 +27,7 @@ public class ExpressionLanguageTest exte
/**
* JEXL test
*/
+ @Test
public void testJexl() throws Exception {
this.loadXmlPage("expression-language/jexl?fileName=simple");
assertTrue(this.response.getStatusCode() == 200);
@@ -36,6 +38,7 @@ public class ExpressionLanguageTest exte
/**
* Map language test
*/
+ @Test
public void testMapNumbers() throws Exception {
this.loadXmlPage("expression-language/map-numbers/simple");
assertTrue(this.response.getStatusCode() == 200);
@@ -43,6 +46,7 @@ public class ExpressionLanguageTest exte
this.assertXPath("/simple", "simple-text");
}
+ @Test
public void testMapNamedParameters() throws Exception {
this.loadXmlPage("expression-language/map-named-parameters/simple");
assertTrue(this.response.getStatusCode() == 200);
@@ -53,6 +57,7 @@ public class ExpressionLanguageTest exte
/**
* Nested matchers/maps
*/
+ @Test
public void testNextedMap() throws Exception {
this.loadXmlPage("expression-language/nested/simple");
assertTrue(this.response.getStatusCode() == 200);
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java Wed Jun 6 11:17:11 2012
@@ -18,6 +18,7 @@ package org.apache.cocoon.it;
import static org.junit.Assert.*;
import org.apache.commons.io.IOUtils;
+import org.junit.Test;
/**
* Test FOP serialization
@@ -27,6 +28,7 @@ public class FOPTest extends CocoonHtmlU
/**
* Create a PDF document
*/
+ @Test
public void testSerializeAsPDF() throws Exception {
this.loadResponse("fop/test.pdf");
assertTrue(this.response.getStatusCode() == 200);
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,14 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test the usage of JAX-RS services.
*/
public class JAXRSTest extends CocoonHtmlUnitTestCase {
+ @Test
public void test401StatusCode() throws Exception {
this.loadResponse("/jax-rs/sample/sax-pipeline/unauthorized");
int statusCode = this.response.getStatusCode();
@@ -36,12 +38,14 @@ public class JAXRSTest extends CocoonHtm
assertFalse(cocoonVersion.equals(""));
}
+ @Test
public void test404() throws Exception {
this.loadResponse("/jax-rs/sample/not-exisiting");
int statusCode = this.response.getStatusCode();
assertTrue(statusCode == 404);
}
+ @Test
public void testPassingParameters() throws Exception {
this.loadXmlPage("/jax-rs/sample/parameter-passing/1?req-param=1");
int statusCode = this.response.getStatusCode();
@@ -54,12 +58,14 @@ public class JAXRSTest extends CocoonHtm
this.assertXPath("/html/body/p[4]", "testProperty=test");
}
+ @Test
public void testAnotherResource() throws Exception {
this.loadResponse("jax-rs/sample2/read/javascript-resource-implicit.js");
assertTrue(this.response.getStatusCode() == 200);
assertEquals(this.response.getContentType(), "application/x-javascript");
}
+ @Test
public void testConditionalGet() throws Exception {
this.loadResponse("jax-rs/sample2/read/javascript-resource-implicit.js");
String lastModified = this.response.getResponseHeaderValue("Last-Modified");
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,15 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* Testing advanced matching scenarios.
*/
public class MatcherTest extends CocoonHtmlUnitTestCase {
+ @Test
public void testStartsWithWhen() throws Exception {
this.loadXmlPage("advanced-matching?myparam=55");
assertTrue(this.response.getStatusCode() == 200);
@@ -30,6 +33,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "5");
}
+ @Test
public void testEqualsWhen() throws Exception {
this.loadXmlPage("advanced-matching?myparam=11");
assertTrue(this.response.getStatusCode() == 200);
@@ -37,6 +41,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "11");
}
+ @Test
public void testRegexpWhen() throws Exception {
this.loadXmlPage("advanced-matching?myparam=22");
assertTrue(this.response.getStatusCode() == 200);
@@ -44,6 +49,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "2");
}
+ @Test
public void testOtherwise() throws Exception {
this.loadXmlPage("advanced-matching?myparam=32");
assertTrue(this.response.getStatusCode() == 200);
@@ -56,6 +62,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "otherwise");
}
+ @Test
public void testMatchUncompletePipeline() throws Exception {
this.loadXmlPage("advanced-matching-2?myparam=1");
assertTrue(this.response.getStatusCode() == 200);
@@ -68,6 +75,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "otherwise");
}
+ @Test
public void testDeeplyNestedMatcherSelector1() throws Exception {
this.loadXmlPage("advanced-matching-4?param_a=1¶m_b=1¶m_c=1¶m_d=1¶m_e=1");
assertTrue(this.response.getStatusCode() == 200);
@@ -82,6 +90,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p[text() = '8']", "");
}
+ @Test
public void testDeeplyNestedMatcherSelector2() throws Exception {
this.loadXmlPage("advanced-matching-4?param_a=1¶m_b=1¶m_c=1¶m_d=2¶m_e=1");
assertTrue(this.response.getStatusCode() == 200);
@@ -96,6 +105,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p[text() = '8']", "");
}
+ @Test
public void testDeeplyNestedMatcherSelector3() throws Exception {
this.loadXmlPage("advanced-matching-4?param_a=1¶m_b=2¶m_e=1¶m_g=2");
assertTrue(this.response.getStatusCode() == 200);
@@ -110,6 +120,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p[text() = '8']", "8");
}
+ @Test
public void testDeeplyNestedMatcherSelector4() throws Exception {
this.loadXmlPage("advanced-matching-4?param_g=1");
assertTrue(this.response.getStatusCode() == 200);
@@ -124,6 +135,7 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p[text() = '8']", "");
}
+ @Test
public void testNamedMatcher() throws Exception {
this.loadXmlPage("named-matcher/1?param_a=1¶m_b=1");
assertTrue(this.response.getStatusCode() == 200);
@@ -131,7 +143,9 @@ public class MatcherTest extends CocoonH
this.assertXPath("/html/body/p", "1");
}
- public void ignored_testDeepRelativeMatcher() throws Exception {
+ @Test
+ @Ignore
+ public void testDeepRelativeMatcher() throws Exception {
this.loadXmlPage("deep-relative-matcher/1?param_a=1¶m_b=1");
assertTrue(this.response.getStatusCode() == 200);
assertEquals("text/xml", this.response.getContentType());
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java Wed Jun 6 11:17:11 2012
@@ -18,6 +18,7 @@ package org.apache.cocoon.it;
import static org.junit.Assert.*;
import org.custommonkey.xmlunit.Diff;
+import org.junit.Test;
/**
* Test accessing the object model.
@@ -27,6 +28,7 @@ public class ObjectModelTest extends Coc
/**
* Accessing all request parameters from within a generator.
*/
+ @Test
public void testTemporaryRedirect() throws Exception {
this.loadResponse("object-model/request-parameters?a=1&b=2&c=3");
assertEquals(200, this.response.getStatusCode());
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ParameterPassing.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ParameterPassing.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ParameterPassing.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ParameterPassing.java Wed Jun 6 11:17:11 2012
@@ -16,30 +16,32 @@
*/
package org.apache.cocoon.it;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
/**
* Test passing parameters.
*/
public class ParameterPassing extends CocoonHtmlUnitTestCase {
- public void testDummy() {
+ /**
+ * Passing parameters from a matcher to the sitemap.
+ */
+ //@Test
+ public void testPassingParamatersFromMatcherToSitemap() throws Exception {
+ this.loadXmlPage("parameter-passing/working");
+ assertTrue(this.response.getStatusCode() == 200);
+ assertEquals("text/xml", this.response.getContentType());
+ this.assertXPath("/simple", "simple-text");
}
- // /**
- // * Passing parameters from a matcher to the sitemap.
- // */
- // public void testPassingParamatersFromMatcherToSitemap() throws Exception {
- // this.loadXmlPage("parameter-passing/working");
- // assertTrue(this.response.getStatusCode() == 200);
- // assertEquals("text/xml", this.response.getContentType());
- // this.assertXPath("/simple", "simple-text");
- // }
- //
- // /**
- // * Passing null from a matcher to the sitemap (-> doesn't match)
- // */
- // public void testPassingNullMatcherToSitemap() throws Exception {
- // this.webClient.setThrowExceptionOnFailingStatusCode(false);
- // this.loadResponse("parameter-passing/failing");
- // assertTrue(this.response.getStatusCode() == 404);
- // }
+ /**
+ * Passing null from a matcher to the sitemap (-> doesn't match)
+ */
+ //@Test
+ public void testPassingNullMatcherToSitemap() throws Exception {
+ this.webClient.setThrowExceptionOnFailingStatusCode(false);
+ this.loadResponse("parameter-passing/failing");
+ assertTrue(this.response.getStatusCode() == 404);
+ }
}
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,14 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test profiling.
*/
public class ProfilingTest extends CocoonHtmlUnitTestCase {
+ @Test
public void testCachingPipeline() throws Exception {
this.loadResponse("caching-pipeline/on");
this.loadResponse("caching-pipeline/on");
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java Wed Jun 6 11:17:11 2012
@@ -17,15 +17,17 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test readers
*/
public class ReaderTest extends CocoonHtmlUnitTestCase {
- /**
+ /**
* Call a pipeline that explicitly sets the mime-type of the resource.
*/
+ @Test
public void testReadingResourceWithExplicitMimeType() throws Exception {
this.loadResponse("read/javascript-resource-explicit");
assertTrue(this.response.getStatusCode() == 200);
@@ -35,6 +37,7 @@ public class ReaderTest extends CocoonHt
/**
* Call a pipeline that automatically sets the mime-type of the resource.
*/
+ @Test
public void testReadingResourceWithImplicitMimeType() throws Exception {
this.loadResponse("read/javascript-resource-implicit.js");
assertTrue(this.response.getStatusCode() == 200);
@@ -44,6 +47,7 @@ public class ReaderTest extends CocoonHt
/**
* Call a pipeline that uses an unknown file extensions.
*/
+ @Test
public void testReadingResourceWithUnknownMimeType() throws Exception {
this.loadResponse("read/javascript-resource-implicit.abc");
assertTrue(this.response.getStatusCode() == 200);
@@ -53,6 +57,7 @@ public class ReaderTest extends CocoonHt
/**
* A resource reader supports conditional gets.
*/
+ @Test
public void testConditionalGet() throws Exception {
this.loadResponse("read/javascript-resource-implicit.js");
String lastModified = this.response.getResponseHeaderValue("Last-Modified");
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java Wed Jun 6 11:17:11 2012
@@ -17,6 +17,7 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test redirecting
@@ -26,6 +27,7 @@ public class RedirectTest extends Cocoon
/**
* A temporary redirect
*/
+ @Test
public void testTemporaryRedirect() throws Exception {
this.loadResponse("redirect/www.orf.at");
assertEquals(302, this.response.getStatusCode());
@@ -35,6 +37,7 @@ public class RedirectTest extends Cocoon
/**
* A redirect to a servlet: URL
*/
+ @Test
public void testServletRedirect() throws Exception {
this.loadXmlPage("redirect/sax-pipeline/simple-xml");
assertEquals(200, this.response.getStatusCode());
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java Wed Jun 6 11:17:11 2012
@@ -18,6 +18,7 @@ package org.apache.cocoon.it;
import static org.junit.Assert.*;
import org.apache.commons.httpclient.methods.HeadMethod;
+import org.junit.Test;
/**
* Test SAX Pipelines
@@ -27,6 +28,7 @@ public class SaxPipelineTest extends Coc
/**
* A simple pipeline that produces an HTML document.
*/
+ @Test
public void testSimplePipeline() throws Exception {
this.loadResponse("/sax-pipeline/simple");
assertTrue(this.response.getStatusCode() == 200);
@@ -34,6 +36,7 @@ public class SaxPipelineTest extends Coc
assertTrue(this.response.getContentAsString().indexOf("-//W3C//DTD XHTML 1.0 Strict//EN") == -1);
}
+ @Test
public void testHead() throws Exception {
HeadMethod headMethod = this.loadHeadResponse("/sax-pipeline/simple", 200);
assertEquals("text/xml", headMethod.getResponseHeader("Content-type").getValue());
@@ -45,6 +48,7 @@ public class SaxPipelineTest extends Coc
* A simple pipeline that produces an XHTML 1.0 document. This implicitly tests if the
* configuration of serializers works properly.
*/
+ @Test
public void testSimplePipelineXhtml() throws Exception {
this.loadResponse("/sax-pipeline/simple-xhtml");
assertTrue(this.response.getStatusCode() == 200);
@@ -55,6 +59,7 @@ public class SaxPipelineTest extends Coc
/**
* A parameter is passed to an XSLT transformer.
*/
+ @Test
public void testSimplePipelineParameterPassingToTransformer() throws Exception {
this.loadXmlPage("/sax-pipeline/simple-xml");
assertTrue(this.response.getStatusCode() == 200);
@@ -65,6 +70,7 @@ public class SaxPipelineTest extends Coc
/**
* A status code is set explicitly at a serializer.
*/
+ @Test
public void testSettingStatusCode() throws Exception {
this.loadResponse("/sax-pipeline/unauthorized");
int statusCode = this.response.getStatusCode();
@@ -73,6 +79,7 @@ public class SaxPipelineTest extends Coc
assertNull(lastModified);
}
+ @Test
public void testSettingStatusCodeHead() throws Exception {
this.loadHeadResponse("/sax-pipeline/unauthorized", 401);
}
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,14 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test the serializers components.
*/
public class SerializersTest extends CocoonHtmlUnitTestCase {
+ @Test
public void testEXML() throws Exception {
this.loadResponse("/serializers/exml");
assertTrue(this.response.getStatusCode() == 200);
@@ -31,6 +33,7 @@ public class SerializersTest extends Coc
assertTrue(this.response.getContentAsString().indexOf("-//W3C//DTD XHTML 1.0 Strict//EN") == -1);
}
+ @Test
public void testEXHTML() throws Exception {
this.loadResponse("/serializers/exhtml");
assertTrue(this.response.getStatusCode() == 200);
@@ -39,6 +42,7 @@ public class SerializersTest extends Coc
assertTrue(this.response.getContentAsString().indexOf("-//W3C//DTD XHTML 1.0 Strict//EN") > 0);
}
+ @Test
public void testEHTML() throws Exception {
this.loadResponse("/serializers/ehtml");
assertTrue(this.response.getStatusCode() == 200);
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java Wed Jun 6 11:17:11 2012
@@ -17,12 +17,14 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test the usage of servlet services in Cocoon sitemaps.
*/
public class ServletServiceTest extends CocoonHtmlUnitTestCase {
+ @Test
public void testSimpleServletServiceCallingAPipeline() throws Exception {
this.loadXmlPage("ssf/local");
assertTrue(this.response.getStatusCode() == 200);
@@ -30,12 +32,14 @@ public class ServletServiceTest extends
this.assertXPath("/html/body/p[1]", "3-true");
}
+ @Test
public void testSimpleServletServiceCallingAResource() throws Exception {
this.loadResponse("ssf/read-resource");
assertTrue(this.response.getStatusCode() == 200);
assertEquals("text/javascript", this.response.getContentType());
}
+ @Test
public void testServiceConsumer() throws Exception {
this.loadPostResponse("ssf/service-consumer", "<a>1</a>");
assertTrue(this.response.getStatusCode() == 200);
@@ -45,6 +49,7 @@ public class ServletServiceTest extends
.contains("<a>1</a>"));
}
+ @Test
public void testCallingATransformerServletService() throws Exception {
this.loadXmlPage("ssf/calling-a-transformer-servlet-service");
assertTrue(this.response.getStatusCode() == 200);
@@ -52,6 +57,7 @@ public class ServletServiceTest extends
this.assertXPath("/html/body/p[1]", "transformer-pipeline");
}
+ @Test
public void testCallingASerializerServletService() throws Exception {
this.loadXmlPage("ssf/calling-a-serializer-servlet-service");
assertTrue(this.response.getStatusCode() == 210);
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java Wed Jun 6 11:17:11 2012
@@ -17,6 +17,7 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test the Cocoon-Wicket integration
@@ -26,6 +27,7 @@ public class WicketTest extends CocoonHt
/**
* The the Wicket homepage.
*/
+ @Test
public void testHomepage()
throws Exception {
@@ -37,6 +39,7 @@ public class WicketTest extends CocoonHt
/**
* A Wicket redirect
*/
+ @Test
public void testRedirect()
throws Exception {
@@ -49,6 +52,7 @@ public class WicketTest extends CocoonHt
/**
* A Wicket resource
*/
+ @Test
public void testWicketAjaxResource()
throws Exception {
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java Wed Jun 6 11:17:11 2012
@@ -17,6 +17,7 @@
package org.apache.cocoon.it;
import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test XSLT transformation.
@@ -26,6 +27,7 @@ public class XSLTTest extends CocoonHtml
/**
* Use an XSLT that includes sub stylesheets using the file and the servlet protocol.
*/
+ @Test
public void testXSLTTransformation() throws Exception {
this.loadXmlPage("xslt/main");
assertTrue(this.response.getStatusCode() == 200);
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1346828&r1=1346827&r2=1346828&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Wed Jun 6 11:17:11 2012
@@ -621,7 +621,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -916,7 +916,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0-M1</version>
+ <version>1.0.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.cocoon</groupId>