You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by mc...@apache.org on 2014/04/18 23:00:43 UTC
svn commit: r1588563 [16/16] - in /ant/core/trunk: ./ manual/ manual/Types/
src/etc/testcases/taskdefs/ src/etc/testcases/taskdefs/optional/
src/etc/testcases/taskdefs/optional/antlr/
src/etc/testcases/taskdefs/optional/depend/ src/etc/testcases/taskde...
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -20,113 +20,116 @@ package org.apache.tools.ant.util;
import java.io.File;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
import org.apache.tools.ant.taskdefs.condition.Os;
+import org.junit.Assume;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* TestCase for JavaEnvUtils.
*
*/
-public class JavaEnvUtilsTest extends TestCase {
+public class JavaEnvUtilsTest {
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
- public JavaEnvUtilsTest(String s) {
- super(s);
- }
+ @Test
public void testGetExecutableNetware() {
- if (Os.isName("netware")) {
- assertEquals("java", JavaEnvUtils.getJreExecutable("java"));
- assertEquals("javac", JavaEnvUtils.getJdkExecutable("javac"));
- assertEquals("foo", JavaEnvUtils.getJreExecutable("foo"));
- assertEquals("foo", JavaEnvUtils.getJdkExecutable("foo"));
- }
+ Assume.assumeTrue("Test only runs on netware", Os.isName("netware"));
+ assertEquals("java", JavaEnvUtils.getJreExecutable("java"));
+ assertEquals("javac", JavaEnvUtils.getJdkExecutable("javac"));
+ assertEquals("foo", JavaEnvUtils.getJreExecutable("foo"));
+ assertEquals("foo", JavaEnvUtils.getJdkExecutable("foo"));
}
+ @Test
public void testGetExecutableWindows() {
- if (Os.isFamily("windows")) {
- String javaHome =
- FILE_UTILS.normalize(System.getProperty("java.home"))
- .getAbsolutePath();
-
- String j = JavaEnvUtils.getJreExecutable("java");
- assertTrue(j.endsWith(".exe"));
- assertTrue(j+" is absolute", (new File(j)).isAbsolute());
- try {
- assertTrue(j+" is normalized and in the JRE dir",
- j.startsWith(javaHome));
- } catch (AssertionFailedError e) {
- // java.home is bogus
- assertEquals("java.exe", j);
- }
-
- j = JavaEnvUtils.getJdkExecutable("javac");
- assertTrue(j.endsWith(".exe"));
- try {
- assertTrue(j+" is absolute", (new File(j)).isAbsolute());
- String javaHomeParent =
- FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
- assertTrue(j+" is normalized and in the JDK dir",
- j.startsWith(javaHomeParent));
- assertTrue(j+" is normalized and not in the JRE dir",
- !j.startsWith(javaHome));
-
- } catch (AssertionFailedError e) {
- // java.home is bogus
- assertEquals("javac.exe", j);
- }
-
- assertEquals("foo.exe", JavaEnvUtils.getJreExecutable("foo"));
- assertEquals("foo.exe", JavaEnvUtils.getJdkExecutable("foo"));
- }
- }
-
- public void testGetExecutableMostPlatforms() {
- if (!Os.isName("netware") && !Os.isFamily("windows")) {
- String javaHome =
- FILE_UTILS.normalize(System.getProperty("java.home"))
- .getAbsolutePath();
-
- // could still be OS/2
- String extension = Os.isFamily("dos") ? ".exe" : "";
-
- String j = JavaEnvUtils.getJreExecutable("java");
- if (!extension.equals("")) {
- assertTrue(j.endsWith(extension));
- }
- assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+ Assume.assumeTrue("Test only runs on windows", Os.isFamily("windows"));
+ String javaHome =
+ FILE_UTILS.normalize(System.getProperty("java.home"))
+ .getAbsolutePath();
+
+ String j = JavaEnvUtils.getJreExecutable("java");
+ assertTrue(j.endsWith(".exe"));
+ assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+ try {
assertTrue(j+" is normalized and in the JRE dir",
j.startsWith(javaHome));
+ } catch (AssertionFailedError e) {
+ // java.home is bogus
+ assertEquals("java.exe", j);
+ }
- j = JavaEnvUtils.getJdkExecutable("javac");
- if (!extension.equals("")) {
- assertTrue(j.endsWith(extension));
- }
+ j = JavaEnvUtils.getJdkExecutable("javac");
+ assertTrue(j.endsWith(".exe"));
+ try {
assertTrue(j+" is absolute", (new File(j)).isAbsolute());
-
String javaHomeParent =
FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
assertTrue(j+" is normalized and in the JDK dir",
j.startsWith(javaHomeParent));
+ assertTrue(j+" is normalized and not in the JRE dir",
+ !j.startsWith(javaHome));
+
+ } catch (AssertionFailedError e) {
+ // java.home is bogus
+ assertEquals("javac.exe", j);
+ }
+
+ assertEquals("foo.exe", JavaEnvUtils.getJreExecutable("foo"));
+ assertEquals("foo.exe", JavaEnvUtils.getJdkExecutable("foo"));
+ }
+
+ @Test
+ public void testGetExecutableMostPlatforms() {
+ Assume.assumeTrue("Test only runs on non Netware and non Windows systems",
+ !Os.isName("netware") && !Os.isFamily("windows"));
+ String javaHome =
+ FILE_UTILS.normalize(System.getProperty("java.home"))
+ .getAbsolutePath();
+
+ // could still be OS/2
+ String extension = Os.isFamily("dos") ? ".exe" : "";
+
+ String j = JavaEnvUtils.getJreExecutable("java");
+ if (!extension.equals("")) {
+ assertTrue(j.endsWith(extension));
+ }
+ assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+ assertTrue(j+" is normalized and in the JRE dir",
+ j.startsWith(javaHome));
+
+ j = JavaEnvUtils.getJdkExecutable("javac");
+ if (!extension.equals("")) {
+ assertTrue(j.endsWith(extension));
+ }
+ assertTrue(j+" is absolute", (new File(j)).isAbsolute());
- if (Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6) {
- assertTrue(j+" is normalized and in the JRE dir",
- j.startsWith(javaHome));
- } else {
- assertTrue(j+" is normalized and not in the JRE dir",
- !j.startsWith(javaHome));
- }
-
- assertEquals("foo"+extension,
- JavaEnvUtils.getJreExecutable("foo"));
- assertEquals("foo"+extension,
- JavaEnvUtils.getJdkExecutable("foo"));
+ String javaHomeParent =
+ FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
+ assertTrue(j+" is normalized and in the JDK dir",
+ j.startsWith(javaHomeParent));
+
+ if (Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6) {
+ assertTrue(j+" is normalized and in the JRE dir",
+ j.startsWith(javaHome));
+ } else {
+ assertTrue(j+" is normalized and not in the JRE dir",
+ !j.startsWith(javaHome));
}
+ assertEquals("foo"+extension,
+ JavaEnvUtils.getJreExecutable("foo"));
+ assertEquals("foo"+extension,
+ JavaEnvUtils.getJdkExecutable("foo"));
}
+ @Test
public void testIsAtLeastJavaVersion()
{
assertTrue(
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LayoutPreservingPropertiesTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LayoutPreservingPropertiesTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LayoutPreservingPropertiesTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LayoutPreservingPropertiesTest.java Fri Apr 18 21:00:38 2014
@@ -24,18 +24,19 @@ import java.io.InputStreamReader;
import java.io.IOException;
import java.util.Properties;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class LayoutPreservingPropertiesTest extends TestCase {
- public LayoutPreservingPropertiesTest(String s) {
- super(s);
- }
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class LayoutPreservingPropertiesTest {
/**
* Tests that a properties file read by the
* LayoutPreservingPropertiesFile and then saves the properties in
* it.
*/
+ @Test
public void testPreserve() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -66,6 +67,7 @@ public class LayoutPreservingPropertiesT
* Tests that names and value are properly escaped when being
* written out.
*/
+ @Test
public void testEscaping() throws Exception {
LayoutPreservingProperties lpf = new LayoutPreservingProperties();
@@ -104,6 +106,7 @@ public class LayoutPreservingPropertiesT
* an existing property, it updates the logical line, and it doesn't
* append a new one.
*/
+ @Test
public void testOverwrite() throws Exception {
File unusual = new File(System.getProperty("root"),
"src/etc/testcases/util/unusual.properties");
@@ -131,6 +134,7 @@ public class LayoutPreservingPropertiesT
assertTrue(s.indexOf("prop\\nthree=new three") > -1);
}
+ @Test
public void testStoreWithHeader() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -150,6 +154,7 @@ public class LayoutPreservingPropertiesT
assertTrue("should have had header ", s.startsWith("#file-header"));
}
+ @Test
public void testClear() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -181,6 +186,7 @@ public class LayoutPreservingPropertiesT
s.indexOf("# now a line wrapping one") == -1);
}
+ @Test
public void testRemove() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -203,6 +209,7 @@ public class LayoutPreservingPropertiesT
s.indexOf("! more comment") > -1);
}
+ @Test
public void testRemoveWithComment() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -227,6 +234,7 @@ public class LayoutPreservingPropertiesT
s.indexOf("! more comment") == -1);
}
+ @Test
public void testClone() throws Exception {
File simple = new File(System.getProperty("root"),
"src/etc/testcases/util/simple.properties");
@@ -263,6 +271,7 @@ public class LayoutPreservingPropertiesT
assertTrue("should have had prop.new", s2.indexOf("prop.new") > -1);
}
+ @Test
public void testPreserveEscapeName() throws Exception {
LayoutPreservingProperties lpf = new LayoutPreservingProperties();
File unusual = new File(System.getProperty("root"),
@@ -296,7 +305,7 @@ public class LayoutPreservingPropertiesT
assertTrue(s.indexOf("beta set with a space") == -1);
}
- private String readFile(File f) throws IOException {
+ private static String readFile(File f) throws IOException {
FileInputStream fis = new FileInputStream(f);
InputStreamReader isr = new InputStreamReader(fis);
String s = FileUtils.readFully(isr);
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java Fri Apr 18 21:00:38 2014
@@ -19,23 +19,25 @@ package org.apache.tools.ant.util;
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
/**
* @since Ant 1.6
*/
-public class LazyFileOutputStreamTest extends TestCase {
+public class LazyFileOutputStreamTest {
private LazyFileOutputStream los;
private final static File f = new File("test.txt");
- public LazyFileOutputStreamTest(String s) {
- super(s);
- }
-
+ @Before
public void setUp() {
los = new LazyFileOutputStream(f);
}
+ @After
public void tearDown() throws IOException {
try {
los.close();
@@ -44,23 +46,27 @@ public class LazyFileOutputStreamTest ex
}
}
+ @Test
public void testNoFileWithoutWrite() throws IOException {
los.close();
assertTrue(f + " has not been written.", !f.exists());
}
+ @Test
public void testOpen() throws IOException {
los.open();
los.close();
assertTrue(f + " has been written.", f.exists());
}
+ @Test
public void testSingleByte() throws IOException {
los.write(0);
los.close();
assertTrue(f + " has been written.", f.exists());
}
+ @Test
public void testByteArray() throws IOException {
los.write(new byte[] {0});
los.close();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java Fri Apr 18 21:00:38 2014
@@ -19,54 +19,62 @@
package org.apache.tools.ant.util;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-/**
- */
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class LineOrientedOutputStreamTest extends TestCase {
+
+public class LineOrientedOutputStreamTest {
private static String LINE = "This is a line";
private DummyStream stream;
- public LineOrientedOutputStreamTest(String name) {
- super(name);
- }
-
+
+ @Before
public void setUp() {
stream = new DummyStream();
}
+ @After
public void tearDown() throws IOException {
if (stream != null) {
stream.close();
}
}
+ @Test
public void testLineWithLinefeedArray() throws IOException {
writeByteArray();
writeAsArray('\n');
stream.assertInvoked();
}
+ @Test
public void testLineWithLinefeedSingleBytes() throws IOException {
writeSingleBytes();
stream.write('\n');
stream.assertInvoked();
}
+ @Test
public void testLineWithCariagereturnArray() throws IOException {
writeByteArray();
writeAsArray('\r');
stream.assertInvoked();
}
+ @Test
public void testLineWithCariagereturnSingleBytes() throws IOException {
writeSingleBytes();
stream.write('\r');
stream.assertInvoked();
}
+ @Test
public void testLineWithCariagereturnLinefeedArray() throws IOException {
writeByteArray();
writeAsArray('\r');
@@ -74,6 +82,7 @@ public class LineOrientedOutputStreamTes
stream.assertInvoked();
}
+ @Test
public void testLineWithCariagereturnLinefeedSingleBytes() throws IOException {
writeSingleBytes();
stream.write('\r');
@@ -81,18 +90,21 @@ public class LineOrientedOutputStreamTes
stream.assertInvoked();
}
+ @Test
public void testFlushArray() throws IOException {
writeByteArray();
stream.flush();
stream.assertNotInvoked();
}
+ @Test
public void testFlushSingleBytes() throws IOException {
writeSingleBytes();
stream.flush();
stream.assertNotInvoked();
}
+ @Test
public void testCloseArray() throws IOException {
writeByteArray();
stream.close();
@@ -100,6 +112,7 @@ public class LineOrientedOutputStreamTes
stream = null;
}
+ @Test
public void testCloseSingleBytes() throws IOException {
writeSingleBytes();
stream.close();
@@ -134,7 +147,7 @@ public class LineOrientedOutputStreamTes
assertTrue("At least one line", invoked);
}
private void assertNotInvoked() {
- assertTrue("No output", invoked==false);
+ assertTrue("No output", !invoked);
}
}
}// LineOrientedOutputStreamTest
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java Fri Apr 18 21:00:38 2014
@@ -21,9 +21,16 @@ package org.apache.tools.ant.util;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
-import junit.framework.TestCase;
-public class LinkedHashtableTest extends TestCase {
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+
+public class LinkedHashtableTest {
private static final Object K1 = new Object();
private static final Object K2 = new Object();
@@ -44,6 +51,7 @@ public class LinkedHashtableTest extends
assertTrue(h2.containsKey(K1));
}
+ @Test
public void testContainsAndPut() {
h.put(K1, V1);
assertTrue(h.contains(K1));
@@ -52,23 +60,27 @@ public class LinkedHashtableTest extends
assertFalse(h.containsKey(K2));
}
+ @Test
public void testGet() {
assertNull(h.get(K1));
h.put(K1, V1);
assertSame(V1, h.get(K1));
}
+ @Test
public void testIsEmpty() {
assertTrue(h.isEmpty());
h.put(K1, V1);
assertFalse(h.isEmpty());
}
+ @Test
public void testPutReturnValue() {
assertNull(h.put(K1, V1));
assertSame(V1, h.put(K1, V2));
}
+ @Test
public void testPutAll() {
LinkedHashtable h2 = new LinkedHashtable();
h.put(K1, V1);
@@ -76,6 +88,7 @@ public class LinkedHashtableTest extends
assertTrue(h2.containsKey(K1));
}
+ @Test
public void testRemove() {
h.put(K1, V1);
assertSame(V1, h.remove(K1));
@@ -83,32 +96,38 @@ public class LinkedHashtableTest extends
assertNull(h.remove(K1));
}
+ @Test
public void testSize() {
assertEquals(0, h.size());
h.put(K1, V1);
assertEquals(1, h.size());
}
+ @Test
public void testKeys() {
multiSetup();
assertKeys(CollectionUtils.asIterator(h.keys()));
}
+ @Test
public void testKeySet() {
multiSetup();
assertKeys(h.keySet().iterator());
}
+ @Test
public void testElements() {
multiSetup();
assertValues(CollectionUtils.asIterator(h.elements()));
}
+ @Test
public void testValues() {
multiSetup();
assertValues(h.values().iterator());
}
+ @Test
public void testEntrySet() {
multiSetup();
Iterator i = h.entrySet().iterator();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LoaderUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LoaderUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LoaderUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LoaderUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -18,17 +18,17 @@
package org.apache.tools.ant.util;
import java.io.File;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
/**
* @since Ant 1.6
*/
-public class LoaderUtilsTest extends TestCase {
-
- public LoaderUtilsTest(String name) {
- super(name);
- }
+public class LoaderUtilsTest {
+ @Test
public void testGetXyzSource() {
File f1 = LoaderUtils.getClassSource(LoaderUtils.class);
assertNotNull(f1);
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/PackageNameMapperTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/PackageNameMapperTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/PackageNameMapperTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/PackageNameMapperTest.java Fri Apr 18 21:00:38 2014
@@ -17,12 +17,15 @@
*/
package org.apache.tools.ant.util;
+import org.junit.Test;
+
import java.io.File;
-import junit.framework.TestCase;
-public class PackageNameMapperTest extends TestCase {
- public PackageNameMapperTest(String name) { super(name); }
+import static org.junit.Assert.assertEquals;
+
+public class PackageNameMapperTest {
+ @Test
public void testMapping() {
PackageNameMapper mapper = new PackageNameMapper();
mapper.setFrom("*.java");
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java Fri Apr 18 21:00:38 2014
@@ -17,26 +17,33 @@
*/
package org.apache.tools.ant.util;
-import java.io.*;
+import org.junit.Test;
-import junit.framework.TestCase;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
/**
* Test for ReaderInputStream
*/
-public class ReaderInputStreamTest extends TestCase {
- public ReaderInputStreamTest(String s) {
- super(s);
- }
+public class ReaderInputStreamTest {
+ @Test
public void testSimple() throws Exception {
compareBytes("abc", "utf-8");
}
+ @Test
public void testSimple16() throws Exception {
compareBytes("a", "utf-16");
}
+ @Test
public void testSimpleAbc16() throws Exception {
// THIS WILL FAIL.
//compareBytes("abc", "utf-16");
@@ -53,10 +60,10 @@ public class ReaderInputStreamTest exten
}
bytes = "abc".getBytes("utf-16");
// String n = new String(bytes, 0, pos, "utf-16");
- String n = new String(bytes, 0, bytes.length, "utf-16");
- System.out.println(n);
+ new String(bytes, 0, bytes.length, "utf-16");
}
+ @Test
public void testReadZero() throws Exception {
ReaderInputStream r = new ReaderInputStream(
new StringReader("abc"));
@@ -69,11 +76,13 @@ public class ReaderInputStreamTest exten
assertEquals("abc".getBytes().length, readin);
}
+ @Test
public void testPreample() throws Exception {
byte[] bytes = "".getBytes("utf-16");
System.out.println("Preample len is " + bytes.length);
}
-
+
+ @Test
public void testIso88591ToUtf8() throws Exception {
InputStreamReader fin = null;
ReaderInputStream r = null;
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ResourceUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ResourceUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ResourceUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/ResourceUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -18,26 +18,28 @@
package org.apache.tools.ant.util;
-import junit.framework.TestCase;
-
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Echo;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceFactory;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
/**
* Tests for org.apache.tools.ant.util.ResourceUtils.
*/
-public class ResourceUtilsTest extends TestCase
- implements ResourceFactory, FileNameMapper {
+public class ResourceUtilsTest implements ResourceFactory, FileNameMapper {
private Echo taskINeedForLogging = new Echo();
- public ResourceUtilsTest(String name) {
- super(name);
+ @Before
+ public void setUp() {
taskINeedForLogging.setProject(new Project());
}
+ @Test
public void testNoDuplicates() {
Resource r = new Resource("samual vimes", true, 1, false);
Resource[] toNew =
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -19,16 +19,18 @@ package org.apache.tools.ant.util;
import java.util.Vector;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Test for StringUtils
*/
-public class StringUtilsTest extends TestCase {
- public StringUtilsTest(String s) {
- super(s);
- }
+public class StringUtilsTest {
+ @Test
public void testSplit(){
final String data = "a,b,,";
Vector res = StringUtils.split(data, ',');
@@ -39,6 +41,7 @@ public class StringUtilsTest extends Tes
assertEquals("", res.elementAt(3));
}
+ @Test
public void testSplitLines(){
final String data = "a\r\nb\nc\nd\ne";
Vector res = StringUtils.lineSplit(data);
@@ -50,40 +53,49 @@ public class StringUtilsTest extends Tes
assertEquals("e", res.elementAt(4));
}
+ @Test
public void testReplace() {
final String data = "abcabcabca";
String res = StringUtils.replace(data, "a", "");
assertEquals("bcbcbc", res);
}
+ @Test
public void testEndsWithBothEmpty() {
assertTrue( StringUtils.endsWith( new StringBuffer(), "") );
}
+ @Test
public void testEndsWithEmptyString() {
assertTrue( StringUtils.endsWith( new StringBuffer("12234545"), "") );
}
+ @Test
public void testEndsWithShorterString() {
assertTrue( StringUtils.endsWith( new StringBuffer("12345678"), "78"));
}
+ @Test
public void testEndsWithSameString() {
assertTrue( StringUtils.endsWith( new StringBuffer("123"), "123"));
}
+ @Test
public void testEndsWithLongerString() {
assertFalse( StringUtils.endsWith( new StringBuffer("12"), "1245"));
}
+ @Test
public void testEndsWithNoMatch() {
assertFalse( StringUtils.endsWith( new StringBuffer("12345678"), "789"));
}
+ @Test
public void testEndsWithEmptyBuffer() {
assertFalse( StringUtils.endsWith( new StringBuffer(""), "12345667") );
}
+ @Test
public void testEndsWithJDKPerf() {
StringBuffer buf = getFilledBuffer(1024*300, 'a');
for (int i = 0; i < 1000; i++) {
@@ -91,6 +103,7 @@ public class StringUtilsTest extends Tes
}
}
+ @Test
public void testEndsWithPerf() {
StringBuffer buf = getFilledBuffer(1024*300, 'a');
for (int i = 0; i < 1000; i++) {
@@ -103,7 +116,8 @@ public class StringUtilsTest extends Tes
for (int i = 0; i < size; i++) { buf.append(ch); };
return buf;
}
-
+
+ @Test
public void testParseHumanSizes() throws Exception {
final long KILOBYTE = 1024;
final long MEGABYTE = KILOBYTE * 1024;
@@ -117,7 +131,8 @@ public class StringUtilsTest extends Tes
assertEquals(StringUtils.parseHumanSizes("1P"), PETABYTE);
assertEquals(StringUtils.parseHumanSizes("1"), 1L);
}
-
+
+ @Test
public void testRemoveSuffix() {
String prefix = "Prefix";
String name = "Name";
@@ -134,7 +149,8 @@ public class StringUtilsTest extends Tes
StringUtils.removeSuffix(input, "bla")
);
}
-
+
+ @Test
public void testRemovePrefix() {
String prefix = "Prefix";
String name = "Name";
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/SymlinkUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/SymlinkUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/SymlinkUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/SymlinkUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -18,19 +18,22 @@
package org.apache.tools.ant.util;
+import static org.junit.Assert.assertFalse;
+
import java.io.IOException;
-import junit.framework.TestCase;
+
import org.apache.tools.ant.taskdefs.condition.Os;
+import org.junit.Assume;
+import org.junit.Test;
-public class SymlinkUtilsTest extends TestCase {
+public class SymlinkUtilsTest {
private static final SymbolicLinkUtils SYMLINK_UTILS =
SymbolicLinkUtils.getSymbolicLinkUtils();
+ @Test
public void testRootIsNoSymlink() throws IOException {
- if (Os.isFamily("windows")) {
- return; // test is meaningless on Windows
- }
+ Assume.assumeFalse("Symlink doesn't work on Windows", Os.isFamily("windows"));
assertFalse(SYMLINK_UTILS.isSymbolicLink("/"));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnPackageNameMapperTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnPackageNameMapperTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnPackageNameMapperTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnPackageNameMapperTest.java Fri Apr 18 21:00:38 2014
@@ -18,11 +18,13 @@
package org.apache.tools.ant.util;
import java.io.File;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class UnPackageNameMapperTest extends TestCase {
- public UnPackageNameMapperTest(String name) { super(name); }
+import static org.junit.Assert.assertEquals;
+public class UnPackageNameMapperTest {
+
+ @Test
public void testMapping() {
UnPackageNameMapper mapper = new UnPackageNameMapper();
mapper.setFrom("TEST-*.xml");
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnicodeUtilTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnicodeUtilTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnicodeUtilTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/UnicodeUtilTest.java Fri Apr 18 21:00:38 2014
@@ -17,10 +17,13 @@
*/
package org.apache.tools.ant.util;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class UnicodeUtilTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class UnicodeUtilTest {
+
+ @Test
public void testChineseWord() {
String word = "\u81ea\u7531";
assertEquals("u81ea", UnicodeUtil.EscapeUnicode(word.charAt(0)).toString());
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java Fri Apr 18 21:00:38 2014
@@ -21,47 +21,60 @@ package org.apache.tools.ant.util;
import java.util.ArrayList;
import java.util.Arrays;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class VectorSetTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class VectorSetTest {
private static final Object O = new Object();
private VectorSet v = new VectorSet();
+ @Test
public void testAdd() {
assertTrue(v.add(O));
assertFalse(v.add(O));
assertEquals(1, v.size());
}
+ @Test
public void testAdd2() {
v.add(0, O);
v.add(1, O);
assertEquals(1, v.size());
}
+ @Test
public void testAddElement() {
v.addElement(O);
v.addElement(O);
assertEquals(1, v.size());
}
+ @Test
public void testAddAll() {
assertTrue(v.addAll(Arrays.asList(new Object[] {O, O})));
assertEquals(1, v.size());
}
+ @Test
public void testAddAll2() {
assertTrue(v.addAll(0, Arrays.asList(new Object[] {O, O})));
assertEquals(1, v.size());
}
+ @Test
public void testClear() {
v.add(O);
v.clear();
assertEquals(0, v.size());
}
-
+
+ @Test
public void testClone() {
v.add(O);
Object o = v.clone();
@@ -71,6 +84,7 @@ public class VectorSetTest extends TestC
assertTrue(vs.contains(O));
}
+ @Test
public void testContains() {
assertFalse(v.contains(O));
v.add(O);
@@ -78,6 +92,7 @@ public class VectorSetTest extends TestC
assertFalse(v.contains(null));
}
+ @Test
public void testContainsAll() {
assertFalse(v.containsAll(Arrays.asList(new Object[] {O, O})));
v.add(O);
@@ -85,12 +100,14 @@ public class VectorSetTest extends TestC
assertFalse(v.containsAll(Arrays.asList(new Object[] {O, null})));
}
+ @Test
public void testInsertElementAt() {
v.insertElementAt(O, 0);
v.insertElementAt(O, 1);
assertEquals(1, v.size());
}
+ @Test
public void testRemoveIndex() {
v.add(O);
assertSame(O, v.remove(0));
@@ -99,10 +116,12 @@ public class VectorSetTest extends TestC
v.remove(0);
fail("expected an AIOBE");
} catch (ArrayIndexOutOfBoundsException e) {
+ //TODO assert exception values
// expected
}
}
+ @Test
public void testRemoveObject() {
v.add(O);
assertTrue(v.remove(O));
@@ -110,6 +129,7 @@ public class VectorSetTest extends TestC
assertFalse(v.remove(O));
}
+ @Test
public void testRemoveAtEndWhenSizeEqualsCapacity() {
v = new VectorSet(3, 1);
Object a = new Object();
@@ -126,6 +146,7 @@ public class VectorSetTest extends TestC
assertSame(b, v.elementAt(1));
}
+ @Test
public void testRemoveAtFrontWhenSizeEqualsCapacity() {
v = new VectorSet(3, 1);
v.add(O);
@@ -142,6 +163,7 @@ public class VectorSetTest extends TestC
assertSame(b, v.elementAt(1));
}
+ @Test
public void testRemoveInMiddleWhenSizeEqualsCapacity() {
v = new VectorSet(3, 1);
Object a = new Object();
@@ -158,6 +180,7 @@ public class VectorSetTest extends TestC
assertSame(b, v.elementAt(1));
}
+ @Test
public void testRemoveAll() {
v.add(O);
assertTrue(v.removeAll(Arrays.asList(new Object[] {O, O})));
@@ -165,12 +188,14 @@ public class VectorSetTest extends TestC
assertFalse(v.removeAll(Arrays.asList(new Object[] {O, O})));
}
+ @Test
public void testRemoveAllElements() {
v.add(O);
v.removeAllElements();
assertEquals(0, v.size());
}
-
+
+ @Test
public void testRemoveElement() {
v.add(O);
assertTrue(v.removeElement(O));
@@ -178,6 +203,7 @@ public class VectorSetTest extends TestC
assertFalse(v.removeElement(O));
}
+ @Test
public void testRemoveElementAt() {
v.add(O);
v.removeElementAt(0);
@@ -186,10 +212,12 @@ public class VectorSetTest extends TestC
v.removeElementAt(0);
fail("expected an AIOBE");
} catch (ArrayIndexOutOfBoundsException e) {
+ //TODO assert exception values
// expected
}
}
+ @Test
public void testRemoveRange() {
Object a = new Object();
Object b = new Object();
@@ -201,6 +229,7 @@ public class VectorSetTest extends TestC
assertTrue(v.contains(c));
}
+ @Test
public void testRetainAll() {
Object a = new Object();
Object b = new Object();
@@ -214,6 +243,7 @@ public class VectorSetTest extends TestC
assertEquals(0, v.indexOf(O));
}
+ @Test
public void testRetainAllReturnValueAndEmptiness() {
v.add(1);
v.add(2);
@@ -227,6 +257,7 @@ public class VectorSetTest extends TestC
assertFalse(v.retainAll(Arrays.asList(4, 5)));
}
+ @Test
public void testSet() {
v.add(O);
Object a = new Object();
@@ -235,6 +266,7 @@ public class VectorSetTest extends TestC
assertEquals(1, v.size());
}
+ @Test
public void testSetElementAt() {
v.add(O);
Object a = new Object();
@@ -243,6 +275,7 @@ public class VectorSetTest extends TestC
assertEquals(1, v.size());
}
+ @Test
public void testRetainAllSpeed() {
int size = 50000;
for (int i = 0; i < size; i++) {
@@ -255,10 +288,7 @@ public class VectorSetTest extends TestC
list.add(i);
v.add(i);
}
- long start = System.currentTimeMillis();
assertTrue(v.retainAll(list));
- long stop = System.currentTimeMillis();
- System.out.println("testRetainAllSpeed: " + (stop - start) + "msec");
assertEquals(v.toString(), size + 4, v.size());
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java Fri Apr 18 21:00:38 2014
@@ -18,23 +18,31 @@
package org.apache.tools.ant.util;
-import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class XMLFragmentTest extends BuildFileTest {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
- public XMLFragmentTest(String name) {
- super(name);
- }
+public class XMLFragmentTest {
+
+ @Rule
+ public BuildFileRule buildRule = new BuildFileRule();
+ @Before
public void setUp() {
- configureProject("src/etc/testcases/types/xmlfragment.xml");
+ buildRule.configureProject("src/etc/testcases/types/xmlfragment.xml");
}
+ @Test
public void testNestedText() {
- XMLFragment x = (XMLFragment) getProject().getReference("nested-text");
+ XMLFragment x = (XMLFragment) buildRule.getProject().getReference("nested-text");
assertNotNull(x);
Node n = x.getFragment();
assertTrue("No attributes", !n.hasAttributes());
@@ -44,9 +52,10 @@ public class XMLFragmentTest extends Bui
assertEquals("foo", nl.item(0).getNodeValue());
}
+ @Test
public void testNestedChildren() {
XMLFragment x =
- (XMLFragment) getProject().getReference("with-children");
+ (XMLFragment) buildRule.getProject().getReference("with-children");
assertNotNull(x);
Node n = x.getFragment();
assertTrue("No attributes", !n.hasAttributes());
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java Fri Apr 18 21:00:38 2014
@@ -18,17 +18,17 @@
package org.apache.tools.ant.util.facade;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* @since Ant 1.5
*/
-public class FacadeTaskHelperTest extends TestCase {
-
- public FacadeTaskHelperTest(String name) {
- super(name);
- }
+public class FacadeTaskHelperTest {
+ @Test
public void testPrecedenceRules() {
FacadeTaskHelper fth = new FacadeTaskHelper("foo");
assertEquals("foo", fth.getImplementation());
@@ -48,6 +48,7 @@ public class FacadeTaskHelperTest extend
assertEquals("baz", fth.getImplementation());
}
+ @Test
public void testHasBeenSet() {
FacadeTaskHelper fth = new FacadeTaskHelper("foo");
assertTrue("nothing set", !fth.hasBeenSet());
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java Fri Apr 18 21:00:38 2014
@@ -18,17 +18,17 @@
package org.apache.tools.ant.util.facade;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
/**
* @since Ant 1.5
*/
-public class ImplementationSpecificArgumentTest extends TestCase {
-
- public ImplementationSpecificArgumentTest(String name) {
- super(name);
- }
+public class ImplementationSpecificArgumentTest {
+ @Test
public void testDependsOnImplementation() {
ImplementationSpecificArgument ia =
new ImplementationSpecificArgument();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/bzip2/CBZip2StreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/bzip2/CBZip2StreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/bzip2/CBZip2StreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/bzip2/CBZip2StreamTest.java Fri Apr 18 21:00:38 2014
@@ -21,19 +21,24 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class CBZip2StreamTest extends TestCase {
+import static org.junit.Assert.fail;
+public class CBZip2StreamTest {
+
+ @Test
public void testNullPointer() throws IOException {
try {
- CBZip2InputStream cb = new CBZip2InputStream(new ByteArrayInputStream(new byte[0]));
+ new CBZip2InputStream(new ByteArrayInputStream(new byte[0]));
fail("expected an exception");
} catch (IOException e) {
// expected
+ //TODO assert exception values
}
}
-
+
+ @Test
public void testDivisionByZero() throws IOException {
CBZip2OutputStream cb = new CBZip2OutputStream(new ByteArrayOutputStream());
cb.close();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/mail/MailMessageTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/mail/MailMessageTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/mail/MailMessageTest.java Fri Apr 18 21:00:38 2014
@@ -26,31 +26,32 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.net.InetAddress;
-import java.net.Socket;
import java.net.ServerSocket;
+import java.net.Socket;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.tools.mail.MailMessage;
+import org.apache.tools.ant.BuildException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.internal.AssumptionViolatedException;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
/**
- * JUnit 3 testcases for org.apache.tools.mail.MailMessage.
+ * JUnit testcases for org.apache.tools.mail.MailMessage.
*
* @since Ant 1.6
*/
-public class MailMessageTest extends TestCase {
+public class MailMessageTest {
// 27224 = magic (a random port which is unlikely to be in use)
private static int TEST_PORT = 27224;
private String local = null;
- public MailMessageTest(String name) {
- super(name);
- }
-
+ @Before
public void setUp() {
try {
local = InetAddress.getLocalHost().getHostName();
@@ -64,8 +65,10 @@ public class MailMessageTest extends Tes
* If this testcase takes >90s to complete, it is very likely that
* the two threads are blocked waiting for each other and Thread.join()
* timed out.
+ * @throws InterruptedException
*/
- public void testAPIExample() {
+ @Test
+ public void testAPIExample() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
@@ -85,12 +88,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail( "InterruptedException: " + ie );
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -121,7 +120,7 @@ public class MailMessageTest extends Tes
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
- for (int icounter = 0; icounter<expectedResult.length(); icounter++) {
+ /*for (int icounter = 0; icounter<expectedResult.length(); icounter++) {
if (icounter < result.length()) {
if (expectedResult.charAt(icounter) != result.charAt(icounter)) {
System.out.println("posit " + icounter + " expected "
@@ -137,18 +136,18 @@ public class MailMessageTest extends Tes
if (expectedResult.length()<result.length()) {
System.out.println("excedent of result "
+ result.substring(expectedResult.length()));
- }
+ }*/
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result); // order of headers cannot be guaranteed
- if (testMailClient.isFailed()) {
- fail(testMailClient.getFailMessage());
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
/**
* Test a MailMessage with no cc or bcc lines
+ * @throws InterruptedException
*/
- public void testToOnly() {
+ @Test
+ public void testToOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
server.start();
@@ -164,12 +163,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail("InterruptedException: " + ie);
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -195,16 +190,16 @@ public class MailMessageTest extends Tes
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result); // order of headers cannot be guaranteed
- if (testMailClient.isFailed()) {
- fail(testMailClient.getFailMessage());
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
/**
* Test a MailMessage with no to or bcc lines
+ * @throws InterruptedException
*/
- public void testCcOnly() {
+ @Test
+ public void testCcOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
server.start();
@@ -220,12 +215,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail( "InterruptedException: " + ie );
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -251,16 +242,16 @@ public class MailMessageTest extends Tes
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
- if (testMailClient.isFailed()) {
- fail(testMailClient.getFailMessage());
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
/**
* Test a MailMessage with no to or cc lines
+ * @throws InterruptedException
*/
- public void testBccOnly() {
+ @Test
+ public void testBccOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
server.start();
@@ -276,12 +267,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail( "InterruptedException: " + ie );
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -306,17 +293,17 @@ public class MailMessageTest extends Tes
"221\r\n";
assertEquals( expectedResult.length(), result.length() );
assertEquals( expectedResult, result );
- if ( testMailClient.isFailed() ) {
- fail( testMailClient.getFailMessage() );
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
/**
* Test a MailMessage with no subject line
* Subject is an optional field (RFC 822 s4.1)
+ * @throws InterruptedException
*/
- public void testNoSubject() {
+ @Test
+ public void testNoSubject() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
server.start();
@@ -331,12 +318,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail( "InterruptedException: " + ie );
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -361,16 +344,16 @@ public class MailMessageTest extends Tes
"221\r\n";
assertEquals( expectedResult.length(), result.length() );
assertEquals( expectedResult, result );
- if ( testMailClient.isFailed() ) {
- fail( testMailClient.getFailMessage() );
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
/**
* Test a MailMessage with empty body message
+ * @throws InterruptedException
*/
- public void testEmptyBody() {
+ @Test
+ public void testEmptyBody() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
server.start();
@@ -385,12 +368,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail( "InterruptedException: " + ie );
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -415,9 +394,7 @@ public class MailMessageTest extends Tes
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
- if (testMailClient.isFailed()) {
- fail(testMailClient.getFailMessage());
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -425,8 +402,10 @@ public class MailMessageTest extends Tes
* Test a MailMessage with US-ASCII character set
* The next four testcase can be kinda hard to debug as Ant will often
* print the junit failure in US-ASCII.
+ * @throws InterruptedException
*/
- public void testAsciiCharset() {
+ @Test
+ public void testAsciiCharset() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
Thread server = new Thread(testMailServer);
@@ -442,12 +421,8 @@ public class MailMessageTest extends Tes
Thread client = new Thread(testMailClient);
client.start();
- try {
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
- } catch (InterruptedException ie ) {
- fail("InterruptedException: " + ie);
- }
+ server.join(60 * 1000); // 60s
+ client.join(30 * 1000); // a further 30s
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n" +
@@ -482,9 +457,7 @@ public class MailMessageTest extends Tes
+ "in testAsciiCharset()", expectedResult.length(), result.length() );
assertEquals( "baos1 and baos2 should be the same in testAsciiCharset()",
baos1.toString(), baos2.toString() ); // order of headers cannot be guaranteed
- if (testMailClient.isFailed()) {
- fail(testMailClient.getFailMessage());
- }
+ assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -551,7 +524,7 @@ public class MailMessageTest extends Tes
} // while
} catch (IOException ioe) {
- fail();
+ throw new BuildException(ioe);
} finally {
disconnect();
}
@@ -633,7 +606,7 @@ public class MailMessageTest extends Tes
try {
Thread.sleep(10 * 1000);
} catch (InterruptedException ie) {
- // ignore
+ throw new AssumptionViolatedException("Thread interrupted", ie);
}
} catch (IOException ioe) {
fail = true;
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarEntryTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarEntryTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarEntryTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarEntryTest.java Fri Apr 18 21:00:38 2014
@@ -18,20 +18,17 @@
package org.apache.tools.tar;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* @since Ant 1.6
*/
-public class TarEntryTest extends TestCase {
-
- public TarEntryTest(String name) {
- super(name);
- }
+public class TarEntryTest {
/**
* demonstrates bug 18105 on OSes with os.name shorter than 7.
*/
+ @Test
public void testFileConstructor() {
new TarEntry(new java.io.File("/foo"));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarOutputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarOutputStreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarOutputStreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarOutputStreamTest.java Fri Apr 18 21:00:38 2014
@@ -18,13 +18,14 @@
package org.apache.tools.tar;
+import org.junit.Test;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import junit.framework.TestCase;
-
-public class TarOutputStreamTest extends TestCase {
+public class TarOutputStreamTest {
+ @Test
public void testClose() throws IOException {
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
TarOutputStream stream = new TarOutputStream(byteStream);
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarRoundTripTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarRoundTripTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarRoundTripTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/tar/TarRoundTripTest.java Fri Apr 18 21:00:38 2014
@@ -17,24 +17,26 @@
*/
package org.apache.tools.tar;
-import java.io.IOException;
+import org.junit.Test;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import junit.framework.TestCase;
+import java.io.IOException;
-public class TarRoundTripTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class TarRoundTripTest {
private static final String LONG_NAME
= "this/path/name/contains/more/than/one/hundred/characters/in/order/"
+ "to/test/the/GNU/long/file/name/capability/round/tripped";
- public TarRoundTripTest(String name) {
- super(name);
- }
-
/**
* test round-tripping long (GNU) entries
*/
+ @Test
public void testLongRoundTrippingGNU() throws IOException {
testLongRoundTripping(TarOutputStream.LONGFILE_GNU);
}
@@ -42,6 +44,7 @@ public class TarRoundTripTest extends Te
/**
* test round-tripping long (POSIX) entries
*/
+ @Test
public void testLongRoundTrippingPOSIX() throws IOException {
testLongRoundTripping(TarOutputStream.LONGFILE_POSIX);
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java Fri Apr 18 21:00:38 2014
@@ -18,20 +18,23 @@
package org.apache.tools.zip;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
- * JUnit 3 testcases for org.apache.tools.zip.AsiExtraField.
+ * JUnit testcases for org.apache.tools.zip.AsiExtraField.
*
*/
-public class AsiExtraFieldTest extends TestCase implements UnixStat {
- public AsiExtraFieldTest(String name) {
- super(name);
- }
+public class AsiExtraFieldTest implements UnixStat {
/**
* Test file mode magic.
*/
+ @Test
public void testModes() {
AsiExtraField a = new AsiExtraField();
a.setMode(0123);
@@ -45,6 +48,7 @@ public class AsiExtraFieldTest extends T
/**
* Test content.
*/
+ @Test
public void testContent() {
AsiExtraField a = new AsiExtraField();
a.setMode(0123);
@@ -79,6 +83,7 @@ public class AsiExtraFieldTest extends T
/**
* Test reparse
*/
+ @Test
public void testReparse() throws Exception {
// CRC manually calculated, sorry
byte[] data = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC
@@ -139,6 +144,7 @@ public class AsiExtraFieldTest extends T
}
}
+ @Test
public void testClone() {
AsiExtraField s1 = new AsiExtraField();
s1.setUserId(42);
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java Fri Apr 18 21:00:38 2014
@@ -18,16 +18,18 @@
package org.apache.tools.zip;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* JUnit 3 testcases for org.apache.tools.zip.ExtraFieldUtils.
*
*/
-public class ExtraFieldUtilsTest extends TestCase implements UnixStat {
- public ExtraFieldUtilsTest(String name) {
- super(name);
- }
+public class ExtraFieldUtilsTest implements UnixStat {
/**
* Header-ID of a ZipExtraField not supported by Ant.
@@ -42,7 +44,7 @@ public class ExtraFieldUtilsTest extends
private byte[] data;
private byte[] aLocal;
- @Override
+ @Before
public void setUp() {
a = new AsiExtraField();
a.setMode(0755);
@@ -70,6 +72,7 @@ public class ExtraFieldUtilsTest extends
/**
* test parser.
*/
+ @Test
public void testParse() throws Exception {
ZipExtraField[] ze = ExtraFieldUtils.parse(data);
assertEquals("number of fields", 2, ze.length);
@@ -93,6 +96,7 @@ public class ExtraFieldUtilsTest extends
}
}
+ @Test
public void testParseWithRead() throws Exception {
ZipExtraField[] ze =
ExtraFieldUtils.parse(data, true,
@@ -123,6 +127,7 @@ public class ExtraFieldUtilsTest extends
}
}
+ @Test
public void testParseWithSkip() throws Exception {
ZipExtraField[] ze =
ExtraFieldUtils.parse(data, true,
@@ -148,6 +153,7 @@ public class ExtraFieldUtilsTest extends
/**
* Test merge methods
*/
+ @Test
public void testMerge() {
byte[] local =
ExtraFieldUtils.mergeLocalFileDataData(new ZipExtraField[] {a, dummy});
@@ -174,6 +180,7 @@ public class ExtraFieldUtilsTest extends
}
+ @Test
public void testMergeWithUnparseableData() throws Exception {
ZipExtraField d = new UnparseableExtraFieldData();
byte[] b = UNRECOGNIZED_HEADER.getBytes();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java Fri Apr 18 21:00:38 2014
@@ -21,13 +21,15 @@ package org.apache.tools.zip;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.Enumeration;
import java.util.zip.CRC32;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class UTF8ZipFilesTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class UTF8ZipFilesTest {
private static final String UTF_8 = "utf-8";
private static final String CP437 = "cp437";
@@ -36,46 +38,55 @@ public class UTF8ZipFilesTest extends Te
private static final String EURO_FOR_DOLLAR_TXT = "\u20AC_for_Dollar.txt";
private static final String OIL_BARREL_TXT = "\u00D6lf\u00E4sser.txt";
+ @Test
public void testUtf8FileRoundtripExplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(UTF_8, true, true);
}
+ @Test
public void testUtf8FileRoundtripNoEFSExplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(UTF_8, false, true);
}
+ @Test
public void testCP437FileRoundtripExplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(CP437, false, true);
}
+ @Test
public void testASCIIFileRoundtripExplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(US_ASCII, false, true);
}
+ @Test
public void testUtf8FileRoundtripImplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(UTF_8, true, false);
}
+ @Test
public void testUtf8FileRoundtripNoEFSImplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(UTF_8, false, false);
}
+ @Test
public void testCP437FileRoundtripImplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(CP437, false, false);
}
+ @Test
public void testASCIIFileRoundtripImplicitUnicodeExtra()
throws IOException {
testFileRoundtrip(US_ASCII, false, false);
}
+ @Test
public void testZipFileReadsUnicodeFields() throws IOException {
File file = File.createTempFile("unicode-test", ".zip");
ZipFile zf = null;
@@ -111,7 +122,7 @@ public class UTF8ZipFilesTest extends Te
private static void createTestFile(File file, String encoding,
boolean withEFS,
boolean withExplicitUnicodeExtra)
- throws UnsupportedEncodingException, IOException {
+ throws IOException {
ZipEncoding zipEncoding = ZipEncodingHelper.getZipEncoding(encoding);
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEncodingTest.java Fri Apr 18 21:00:38 2014
@@ -22,12 +22,14 @@ package org.apache.tools.zip;
import java.io.IOException;
import java.nio.ByteBuffer;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
/**
* Test zip encodings.
*/
-public class ZipEncodingTest extends TestCase {
+public class ZipEncodingTest {
private static final String UNENC_STRING = "\u2016";
// stress test for internal grow method.
@@ -37,16 +39,19 @@ public class ZipEncodingTest extends Tes
private static final String BAD_STRING_ENC =
"%U2016%U2015%U2016%U2015%U2016%U2015%U2016%U2015%U2016%U2015%U2016";
+ @Test
public void testSimpleCp437Encoding() throws IOException {
doSimpleEncodingTest("Cp437", null);
}
+ @Test
public void testSimpleCp850Encoding() throws IOException {
doSimpleEncodingTest("Cp850", null);
}
+ @Test
public void testNioCp1252Encoding() throws IOException {
// CP1252 has some undefined code points, these are
// the defined ones
@@ -104,7 +109,7 @@ public class ZipEncodingTest extends Tes
doSimpleEncodingTest("Cp1252",b);
}
- private static final void assertEquals(byte[] expected, ByteBuffer actual) {
+ private static void assertByteEquals(byte[] expected, ByteBuffer actual) {
assertEquals(expected.length, actual.limit());
@@ -135,13 +140,13 @@ public class ZipEncodingTest extends Tes
ByteBuffer encoded = enc.encode(decoded);
- assertEquals(testBytes, encoded);
+ assertByteEquals(testBytes, encoded);
assertEquals(false, enc.canEncode(UNENC_STRING));
- assertEquals("%U2016".getBytes("US-ASCII"), enc.encode(UNENC_STRING));
+ assertByteEquals("%U2016".getBytes("US-ASCII"), enc.encode(UNENC_STRING));
assertEquals(false, enc.canEncode(BAD_STRING));
- assertEquals(BAD_STRING_ENC.getBytes("US-ASCII"),
- enc.encode(BAD_STRING));
+ assertByteEquals(BAD_STRING_ENC.getBytes("US-ASCII"),
+ enc.encode(BAD_STRING));
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java Fri Apr 18 21:00:38 2014
@@ -18,21 +18,24 @@
package org.apache.tools.zip;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
/**
* JUnit 3 testcases for org.apache.tools.zip.ZipEntry.
*
*/
-public class ZipEntryTest extends TestCase {
+public class ZipEntryTest {
- public ZipEntryTest(String name) {
- super(name);
- }
/**
* test handling of extra fields
*/
+ @Test
public void testExtraFields() {
AsiExtraField a = new AsiExtraField();
a.setDirectory(true);
@@ -80,12 +83,14 @@ public class ZipEntryTest extends TestCa
ze.removeExtraField(ExtraFieldUtilsTest.UNRECOGNIZED_HEADER);
fail("should be no such element");
} catch (java.util.NoSuchElementException nse) {
+ //TODO assert exception values
}
}
/**
* test handling of extra fields via central directory
*/
+ @Test
public void testExtraFieldMerging() {
AsiExtraField a = new AsiExtraField();
a.setDirectory(true);
@@ -132,6 +137,7 @@ public class ZipEntryTest extends TestCa
/**
* test handling of extra fields
*/
+ @Test
public void testAddAsFirstExtraField() {
AsiExtraField a = new AsiExtraField();
a.setDirectory(true);
@@ -167,6 +173,7 @@ public class ZipEntryTest extends TestCa
assertSame(a, result[2]);
}
+ @Test
public void testUnixMode() {
ZipEntry ze = new ZipEntry("foo");
assertEquals(0, ze.getPlatform());
@@ -202,6 +209,7 @@ public class ZipEntryTest extends TestCa
* <a href="https://issues.apache.org/jira/browse/COMPRESS-94"
* >COMPRESS-94</a>.
*/
+ @Test
public void testNotEquals() {
ZipEntry entry1 = new ZipEntry("foo");
ZipEntry entry2 = new ZipEntry("bar");
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipLongTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipLongTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipLongTest.java Fri Apr 18 21:00:38 2014
@@ -18,21 +18,22 @@
package org.apache.tools.zip;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
/**
- * JUnit 3 testcases for org.apache.tools.zip.ZipLong.
+ * JUnit testcases for org.apache.tools.zip.ZipLong.
*
*/
-public class ZipLongTest extends TestCase {
-
- public ZipLongTest(String name) {
- super(name);
- }
+public class ZipLongTest {
/**
* Test conversion to bytes.
*/
+ @Test
public void testToBytes() {
ZipLong zl = new ZipLong(0x12345678);
byte[] result = zl.getBytes();
@@ -46,6 +47,7 @@ public class ZipLongTest extends TestCas
/**
* Test conversion from bytes.
*/
+ @Test
public void testFromBytes() {
byte[] val = new byte[] {0x78, 0x56, 0x34, 0x12};
ZipLong zl = new ZipLong(val);
@@ -55,6 +57,7 @@ public class ZipLongTest extends TestCas
/**
* Test the contract of the equals method.
*/
+ @Test
public void testEquals() {
ZipLong zl = new ZipLong(0x12345678);
ZipLong zl2 = new ZipLong(0x12345678);
@@ -74,11 +77,13 @@ public class ZipLongTest extends TestCas
/**
* Test sign handling.
*/
+ @Test
public void testSign() {
ZipLong zl = new ZipLong(new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF});
assertEquals(0x00000000FFFFFFFFl, zl.getValue());
}
+ @Test
public void testClone() {
ZipLong s1 = new ZipLong(42);
ZipLong s2 = (ZipLong) s1.clone();
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipOutputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipOutputStreamTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipOutputStreamTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipOutputStreamTest.java Fri Apr 18 21:00:38 2014
@@ -18,24 +18,21 @@
package org.apache.tools.zip;
+import org.junit.Before;
+import org.junit.Test;
+
import java.util.Calendar;
import java.util.Date;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class ZipOutputStreamTest extends TestCase {
+public class ZipOutputStreamTest {
private Date time;
private ZipLong zl;
-
- /**
- * Constructor
- */
- public ZipOutputStreamTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+
+ @Before
+ public void setUp() throws Exception {
time = new Date();
Calendar cal = Calendar.getInstance();
cal.setTime(time);
@@ -56,15 +53,14 @@ public class ZipOutputStreamTest extends
zl = new ZipLong(result);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+
+ @Test
public void testZipLong() throws Exception {
ZipLong test = ZipOutputStream.toDosTime(time);
assertEquals(test.getValue(), zl.getValue());
}
+ @Test
public void testAdjustToLong() {
assertEquals((long) Integer.MAX_VALUE,
ZipOutputStream.adjustToLong(Integer.MAX_VALUE));
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipShortTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipShortTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipShortTest.java Fri Apr 18 21:00:38 2014
@@ -18,21 +18,22 @@
package org.apache.tools.zip;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
/**
* JUnit 3 testcases for org.apache.tools.zip.ZipShort.
*
*/
-public class ZipShortTest extends TestCase {
-
- public ZipShortTest(String name) {
- super(name);
- }
+public class ZipShortTest {
/**
* Test conversion to bytes.
*/
+ @Test
public void testToBytes() {
ZipShort zs = new ZipShort(0x1234);
byte[] result = zs.getBytes();
@@ -44,6 +45,7 @@ public class ZipShortTest extends TestCa
/**
* Test conversion from bytes.
*/
+ @Test
public void testFromBytes() {
byte[] val = new byte[] {0x34, 0x12};
ZipShort zs = new ZipShort(val);
@@ -53,6 +55,7 @@ public class ZipShortTest extends TestCa
/**
* Test the contract of the equals method.
*/
+ @Test
public void testEquals() {
ZipShort zs = new ZipShort(0x1234);
ZipShort zs2 = new ZipShort(0x1234);
@@ -72,11 +75,13 @@ public class ZipShortTest extends TestCa
/**
* Test sign handling.
*/
+ @Test
public void testSign() {
ZipShort zs = new ZipShort(new byte[] {(byte)0xFF, (byte)0xFF});
assertEquals(0x0000FFFF, zs.getValue());
}
+ @Test
public void testClone() {
ZipShort s1 = new ZipShort(42);
ZipShort s2 = (ZipShort) s1.clone();
Modified: ant/core/trunk/src/tests/junit/org/example/junit/Timeout.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/example/junit/Timeout.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/example/junit/Timeout.java (original)
+++ ant/core/trunk/src/tests/junit/org/example/junit/Timeout.java Fri Apr 18 21:00:38 2014
@@ -17,12 +17,15 @@
*/
package org.example.junit;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Test;
-public class Timeout extends TestCase {
+public class Timeout {
+ @Test
public void testTimeout() throws InterruptedException {
Thread.sleep(5000);
}
+ @After
public void tearDown() {
System.out.println("tearDown called on Timeout");
}
Modified: ant/core/trunk/src/tests/junit/org/example/junit/XmlParserTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/example/junit/XmlParserTest.java?rev=1588563&r1=1588562&r2=1588563&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/example/junit/XmlParserTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/example/junit/XmlParserTest.java Fri Apr 18 21:00:38 2014
@@ -17,21 +17,21 @@
*/
package org.example.junit;
-import junit.framework.TestCase;
+import org.junit.Test;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
+import static org.junit.Assert.assertNotNull;
+
/**
* created Aug 12, 2004 1:39:59 PM
*/
-public class XmlParserTest extends TestCase {
+public class XmlParserTest {
- public XmlParserTest(String s) {
- super(s);
- }
+ @Test
public void testXercesIsPresent() throws SAXException {
XMLReader xerces;
xerces = XMLReaderFactory.createXMLReader(
@@ -39,6 +39,7 @@ public class XmlParserTest extends TestC
assertNotNull(xerces);
}
+ @Test
public void testXercesHandlesSchema() throws SAXException {
XMLReader xerces;
xerces = XMLReaderFactory.createXMLReader("org.apache.xerces.parsers.SAXParser");
@@ -46,6 +47,7 @@ public class XmlParserTest extends TestC
true);
}
+ @Test
public void testParserHandlesSchema() throws SAXException {
XMLReader xerces;
xerces = XMLReaderFactory.createXMLReader();