Author: bdelacretaz Date: Tue Oct 13 11:55:28 2015 New Revision: 1708359 URL: http://svn.apache.org/viewvc?rev=1708359&view=rev Log: SLING-5136 - move test classes to Sling packages
Added: sling/trunk/contrib/extensions/hapi/client/src/test/java/org/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/FormTest.java - copied, changed from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/FormTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/GetPostTest.java - copied, changed from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/GetPostTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ItemsTest.java - copied, changed from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/ItemsTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/HttpServerRule.java - copied, changed from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/util/HttpServerRule.java Removed: sling/trunk/contrib/extensions/hapi/client/src/test/java/FormTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/GetPostTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/ItemsTest.java sling/trunk/contrib/extensions/hapi/client/src/test/java/util/ Copied: sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/FormTest.java (from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/FormTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/FormTest.java?p2=sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/FormTest.java&p1=sling/trunk/contrib/extensions/hapi/client/src/test/java/FormTest.java&r1=1708357&r2=1708359&rev=1708359&view=diff ============================================================================== --- sling/trunk/contrib/extensions/hapi/client/src/test/java/FormTest.java (original) +++ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/FormTest.java Tue Oct 13 11:55:28 2015 @@ -17,6 +17,8 @@ * under the License. ******************************************************************************/ +package org.apache.sling.hapi.client.test; + import static org.hamcrest.core.IsEqual.equalTo; import java.io.IOException; @@ -38,12 +40,11 @@ import org.apache.sling.hapi.client.Clie import org.apache.sling.hapi.client.Document; import org.apache.sling.hapi.client.Items; import org.apache.sling.hapi.client.microdata.MicrodataHtmlClient; +import org.apache.sling.hapi.client.test.util.HttpServerRule; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import util.HttpServerRule; - public class FormTest { private static final String GET_URL = "/test1"; private static final String POST_URL = "/testpost1"; @@ -59,7 +60,7 @@ public class FormTest { @Override public void handle(HttpRequest httpRequest, HttpResponse httpResponse, HttpContext httpContext) throws HttpException, IOException { - final String html = IOUtils.toString(ItemsTest.class.getResourceAsStream("items_forms.html"), "UTF-8"); + final String html = IOUtils.toString(ItemsTest.class.getResourceAsStream("/items_forms.html"), "UTF-8"); HttpEntity entity = new StringEntity(html, "UTF-8"); httpResponse.setEntity(entity); } Copied: sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/GetPostTest.java (from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/GetPostTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/GetPostTest.java?p2=sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/GetPostTest.java&p1=sling/trunk/contrib/extensions/hapi/client/src/test/java/GetPostTest.java&r1=1708357&r2=1708359&rev=1708359&view=diff ============================================================================== --- sling/trunk/contrib/extensions/hapi/client/src/test/java/GetPostTest.java (original) +++ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/GetPostTest.java Tue Oct 13 11:55:28 2015 @@ -18,6 +18,8 @@ * under the License. ******************************************************************************/ +package org.apache.sling.hapi.client.test; + import static org.hamcrest.core.StringContains.containsString; import java.io.IOException; @@ -34,13 +36,12 @@ import org.apache.http.protocol.HttpRequ import org.apache.sling.hapi.client.ClientException; import org.apache.sling.hapi.client.Document; import org.apache.sling.hapi.client.microdata.MicrodataHtmlClient; +import org.apache.sling.hapi.client.test.util.HttpServerRule; import org.hamcrest.core.StringContains; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import util.HttpServerRule; - public class GetPostTest { private static final String GET_URL = "/test"; private static final String GET_AUTH_URL = "/testauth"; Copied: sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ItemsTest.java (from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/ItemsTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ItemsTest.java?p2=sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ItemsTest.java&p1=sling/trunk/contrib/extensions/hapi/client/src/test/java/ItemsTest.java&r1=1708357&r2=1708359&rev=1708359&view=diff ============================================================================== --- sling/trunk/contrib/extensions/hapi/client/src/test/java/ItemsTest.java (original) +++ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/ItemsTest.java Tue Oct 13 11:55:28 2015 @@ -17,6 +17,8 @@ * under the License. ******************************************************************************/ +package org.apache.sling.hapi.client.test; + import static org.hamcrest.core.IsEqual.equalTo; import java.io.IOException; @@ -34,12 +36,11 @@ import org.apache.sling.hapi.client.Clie import org.apache.sling.hapi.client.Document; import org.apache.sling.hapi.client.Items; import org.apache.sling.hapi.client.microdata.MicrodataHtmlClient; +import org.apache.sling.hapi.client.test.util.HttpServerRule; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import util.HttpServerRule; - public class ItemsTest { private static final String GET_URL = "/test"; private static final String GET_LINKS_URL = "/testlinks"; @@ -48,8 +49,8 @@ public class ItemsTest { public static final HttpServerRule httpServer = new HttpServerRule() { @Override protected void registerHandlers() throws IOException { - final String html = IOUtils.toString(ItemsTest.class.getResourceAsStream("items.html"), "UTF-8"); - final String htmlLinks = IOUtils.toString(ItemsTest.class.getResourceAsStream("items_links.html"), "UTF-8"); + final String html = IOUtils.toString(ItemsTest.class.getResourceAsStream("/items.html"), "UTF-8"); + final String htmlLinks = IOUtils.toString(ItemsTest.class.getResourceAsStream("/items_links.html"), "UTF-8"); serverBootstrap.registerHandler(GET_URL, new HttpRequestHandler() { @Override public void handle(HttpRequest httpRequest, HttpResponse httpResponse, HttpContext httpContext) Copied: sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/HttpServerRule.java (from r1708357, sling/trunk/contrib/extensions/hapi/client/src/test/java/util/HttpServerRule.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/HttpServerRule.java?p2=sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/HttpServerRule.java&p1=sling/trunk/contrib/extensions/hapi/client/src/test/java/util/HttpServerRule.java&r1=1708357&r2=1708359&rev=1708359&view=diff ============================================================================== --- sling/trunk/contrib/extensions/hapi/client/src/test/java/util/HttpServerRule.java (original) +++ sling/trunk/contrib/extensions/hapi/client/src/test/java/org/apache/sling/hapi/client/test/util/HttpServerRule.java Tue Oct 13 11:55:28 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package util; +package org.apache.sling.hapi.client.test.util; import java.io.IOException; import java.net.URI;