Reorganization of testing utilities

d2a-raudenaerde · Dec 9, 2016 · 7db9203 · 7db9203
1 parent 4c58e21
commit 7db9203
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 85 deletions.
diff --git a/wicketstuff-rest-utils/src/main/java/org/wicketstuff/rest/utils/test/RestTestCase.java b/wicketstuff-rest-utils/src/main/java/org/wicketstuff/rest/utils/test/RestTestCase.java
@@ -16,10 +16,8 @@
  */
 package org.wicketstuff.rest.utils.test;
 
-import java.util.Locale;
-
-import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.util.tester.WicketTestCase;
+import org.wicketstuff.rest.utils.http.HttpMethod;
 
 /**
  * 
@@ -30,17 +28,12 @@
  */
 public class RestTestCase extends WicketTestCase 
 {
-
-	@Override
-	protected RestWicketTester newWicketTester(WebApplication app) 
+	protected void assertUrlResponse(final String url, final HttpMethod httpMethod, 
+			final String expectedResponse) 
 	{
-		return new RestWicketTester(app) 
-		{
-			@Override
-			protected Locale servletRequestLocale() 
-			{
-				return Locale.US;
-			}
-		};
+		tester.getRequest().setMethod(httpMethod.getMethod());
+		tester.executeUrl(url);
+
+		assertEquals(expectedResponse, tester.getLastResponseAsString());
 	}
 }
diff --git a/wicketstuff-rest-utils/src/main/java/org/wicketstuff/rest/utils/test/RestWicketTester.java b/wicketstuff-rest-utils/src/main/java/org/wicketstuff/rest/utils/test/RestWicketTester.java