From ff52be1c071a87591c18f1df55e4454c93b9da5f Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 02:42:33 +0100 Subject: [PATCH] [Minor] removed use of deprecated JUnit classes --- .../utils/helper/BaseDecodingTest.java | 77 +++++++++---------- .../utils/helper/BaseEncodingTest.java | 76 +++++++++--------- 2 files changed, 76 insertions(+), 77 deletions(-) diff --git a/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java b/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java index 7444a0ef6..a77e5ee5c 100644 --- a/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java +++ b/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java @@ -21,17 +21,16 @@ import static ch.eitchnet.utils.helper.BaseEncoding.fromBase32Dmedia; import static ch.eitchnet.utils.helper.BaseEncoding.fromBase32Hex; import static ch.eitchnet.utils.helper.BaseEncoding.fromBase64; import static ch.eitchnet.utils.helper.BaseEncoding.toBase32Hex; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.junit.runners.JUnit4; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author Robert von Burg - * */ +@SuppressWarnings("nls") public class BaseDecodingTest { public static final String PROP_RUN_PERF_TESTS = "ch.eitchnet.utils.test.runPerfTests"; //$NON-NLS-1$ private static final Logger logger = LoggerFactory.getLogger(BaseDecodingTest.class); @@ -45,59 +44,59 @@ public class BaseDecodingTest { @Test public void testBase64() { - Assert.assertEquals("", fromBase64("")); - Assert.assertEquals("f", fromBase64("Zg==")); - Assert.assertEquals("fo", fromBase64("Zm8=")); - Assert.assertEquals("foo", fromBase64("Zm9v")); - Assert.assertEquals("foob", fromBase64("Zm9vYg==")); - Assert.assertEquals("fooba", fromBase64("Zm9vYmE=")); - Assert.assertEquals("foobar", fromBase64("Zm9vYmFy")); + assertEquals("", fromBase64("")); + assertEquals("f", fromBase64("Zg==")); + assertEquals("fo", fromBase64("Zm8=")); + assertEquals("foo", fromBase64("Zm9v")); + assertEquals("foob", fromBase64("Zm9vYg==")); + assertEquals("fooba", fromBase64("Zm9vYmE=")); + assertEquals("foobar", fromBase64("Zm9vYmFy")); } @Test public void testBase32() { - Assert.assertEquals("", fromBase32("")); - Assert.assertEquals("f", fromBase32("MY======")); - Assert.assertEquals("fo", fromBase32("MZXQ====")); - Assert.assertEquals("foo", fromBase32("MZXW6===")); - Assert.assertEquals("foob", fromBase32("MZXW6YQ=")); - Assert.assertEquals("fooba", fromBase32("MZXW6YTB")); - Assert.assertEquals("foobar", fromBase32("MZXW6YTBOI======")); + assertEquals("", fromBase32("")); + assertEquals("f", fromBase32("MY======")); + assertEquals("fo", fromBase32("MZXQ====")); + assertEquals("foo", fromBase32("MZXW6===")); + assertEquals("foob", fromBase32("MZXW6YQ=")); + assertEquals("fooba", fromBase32("MZXW6YTB")); + assertEquals("foobar", fromBase32("MZXW6YTBOI======")); } @Test public void testBase32Hex() { - Assert.assertEquals("", fromBase32Hex("")); - Assert.assertEquals("f", fromBase32Hex("CO======")); - Assert.assertEquals("fo", fromBase32Hex("CPNG====")); - Assert.assertEquals("foo", fromBase32Hex("CPNMU===")); - Assert.assertEquals("foob", fromBase32Hex("CPNMUOG=")); - Assert.assertEquals("fooba", fromBase32Hex("CPNMUOJ1")); - Assert.assertEquals("foobar", fromBase32Hex("CPNMUOJ1E8======")); + assertEquals("", fromBase32Hex("")); + assertEquals("f", fromBase32Hex("CO======")); + assertEquals("fo", fromBase32Hex("CPNG====")); + assertEquals("foo", fromBase32Hex("CPNMU===")); + assertEquals("foob", fromBase32Hex("CPNMUOG=")); + assertEquals("fooba", fromBase32Hex("CPNMUOJ1")); + assertEquals("foobar", fromBase32Hex("CPNMUOJ1E8======")); } @Test public void testBase32Dmedia() { - Assert.assertEquals("", fromBase32Dmedia("")); - Assert.assertEquals("binary foo", fromBase32Dmedia("FCNPVRELI7J9FUUI")); - Assert.assertEquals("f", fromBase32Dmedia("FR======")); - Assert.assertEquals("fo", fromBase32Dmedia("FSQJ====")); - Assert.assertEquals("foo", fromBase32Dmedia("FSQPX===")); - Assert.assertEquals("foob", fromBase32Dmedia("FSQPXRJ=")); - Assert.assertEquals("fooba", fromBase32Dmedia("FSQPXRM4")); - Assert.assertEquals("foobar", fromBase32Dmedia("FSQPXRM4HB======")); + assertEquals("", fromBase32Dmedia("")); + assertEquals("binary foo", fromBase32Dmedia("FCNPVRELI7J9FUUI")); + assertEquals("f", fromBase32Dmedia("FR======")); + assertEquals("fo", fromBase32Dmedia("FSQJ====")); + assertEquals("foo", fromBase32Dmedia("FSQPX===")); + assertEquals("foob", fromBase32Dmedia("FSQPXRJ=")); + assertEquals("fooba", fromBase32Dmedia("FSQPXRM4")); + assertEquals("foobar", fromBase32Dmedia("FSQPXRM4HB======")); } @Test public void testBase16() { - Assert.assertEquals("", fromBase16("")); - Assert.assertEquals("f", fromBase16("66")); - Assert.assertEquals("fo", fromBase16("666F")); - Assert.assertEquals("foo", fromBase16("666F6F")); - Assert.assertEquals("foob", fromBase16("666F6F62")); - Assert.assertEquals("fooba", fromBase16("666F6F6261")); - Assert.assertEquals("foobar", fromBase16("666F6F626172")); + assertEquals("", fromBase16("")); + assertEquals("f", fromBase16("66")); + assertEquals("fo", fromBase16("666F")); + assertEquals("foo", fromBase16("666F6F")); + assertEquals("foob", fromBase16("666F6F62")); + assertEquals("fooba", fromBase16("666F6F6261")); + assertEquals("foobar", fromBase16("666F6F626172")); } @Test diff --git a/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java b/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java index 15a62eb32..4c2da50d7 100644 --- a/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java +++ b/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java @@ -22,7 +22,7 @@ import static ch.eitchnet.utils.helper.BaseEncoding.toBase32; import static ch.eitchnet.utils.helper.BaseEncoding.toBase32Dmedia; import static ch.eitchnet.utils.helper.BaseEncoding.toBase32Hex; import static ch.eitchnet.utils.helper.BaseEncoding.toBase64; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.slf4j.Logger; @@ -30,66 +30,66 @@ import org.slf4j.LoggerFactory; /** * @author Robert von Burg - * */ +@SuppressWarnings("nls") public class BaseEncodingTest { private static final Logger logger = LoggerFactory.getLogger(BaseEncodingTest.class); @Test public void testBase64() { - Assert.assertEquals("", toBase64("")); - Assert.assertEquals("Zg==", toBase64("f")); - Assert.assertEquals("Zm8=", toBase64("fo")); - Assert.assertEquals("Zm9v", toBase64("foo")); - Assert.assertEquals("Zm9vYg==", toBase64("foob")); - Assert.assertEquals("Zm9vYmE=", toBase64("fooba")); - Assert.assertEquals("Zm9vYmFy", toBase64("foobar")); + assertEquals("", toBase64("")); + assertEquals("Zg==", toBase64("f")); + assertEquals("Zm8=", toBase64("fo")); + assertEquals("Zm9v", toBase64("foo")); + assertEquals("Zm9vYg==", toBase64("foob")); + assertEquals("Zm9vYmE=", toBase64("fooba")); + assertEquals("Zm9vYmFy", toBase64("foobar")); } @Test public void testBase32() { - Assert.assertEquals("", toBase32("")); - Assert.assertEquals("MY======", toBase32("f")); - Assert.assertEquals("MZXQ====", toBase32("fo")); - Assert.assertEquals("MZXW6===", toBase32("foo")); - Assert.assertEquals("MZXW6YQ=", toBase32("foob")); - Assert.assertEquals("MZXW6YTB", toBase32("fooba")); - Assert.assertEquals("MZXW6YTBOI======", toBase32("foobar")); + assertEquals("", toBase32("")); + assertEquals("MY======", toBase32("f")); + assertEquals("MZXQ====", toBase32("fo")); + assertEquals("MZXW6===", toBase32("foo")); + assertEquals("MZXW6YQ=", toBase32("foob")); + assertEquals("MZXW6YTB", toBase32("fooba")); + assertEquals("MZXW6YTBOI======", toBase32("foobar")); } @Test public void testBase32Hex() { - Assert.assertEquals("", toBase32Hex("")); - Assert.assertEquals("CO======", toBase32Hex("f")); - Assert.assertEquals("CPNG====", toBase32Hex("fo")); - Assert.assertEquals("CPNMU===", toBase32Hex("foo")); - Assert.assertEquals("CPNMUOG=", toBase32Hex("foob")); - Assert.assertEquals("CPNMUOJ1", toBase32Hex("fooba")); - Assert.assertEquals("CPNMUOJ1E8======", toBase32Hex("foobar")); + assertEquals("", toBase32Hex("")); + assertEquals("CO======", toBase32Hex("f")); + assertEquals("CPNG====", toBase32Hex("fo")); + assertEquals("CPNMU===", toBase32Hex("foo")); + assertEquals("CPNMUOG=", toBase32Hex("foob")); + assertEquals("CPNMUOJ1", toBase32Hex("fooba")); + assertEquals("CPNMUOJ1E8======", toBase32Hex("foobar")); } @Test public void testBase32Dmedia() { - Assert.assertEquals("", toBase32Dmedia("")); - Assert.assertEquals("FCNPVRELI7J9FUUI", toBase32Dmedia("binary foo")); - Assert.assertEquals("FR======", toBase32Dmedia("f")); - Assert.assertEquals("FSQJ====", toBase32Dmedia("fo")); - Assert.assertEquals("FSQPX===", toBase32Dmedia("foo")); - Assert.assertEquals("FSQPXRJ=", toBase32Dmedia("foob")); - Assert.assertEquals("FSQPXRM4", toBase32Dmedia("fooba")); - Assert.assertEquals("FSQPXRM4HB======", toBase32Dmedia("foobar")); + assertEquals("", toBase32Dmedia("")); + assertEquals("FCNPVRELI7J9FUUI", toBase32Dmedia("binary foo")); + assertEquals("FR======", toBase32Dmedia("f")); + assertEquals("FSQJ====", toBase32Dmedia("fo")); + assertEquals("FSQPX===", toBase32Dmedia("foo")); + assertEquals("FSQPXRJ=", toBase32Dmedia("foob")); + assertEquals("FSQPXRM4", toBase32Dmedia("fooba")); + assertEquals("FSQPXRM4HB======", toBase32Dmedia("foobar")); } @Test public void testBase16() { - Assert.assertEquals("", toBase16("")); - Assert.assertEquals("66", toBase16("f")); - Assert.assertEquals("666F", toBase16("fo")); - Assert.assertEquals("666F6F", toBase16("foo")); - Assert.assertEquals("666F6F62", toBase16("foob")); - Assert.assertEquals("666F6F6261", toBase16("fooba")); - Assert.assertEquals("666F6F626172", toBase16("foobar")); + assertEquals("", toBase16("")); + assertEquals("66", toBase16("f")); + assertEquals("666F", toBase16("fo")); + assertEquals("666F6F", toBase16("foo")); + assertEquals("666F6F62", toBase16("foob")); + assertEquals("666F6F6261", toBase16("fooba")); + assertEquals("666F6F626172", toBase16("foobar")); } @Test