You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2023/08/24 07:55:24 UTC
[wicket] branch wicket-9.x updated: [WICKET-7069] Refactor `assertTrue(equals())` using `assertEquals` (#601)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-9.x by this push:
new 3f5b7e920e [WICKET-7069] Refactor `assertTrue(equals())` using `assertEquals` (#601)
3f5b7e920e is described below
commit 3f5b7e920efd28c693c40163184a53dc62432ffe
Author: Taher Ghaleb <ta...@gmail.com>
AuthorDate: Thu Aug 24 03:52:31 2023 -0400
[WICKET-7069] Refactor `assertTrue(equals())` using `assertEquals` (#601)
* Refactor assertTrue(equals()) using assertEquals
* Refactor throws Exception using assertThrows
* Revert "Refactor throws Exception using assertThrows"
This reverts commit d667bafbb8081b87fc6dc764f7fc895b066b96d7.
* Fix assertEquals parameters as (expected, actual)
* Fix test case failures by converting tokens into strings
---
.../org/apache/wicket/markup/MarkupParserTest.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
index 1cd4514b64..7019184d06 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
@@ -67,7 +67,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag aOpen = (ComponentTag)markupStream.next();
log.info("", aOpen);
- assertTrue(aOpen.getName().equals("a"));
+ assertEquals("a", aOpen.getName());
assertEquals("foo.html", aOpen.getAttributes().getString("href"));
markupStream.next();
@@ -75,7 +75,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag boldOpen = (ComponentTag)markupStream.next();
log.info("", boldOpen);
- assertTrue(boldOpen.getName().equals("b"));
+ assertEquals("b", boldOpen.getName());
assertEquals(TagType.OPEN, boldOpen.getType());
markupStream.next();
@@ -83,7 +83,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag boldClose = (ComponentTag)markupStream.next();
log.info("", boldClose);
- assertTrue(boldClose.getName().equals("b"));
+ assertEquals("b", boldClose.getName());
assertEquals(TagType.CLOSE, boldClose.getType());
markupStream.next();
@@ -91,7 +91,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag img = (ComponentTag)markupStream.next();
log.info("", img);
- assertTrue(img.getName().equals("img"));
+ assertEquals("img", img.getName());
assertEquals(9, img.getAttributes().getInt("width"));
assertEquals(10, img.getAttributes().getInt("height"));
assertEquals(TagType.OPEN, img.getType());
@@ -101,7 +101,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag marker = (ComponentTag)markupStream.next();
log.info("", marker);
- assertTrue(marker.getName().equals("marker"));
+ assertEquals("marker", marker.getName());
assertEquals(TagType.OPEN_CLOSE, marker.getType());
markupStream.next();
@@ -109,7 +109,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag aClose = (ComponentTag)markupStream.next();
log.info("", aClose);
- assertTrue(aClose.getName().equals("a"));
+ assertEquals("a", aClose.getName());
assertNull(markupStream.next());
}
@@ -133,12 +133,12 @@ final class MarkupParserTest extends WicketTestCase
log.info("tok(4)=" + tokens.get(4));
log.info("tok(5)=" + tokens.get(5));
- assertTrue(tokens.get(0).equals("This is a test "));
+ assertEquals("This is a test ", tokens.get(0).toString());
final ComponentTag a = (ComponentTag)tokens.get(1);
assertEquals(9, a.getAttributes().getInt("componentName:id"));
- assertTrue(tokens.get(2).equals(" <b>bold</b> "));
+ assertEquals(" <b>bold</b> ", tokens.get(2).toString());
final ComponentTag b = (ComponentTag)tokens.get(3);
@@ -147,7 +147,7 @@ final class MarkupParserTest extends WicketTestCase
final ComponentTag closeA = (ComponentTag)tokens.get(5);
assertEquals("a", closeA.getName());
- assertTrue(tokens.get(6).equals(" of the emergency broadcasting system"));
+ assertEquals(" of the emergency broadcasting system", tokens.get(6).toString());
}
/**