Repository: commons-text Updated Branches: refs/heads/master 6665a0209 -> e55d0ac1c
http://git-wip-us.apache.org/repos/asf/commons-text/blob/e55d0ac1/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java index 9b3a3ff..c4026c9 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java @@ -19,7 +19,7 @@ package org.apache.commons.text.translate; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link UnicodeEscaper}. @@ -32,7 +32,8 @@ public class UnicodeEscaperTest { final String input = "ADFGZ"; final String result = ue.translate(input); - assertEquals("Failed to escape Unicode characters via the below method", "\\u0041\\u0044FGZ", result); + assertThat(result).as("Failed to escape Unicode characters via the below method") + .isEqualTo("\\u0041\\u0044FGZ"); } @Test @@ -41,7 +42,8 @@ public class UnicodeEscaperTest { final String input = "ADFGZ"; final String result = ue.translate(input); - assertEquals("Failed to escape Unicode characters via the between method", "AD\\u0046\\u0047Z", result); + assertThat(result).as("Failed to escape Unicode characters via the between method") + .isEqualTo("AD\\u0046\\u0047Z"); } @Test @@ -50,6 +52,7 @@ public class UnicodeEscaperTest { final String input = "ADFGZ"; final String result = ue.translate(input); - assertEquals("Failed to escape Unicode characters via the above method", "ADF\\u0047\\u005A", result); + assertThat(result).as("Failed to escape Unicode characters via the above method") + .isEqualTo("ADF\\u0047\\u005A"); } } http://git-wip-us.apache.org/repos/asf/commons-text/blob/e55d0ac1/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java index a840238..472a21c 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java @@ -19,8 +19,8 @@ package org.apache.commons.text.translate; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * Unit tests for {@link UnicodeEscaper}. @@ -33,7 +33,7 @@ public class UnicodeUnescaperTest { final UnicodeUnescaper uu = new UnicodeUnescaper(); final String input = "\\u+0047"; - assertEquals("Failed to unescape Unicode characters with 'u+' notation", "G", uu.translate(input)); + assertThat(uu.translate(input)).as("Failed to unescape Unicode characters with 'u+' notation").isEqualTo("G"); } @Test @@ -42,7 +42,7 @@ public class UnicodeUnescaperTest { final String input = "\\uuuuuuuu0047"; final String result = uu.translate(input); - assertEquals("Failed to unescape Unicode characters with many 'u' characters", "G", result); + assertThat(result).as("Failed to unescape Unicode characters with many 'u' characters").isEqualTo("G"); } @Test http://git-wip-us.apache.org/repos/asf/commons-text/blob/e55d0ac1/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java index ab688ab..7eacb57 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java @@ -21,9 +21,7 @@ import org.junit.Test; import java.io.CharArrayWriter; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link UnicodeUnpairedSurrogateRemover}. @@ -34,16 +32,16 @@ public class UnicodeUnpairedSurrogateRemoverTest { @Test public void testValidCharacters() throws IOException { - assertFalse(subject.translate(0xd7ff, writer)); - assertFalse(subject.translate(0xe000, writer)); - assertEquals(0, writer.size()); + assertThat(subject.translate(0xd7ff, writer)).isFalse(); + assertThat(subject.translate(0xe000, writer)).isFalse(); + assertThat(writer.size()).isZero(); } @Test public void testInvalidCharacters() throws IOException { - assertTrue(subject.translate(0xd800, writer)); - assertTrue(subject.translate(0xdfff, writer)); - assertEquals(0, writer.size()); + assertThat(subject.translate(0xd800, writer)).isTrue(); + assertThat(subject.translate(0xdfff, writer)).isTrue(); + assertThat(writer.size()).isZero(); } }