svn commit: r981213 - /wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sun Aug  1 12:31:59 2010
New Revision: 981213

URL: http://svn.apache.org/viewvc?rev=981213&view=rev
Log:
fixed unit test

Modified:
    wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=981213&r1=981212&r2=981213&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java Sun Aug  1 12:31:59 2010
@@ -18,8 +18,6 @@ package org.apache.wicket.protocol.http;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -38,6 +36,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.ParserConfigurationException;
 
 import junit.framework.TestCase;
 
@@ -48,6 +47,8 @@ import org.apache.wicket.protocol.http.m
 import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
 import org.apache.wicket.protocol.http.mock.MockServletContext;
 import org.apache.wicket.request.resource.DynamicImageResource;
+import org.apache.wicket.util.file.WebXmlFile;
+import org.xml.sax.SAXException;
 
 public class WicketFilterTest extends TestCase
 {
@@ -142,30 +143,19 @@ public class WicketFilterTest extends Te
 	{
 		try
 		{
-			Method method = WicketFilter.class.getDeclaredMethod("getFilterPath", String.class,
-				InputStream.class);
-			method.setAccessible(true);
-			return method.invoke(new WicketFilter(), string, in).toString();
+			return new WebXmlFile().getFilterPath(string, in);
 		}
-		catch (SecurityException e)
+		catch (ParserConfigurationException ex)
 		{
-			throw new RuntimeException(e);
+			throw new RuntimeException(ex);
 		}
-		catch (NoSuchMethodException e)
+		catch (SAXException ex)
 		{
-			throw new RuntimeException(e);
+			throw new RuntimeException(ex);
 		}
-		catch (IllegalArgumentException e)
+		catch (IOException ex)
 		{
-			throw new RuntimeException(e);
-		}
-		catch (IllegalAccessException e)
-		{
-			throw new RuntimeException(e);
-		}
-		catch (InvocationTargetException e)
-		{
-			throw new RuntimeException(e);
+			throw new RuntimeException(ex);
 		}
 	}