Repository: oozie Updated Branches: refs/heads/master db15e6d30 -> 1e0bf4c4e
OOZIE-3399 [tests] Eliminate nested class in TestV1JobsServletBundleEngine and TestV1JobServletBundleEngine (asalamon74 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/1e0bf4c4 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/1e0bf4c4 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/1e0bf4c4 Branch: refs/heads/master Commit: 1e0bf4c4e5ce82b326c5290eca8b9e54a96e5747 Parents: db15e6d Author: Andras Piros <[email protected]> Authored: Thu Dec 6 19:23:08 2018 +0100 Committer: Andras Piros <[email protected]> Committed: Thu Dec 6 19:23:08 2018 +0100 ---------------------------------------------------------------------- .../oozie/TestV1JobsServletBundleEngine.java | 20 +-------------- .../servlet/TestV1JobServletBundleEngine.java | 26 ++++---------------- release-log.txt | 1 + 3 files changed, 7 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/1e0bf4c4/core/src/test/java/org/apache/oozie/TestV1JobsServletBundleEngine.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/TestV1JobsServletBundleEngine.java b/core/src/test/java/org/apache/oozie/TestV1JobsServletBundleEngine.java index c1a4986..62a3444 100644 --- a/core/src/test/java/org/apache/oozie/TestV1JobsServletBundleEngine.java +++ b/core/src/test/java/org/apache/oozie/TestV1JobsServletBundleEngine.java @@ -27,7 +27,6 @@ import java.util.concurrent.Callable; import javax.servlet.http.HttpServletResponse; -import org.apache.oozie.BundleJobBean; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.apache.oozie.client.rest.RestConstants; @@ -36,11 +35,9 @@ import org.apache.oozie.service.UUIDService; import org.apache.oozie.servlet.DagServletTestCase; import org.apache.oozie.servlet.MockDagEngineService; import org.apache.oozie.servlet.V1JobsServlet; -import org.apache.oozie.test.XDataTestCase; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.Ignore; public class TestV1JobsServletBundleEngine extends DagServletTestCase { static { @@ -51,24 +48,10 @@ public class TestV1JobsServletBundleEngine extends DagServletTestCase { private Services services; - /** - * This class is needed in order to reuse some methods of class {@link XDataTestCase}. We cannot directly extend it there as - * we extend {@link DagServletTestCase}. Anonymous inner class is also not an option since we cannot assign it an annotation. - * The @Ignore annotation is needed to prevent JUnit from recognizing this inner class as a test. - */ - @Ignore - private static class XDataTestCase1 extends XDataTestCase { - } - - private final XDataTestCase1 xDataTestCase = new XDataTestCase1(); - @Override protected void setUp() throws Exception { super.setUp(); - xDataTestCase.setName(getName()); - xDataTestCase.setUpPub(); - new Services().init(); services = Services.get(); services.setService(UUIDService.class); @@ -79,7 +62,6 @@ public class TestV1JobsServletBundleEngine extends DagServletTestCase { if (services != null) { services.destroy(); } - xDataTestCase.tearDownPub(); super.tearDown(); } @@ -89,7 +71,7 @@ public class TestV1JobsServletBundleEngine extends DagServletTestCase { * {@link BundleEngine#parseFilter(String)}. */ public void testGetBundleJobs() throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/jobs", V1JobsServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/1e0bf4c4/core/src/test/java/org/apache/oozie/servlet/TestV1JobServletBundleEngine.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV1JobServletBundleEngine.java b/core/src/test/java/org/apache/oozie/servlet/TestV1JobServletBundleEngine.java index 454a141..f3f0882 100644 --- a/core/src/test/java/org/apache/oozie/servlet/TestV1JobServletBundleEngine.java +++ b/core/src/test/java/org/apache/oozie/servlet/TestV1JobServletBundleEngine.java @@ -32,11 +32,9 @@ import org.apache.oozie.client.Job; import org.apache.oozie.client.rest.RestConstants; import org.apache.oozie.service.Services; import org.apache.oozie.service.UUIDService; -import org.apache.oozie.test.XDataTestCase; import org.apache.oozie.util.IOUtils; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.Ignore; public class TestV1JobServletBundleEngine extends DagServletTestCase { static { @@ -47,23 +45,10 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { private Services services; - /** - * This class is needed in order to reuse some methods of class {@link XDataTestCase}. We cannot directly extend it there as - * we extend {@link DagServletTestCase}. Anonymous inner class is also not an option since we cannot assign it an annotation. - * The @Ignore annotation is needed to prevent JUnit from recognizing this inner class as a test. - */ - @Ignore - private static class XDataTestCase1 extends XDataTestCase {} - - private final XDataTestCase xDataTestCase = new XDataTestCase1(); - @Override protected void setUp() throws Exception { super.setUp(); - xDataTestCase.setName(getName()); - xDataTestCase.setUpPub(); - new Services().init(); services = Services.get(); services.setService(UUIDService.class); @@ -74,12 +59,11 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { if (services != null) { services.destroy(); } - xDataTestCase.tearDownPub(); super.tearDown(); } public void testBundleEngineGetBundleJob() throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/job/*", V1JobServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override @@ -103,7 +87,7 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { } public void testBundleEngineChange() throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/job/*", V1JobServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override @@ -125,7 +109,7 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { } public void testBundleEngineGetDefinition() throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/job/*", V1JobServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override @@ -151,7 +135,7 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { } public void testBundleEngineStreamLog() throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/job/*", V1JobServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override @@ -191,7 +175,7 @@ public class TestV1JobServletBundleEngine extends DagServletTestCase { } private void _testBundleEnginePutImpl(final String jobAction) throws Exception { - final BundleJobBean bundleJobBean = xDataTestCase.addRecordToBundleJobTable(Job.Status.PREP, false); + final BundleJobBean bundleJobBean = addRecordToBundleJobTable(Job.Status.PREP, false); runTest("/v1/job/*", V1JobServlet.class, IS_SECURITY_ENABLED, new Callable<Void>() { @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/1e0bf4c4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 501713e..fe9f45a 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.2.0 release (trunk - unreleased) +OOZIE-3399 [tests] Eliminate nested class in TestV1JobsServletBundleEngine and TestV1JobServletBundleEngine (asalamon74 via andras.piros) OOZIE-3379 [client] Auth token cache file name should include OOZIE_URL (zuston via andras.piros) OOZIE-3397 Improve logging in NotificationXCommand (kmarton) OOZIE-3382 [SSH action] [SSH action] Optimize process streams draining (asalamon74 via andras.piros)
