You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/29 13:50:40 UTC
svn commit: r1536693 - in /sling/trunk/launchpad/integration-tests: pom.xml
src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
Author: bdelacretaz
Date: Tue Oct 29 12:50:40 2013
New Revision: 1536693
URL: http://svn.apache.org/r1536693
Log:
SLING-3214 - some utility methods have moved to the new HttpTest class
Modified:
sling/trunk/launchpad/integration-tests/pom.xml
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
Modified: sling/trunk/launchpad/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1536693&r1=1536692&r2=1536693&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/pom.xml (original)
+++ sling/trunk/launchpad/integration-tests/pom.xml Tue Oct 29 12:50:40 2013
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.14</version>
+ <version>2.0.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=1536693&r1=1536692&r2=1536693&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java Tue Oct 29 12:50:40 2013
@@ -18,6 +18,7 @@ package org.apache.sling.launchpad.webap
import java.io.IOException;
+import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Base class for rendering tests
@@ -32,14 +33,10 @@ public abstract class RenderingTestBase
}
protected void assertContains(String content, String expected) {
- if(!content.contains(expected)) {
- fail("Content does not contain '" + expected + "' (content=" + content + ")");
- }
+ HttpTest.assertContains(content, expected);
}
protected void assertNotContains(String content, String notExpected) {
- if(content.contains(notExpected)) {
- fail("Content contains '" + notExpected + "' (content=" + content + ")");
- }
+ HttpTest.assertNotContains(content, notExpected);
}
}