Author: tchemit Date: 2010-03-17 14:25:56 +0100 (Wed, 17 Mar 2010) New Revision: 1804 Log: use junit 4 not 3 + reformat test Modified: trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java trunk/src/test/java/org/nuiton/util/ResourceTest.java trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java Modified: trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -19,6 +19,7 @@ package org.nuiton.util; import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.beanutils.Converter; import org.junit.Assert; import org.junit.Test; @@ -36,7 +37,7 @@ ConverterUtil.deregister(); - org.apache.commons.beanutils.Converter t = ConvertUtils.lookup(Version.class); + Converter t = ConvertUtils.lookup(Version.class); Assert.assertNull(t); ConverterUtil.initConverters(); t = ConvertUtils.lookup(Version.class); @@ -47,16 +48,24 @@ public void testConvert() throws Exception { String s; s = ""; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "a"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "kZZFIOFEIOFEfdskdfmldsfjklsfjldfldfjdsfiosabcd4567'''`~teAZEst"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); s = "]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; - Assert.assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + Assert.assertEquals( + new String(s.getBytes()), + new String(ConverterUtil.convert(s.toCharArray()))); // FIXME following test won't pass //s = "éééééé]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -4,7 +4,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -208,4 +208,4 @@ Assert.assertEquals("Juli", juli); } -} \ No newline at end of file +} Modified: trunk/src/test/java/org/nuiton/util/ResourceTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ResourceTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ResourceTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java 2010-03-15 11:21:22 UTC (rev 1803) +++ trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java 2010-03-17 13:25:56 UTC (rev 1804) @@ -22,7 +22,7 @@ import java.io.IOException; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test;