You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/02/16 16:14:45 UTC
svn commit: r910553 -
/sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
Author: cziegeler
Date: Tue Feb 16 15:14:44 2010
New Revision: 910553
URL: http://svn.apache.org/viewvc?rev=910553&view=rev
Log:
Clean up test case
Modified:
sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
Modified: sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java?rev=910553&r1=910552&r2=910553&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java (original)
+++ sling/trunk/bundles/servlets/get/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java Tue Feb 16 15:14:44 2010
@@ -226,65 +226,21 @@
}
public void testSelectorsEtc() {
- String base = "/a/b/c";
- String target = "/a/b/d";
- String expected = "/a/b/d";
+ assertEquals(null, null, null, null);
+
+ assertEquals(null, "html", null, null);
+
+ assertEquals("print", "html", null, null);
+
+ assertEquals("print.a4", "html", null, null);
- String selectors = null;
- String extension = null;
- String suffix = null;
- String queryString = null;
- assertEquals(expected, base, null, extension, suffix, queryString,
- target);
-
- selectors = null;
- extension = "html";
- suffix = null;
- queryString = null;
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = "print";
- extension = "html";
- suffix = null;
- queryString = null;
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = "print.a4";
- extension = "html";
- suffix = null;
- queryString = null;
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = null;
- extension = "html";
- suffix = "/suffix.pdf";
- queryString = null;
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = null;
- extension = "html";
- suffix = null;
- queryString = "xy=1";
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = null;
- extension = "html";
- suffix = "/suffix.pdf";
- queryString = "xy=1";
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
-
- selectors = "print.a4";
- extension = "html";
- suffix = "/suffix.pdf";
- queryString = "xy=1";
- assertEquals(expected, base, selectors, extension, suffix, queryString,
- target);
+ assertEquals(null, "html", "/suffix.pdf", null);
+
+ assertEquals(null, "html", null, "xy=1");
+
+ assertEquals(null, "html", "/suffix.pdf", "xy=1");
+
+ assertEquals("print.a4", "html", "/suffix.pdf", "xy=1");
}
public void testEmptyPath() {
@@ -300,9 +256,12 @@
//---------- Helper
- private static void assertEquals(String expected, String basePath,
+ private static void assertEquals(
String selectors, String extension, String suffix,
- String queryString, String targetPath) {
+ String queryString) {
+ final String basePath = "/a/b/c";
+ final String targetPath = "/a/b/d";
+ String expected = "/a/b/d";
if (selectors != null) {
expected += "." + selectors;