Repository: oozie Updated Branches: refs/heads/master cb03d287e -> c979e55fe
OOZIE-2835 TestIOUtils shall not be an XTestCase (asasvari via pbacsko) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c979e55f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c979e55f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c979e55f Branch: refs/heads/master Commit: c979e55fe43bc24cb656147ba9179211de039e9d Parents: cb03d28 Author: Peter Bacsko <pbac...@cloudera.com> Authored: Wed Mar 22 12:50:22 2017 +0100 Committer: Peter Bacsko <pbac...@cloudera.com> Committed: Wed Mar 22 12:50:22 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/oozie/util/TestIOUtils.java | 17 ++++++++++++----- release-log.txt | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c979e55f/core/src/test/java/org/apache/oozie/util/TestIOUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/util/TestIOUtils.java b/core/src/test/java/org/apache/oozie/util/TestIOUtils.java index 3043817..6fcdf55 100644 --- a/core/src/test/java/org/apache/oozie/util/TestIOUtils.java +++ b/core/src/test/java/org/apache/oozie/util/TestIOUtils.java @@ -18,16 +18,20 @@ package org.apache.oozie.util; -import org.apache.oozie.test.XTestCase; +import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; -public class TestIOUtils extends XTestCase { +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.fail; - public void testGetReaderAsString() throws Exception { +public class TestIOUtils { + + @Test + public void testGetReaderAsString() throws IOException { try { IOUtils.getReaderAsString(new StringReader("1234"), 2); fail(); @@ -38,7 +42,8 @@ public class TestIOUtils extends XTestCase { assertEquals("1234", IOUtils.getReaderAsString(new StringReader("1234"), 4)); } - public void testGetResourceAsString() throws Exception { + @Test + public void testGetResourceAsString() throws IOException { try { IOUtils.getResourceAsString("invalid-resource.txt", 2); fail(); @@ -57,10 +62,12 @@ public class TestIOUtils extends XTestCase { } } - public void testGetResourceAsReader() throws Exception { + @Test + public void testGetResourceAsReader() throws IOException { IOUtils.getResourceAsReader("test-ioutils.txt", 10); } + @Test public void testCopyStream() throws IOException { byte[] original = new byte[]{0, 1, 2}; ByteArrayInputStream is = new ByteArrayInputStream(original); http://git-wip-us.apache.org/repos/asf/oozie/blob/c979e55f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b1c1d2b..dc459b7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2835 TestIOUtils shall not be an XTestCase (asasvari via pbacsko) OOZIE-2817 Increase test case stability in pre-commit job (gezapeti) OOZIE-2820 Fix more spelling errors in exceptions and logging (lzeke via rkanter) OOZIE-2816 Strip out the first command word from Sqoop action if its "sqoop" (harsh)