WICKET-5926 Arquillian Support with Container ServletContext in 
BaseWicketTester/WicketTester.

Fix the asserting after removing JUnit's Assert from BaseWicketTester


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7d90522c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7d90522c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7d90522c

Branch: refs/heads/master
Commit: 7d90522c4847b6222ca231cd6e10799984c22d52
Parents: 6dae928
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Jun 25 11:38:17 2015 +0300
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Jun 25 11:38:17 2015 +0300

----------------------------------------------------------------------
 .../testing/servletcontext/ArquillianContainerProvidedTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7d90522c/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
----------------------------------------------------------------------
diff --git 
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
 
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
index 24ab51a..a3ec33c 100644
--- 
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
+++ 
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
@@ -101,8 +101,8 @@ public class ArquillianContainerProvidedTest extends 
AbstractDeploymentTest {
                        log.info("Trying to use a null application.");
                        setWicketTester(new WicketTester(null, false));
                        fail("WebApplication cannot be null");
-               } catch (AssertionError e) {
-                       assertEquals("WebApplication cannot be null", 
e.getMessage());
+               } catch (IllegalArgumentException iax) {
+                       assertEquals("Argument 'application' may not be null.", 
iax.getMessage());
                }
                assertNull(wicketTester);
        }

Reply via email to