You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/12 09:24:33 UTC
[5/5] git commit: org.junit.Assert#fail() throws AssertionError
instead of AssertionFailedError
org.junit.Assert#fail() throws AssertionError instead of AssertionFailedError
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/99518263
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/99518263
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/99518263
Branch: refs/heads/master
Commit: 995182631bcc70eb8f6737b592fbad13a2773077
Parents: db86666
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 12 10:23:53 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 12 10:23:53 2013 +0300
----------------------------------------------------------------------
.../apache/wicket/util/tester/WicketTesterTest.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/99518263/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index fb4cb38..df21f3d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -21,7 +21,6 @@ import java.util.Locale;
import javax.servlet.http.HttpServletResponse;
-import junit.framework.AssertionFailedError;
import org.apache.wicket.Component;
import org.apache.wicket.MockPageParametersAware;
import org.apache.wicket.MockPageWithLink;
@@ -241,7 +240,7 @@ public class WicketTesterTest extends WicketTestCase
tester.clickLink("ajaxLinkWithSetResponsePageClass");
throw new RuntimeException("Disabled link should not be clickable.");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -265,7 +264,7 @@ public class WicketTesterTest extends WicketTestCase
tester.executeAjaxEvent("ajaxLinkWithSetResponsePageClass", "onclick");
throw new RuntimeException("Disabled link should not be clickable.");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -289,7 +288,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertEnabled("ajaxLinkWithSetResponsePageClass");
fail("The link must not be enabled.");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -313,7 +312,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertDisabled("ajaxLinkWithSetResponsePageClass");
fail("The link must not be disabled.");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -341,7 +340,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertRequired("createForm:id");
fail("Book ID component must not be required anymore!");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -351,7 +350,7 @@ public class WicketTesterTest extends WicketTestCase
// test #3: "createForm" is not a FormComponent
tester.assertRequired("createForm");
}
- catch (AssertionFailedError _)
+ catch (AssertionError _)
{
;
}
@@ -1147,7 +1146,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertRedirectUrl("http://this.did.not.happen");
caught = false;
}
- catch (AssertionFailedError e)
+ catch (AssertionError e)
{
caught = true;
}