You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/09/07 13:44:51 UTC
[sling-org-apache-sling-launchpad-integration-tests] branch master
updated: SLING-7890 Updated Rendering String check for default GET
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new 10457b9 SLING-7890 Updated Rendering String check for default GET
10457b9 is described below
commit 10457b9bb480b09dd4b5635e5f8f2412b4931c53
Author: JE Bailey <je...@apache.org>
AuthorDate: Fri Sep 7 09:44:47 2018 -0400
SLING-7890 Updated Rendering String check for default GET
Updated the string that the test was checking for by removing the word
Servlet, this allows the check to be backwards compatible
---
.../sling/launchpad/webapp/integrationtest/JspScriptingTest.java | 4 ++--
.../launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java | 2 +-
.../sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java | 4 ++--
.../sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java | 4 ++--
.../webapp/integrationtest/SlingResourceTypeRenderingTest.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
index 4822a32..17f201e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
@@ -68,7 +68,7 @@ public class JspScriptingTest {
@Retry
public void testRtNoScript() throws Exception {
final String content = H.getContent(rtNode.nodeUrl + ".txt", HttpTest.CONTENT_TYPE_PLAIN);
- assertTrue(content.contains("PlainTextRendererServlet"));
+ assertTrue(content.contains("PlainTextRenderer"));
assertTrue("Content contains " + rtNode.testText + " (" + content + ")", content.contains(rtNode.testText));
}
@@ -76,7 +76,7 @@ public class JspScriptingTest {
@Retry
public void testUnstructuredNoScript() throws Exception {
final String content = H.getContent(unstructuredNode.nodeUrl + ".txt", HttpTest.CONTENT_TYPE_PLAIN);
- assertTrue(content.contains("PlainTextRendererServlet"));
+ assertTrue(content.contains("PlainTextRenderer"));
assertTrue("Content contains " + unstructuredNode.testText + " (" + content + ")", content.contains(unstructuredNode.testText));
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
index 0272bb3..3f0f0d7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
@@ -65,7 +65,7 @@ public class NodeTypeBasedRenderingTest extends RenderingTestBase{
{
// No script -> default rendering
final String content = getContent(testNodeUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "dumped by HtmlRendererServlet");
+ assertContains(content, "dumped by HtmlRenderer");
}
{
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
index 7b81d22..63fed99 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
@@ -51,12 +51,12 @@ public class NodetypeRenderingTest extends RenderingTestBase {
public void testWithoutScriptTxt() throws IOException {
final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertContains(content, "dumped by PlainTextRendererServlet");
+ assertContains(content, "dumped by PlainTextRenderer");
}
public void testWithoutScriptHtml() throws IOException {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "dumped by HtmlRendererServlet");
+ assertContains(content, "dumped by HtmlRenderer");
}
public void testMiniScriptHtml() throws IOException {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
index 9231ac6..89eb426 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
@@ -57,7 +57,7 @@ public class ResourceSuperTypeTest extends RenderingTestBase {
final TestNode tn= new TestNode(HTTP_BASE_URL + testPath, props);
// Without any scripts -> default rendering
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRendererServlet");
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
// Add supertype script and check that it is used
toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
@@ -100,7 +100,7 @@ public class ResourceSuperTypeTest extends RenderingTestBase {
final TestNode tn= new TestNode(HTTP_BASE_URL + testPath, props);
// Without any scripts -> default rendering
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRendererServlet");
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
// Add supertype script and check that it is used
toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
index 32aed8f..8c6af5f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
@@ -26,12 +26,12 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
public void testWithoutScriptTxt() throws IOException {
final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertContains(content, "dumped by PlainTextRendererServlet");
+ assertContains(content, "dumped by PlainTextRenderer");
}
public void testWithoutScriptHtml() throws IOException {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "dumped by HtmlRendererServlet");
+ assertContains(content, "dumped by HtmlRenderer");
}
public void testEspHtml() throws IOException {