Repository: incubator-falcon Updated Branches: refs/heads/master df66fb02b -> b18ed3ed2
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java index ec05166..e1d6658 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java @@ -34,15 +34,12 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.lang.reflect.Method; /** * test cases for https://issues.apache.org/jira/browse/FALCON-353. @@ -68,8 +65,7 @@ public class EntityDryRunTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("setup " + method.getName()); + public void setup() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); bundles[0].generateUniqueBundle(); @@ -79,8 +75,7 @@ public class EntityDryRunTest extends BaseTestClass { } @AfterMethod(alwaysRun = true) - public void tearDown(Method method) { - LOGGER.info("tearDown " + method.getName()); + public void tearDown() { removeBundles(); } @@ -147,9 +142,4 @@ public class EntityDryRunTest extends BaseTestClass { + "AUTHENTICATION : E1004 : Expression language evaluation error, Unable to evaluate :" + "${coord:someEL(1)"), "Correct response was not present in process / feed schedule"); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java index a915d24..847b23d 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java @@ -26,14 +26,11 @@ import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Test delays in feed. @@ -55,8 +52,7 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster1); bundles[1] = new Bundle(bundle, cluster2); @@ -114,9 +110,4 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass { LOGGER.info("feedOutput01: " + Util.prettyPrintXml(feedOutput01)); prism.getFeedHelper().submitAndSchedule(feedOutput01); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java index 501ccb4..1f40e96 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java @@ -51,7 +51,6 @@ import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Minutes; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -59,7 +58,6 @@ import org.testng.annotations.Test; import javax.xml.bind.JAXBException; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.Date; import java.util.List; @@ -86,8 +84,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass { private static final Logger LOGGER = Logger.getLogger(NewPrismProcessUpdateTest.class); @BeforeMethod(alwaysRun = true) - public void testSetup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void testSetup() throws Exception { Bundle b = BundleUtil.readUpdateBundle(); bundles[0] = new Bundle(b, cluster1); bundles[0].generateUniqueBundle(); @@ -1666,9 +1663,4 @@ public class NewPrismProcessUpdateTest extends BaseTestClass { } return null; } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java index 9e802d3..1295909 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java @@ -33,14 +33,11 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.OozieClient; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.List; @@ -64,8 +61,7 @@ public class OptionalInputTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); bundles[0].generateUniqueBundle(); @@ -353,9 +349,4 @@ public class OptionalInputTest extends BaseTestClass { InstanceUtil.waitTillInstanceReachState(oozieClient, processName, 2, CoordinatorAction.Status.KILLED, EntityType.PROCESS); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java index 6f0743c..47e0087 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java @@ -26,16 +26,12 @@ import org.apache.falcon.regression.core.util.BundleUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; @@ -49,7 +45,6 @@ public class PrismClusterDeleteTest extends BaseTestClass { private ColoHelper cluster1 = servers.get(0); private ColoHelper cluster2 = servers.get(1); private String aggregateWorkflowDir = baseHDFSDir + "/PrismClusterDeleteTest/aggregator"; - private static final Logger LOGGER = Logger.getLogger(PrismClusterDeleteTest.class); @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -57,8 +52,7 @@ public class PrismClusterDeleteTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { restartRequired = false; Bundle bundle = BundleUtil.readLateDataBundle(); bundles[0] = new Bundle(bundle, cluster1); @@ -435,9 +429,4 @@ public class PrismClusterDeleteTest extends BaseTestClass { Assert.assertTrue(Arrays.deepEquals(store2.toArray(new String[store2.size()]), store1.toArray(new String[store1.size()])), "DataStores are not equal!"); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java index fe3a425..69d38ad 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java @@ -32,14 +32,11 @@ import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** @@ -62,8 +59,7 @@ public class PrismConcurrentRequestTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0].generateUniqueBundle(); bundles[0] = new Bundle(bundles[0], cluster); @@ -271,9 +267,4 @@ public class PrismConcurrentRequestTest extends BaseTestClass { AssertUtil.assertSucceeded(brother.getOutput()); } } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java index b3924db..d65d98e 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java @@ -35,14 +35,11 @@ import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -68,8 +65,7 @@ public class PrismFeedDeleteTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { restartRequired = false; Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster1); @@ -1105,9 +1101,4 @@ public class PrismFeedDeleteTest extends BaseTestClass { return temp; } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java index 2f83483..dd5579f 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java @@ -35,14 +35,11 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; import org.apache.oozie.client.WorkflowJob; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.List; /** @@ -68,8 +65,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readELBundle(); for (int i = 0; i < 3; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -644,9 +640,4 @@ public class PrismFeedLateReplicationTest extends BaseTestClass { 0) == 1, "id have to be equal 1"); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java index 315a9d1..eca9efc 100755 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java @@ -39,14 +39,12 @@ import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -174,8 +172,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void testName(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readFeedReplicationBundle(); for (int i = 0; i < 3; i++) { @@ -947,9 +944,4 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass { AssertUtil.assertFailed(r, "is defined more than once for feed"); Assert.assertTrue(r.getMessage().contains("is defined more than once for feed")); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java index 0bd4c31..6298619 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java @@ -37,14 +37,12 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction.Status; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.IOException; -import java.lang.reflect.Method; /** * Update replication feed tests. @@ -75,8 +73,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readELBundle(); for (int i = 0; i < 3; i++) { @@ -314,9 +311,4 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass { LOGGER.info("updated feed: " + Util.prettyPrintXml(feed01)); AssertUtil.assertSucceeded(prism.getFeedHelper().update(feed01, feed01)); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java index 79b12f1..42cf4f3 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java @@ -26,18 +26,14 @@ import org.apache.falcon.regression.core.util.BundleUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Resume feed via prism tests. @@ -51,7 +47,6 @@ public class PrismFeedResumeTest extends BaseTestClass { private OozieClient cluster2OC = serverOC.get(1); private boolean restartRequired; private String aggregateWorkflowDir = baseHDFSDir + "/PrismFeedResumeTest/aggregator"; - private static final Logger LOGGER = Logger.getLogger(PrismFeedResumeTest.class); @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -59,8 +54,7 @@ public class PrismFeedResumeTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void testName(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { @@ -317,9 +311,4 @@ public class PrismFeedResumeTest extends BaseTestClass { coloHelper.getFeedHelper().getColoName() + "/" + Util.parseResponse(coloHelper.getFeedHelper().getStatus(entity)).getMessage()); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java index 69e8918..0154591 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java @@ -28,14 +28,12 @@ import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.IOException; -import java.lang.reflect.Method; /** * Schedule feed via prism tests. @@ -54,8 +52,7 @@ public class PrismFeedScheduleTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws IOException { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws IOException { Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { @@ -91,9 +88,4 @@ public class PrismFeedScheduleTest extends BaseTestClass { AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED); AssertUtil.checkNotStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java index 3c48fc4..d4bcfeb 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java @@ -35,14 +35,11 @@ import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Submit and schedule feed via prism tests. @@ -64,8 +61,7 @@ public class PrismFeedSnSTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { restartRequired = false; Bundle bundle = BundleUtil.readELBundle(); for (int i = 0; i < 2; i++) { @@ -448,9 +444,4 @@ public class PrismFeedSnSTest extends BaseTestClass { AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED); AssertUtil.checkNotStatus(cluster1OC, EntityType.FEED, bundles[1], Job.Status.RUNNING); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java index 9c3b1c0..ae0cff3 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java @@ -26,18 +26,14 @@ import org.apache.falcon.regression.core.util.BundleUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.TestNGException; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Suspend feed via prism tests. @@ -49,7 +45,6 @@ public class PrismFeedSuspendTest extends BaseTestClass { private OozieClient cluster1OC = serverOC.get(0); private OozieClient cluster2OC = serverOC.get(1); private String aggregateWorkflowDir = baseHDFSDir + "/PrismFeedSuspendTest/aggregator"; - private static final Logger LOGGER = Logger.getLogger(PrismFeedSuspendTest.class); @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -57,8 +52,7 @@ public class PrismFeedSuspendTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readELBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -315,9 +309,4 @@ public class PrismFeedSuspendTest extends BaseTestClass { Util.restartService(cluster1.getProcessHelper()); } } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java index 9f31e84..49795bc 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java @@ -40,14 +40,11 @@ import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -78,8 +75,7 @@ public class PrismFeedUpdateTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readELBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -272,9 +268,4 @@ public class PrismFeedUpdateTest extends BaseTestClass { Assert.assertEquals(OozieUtil.getNumberOfBundle(cluster1OC, EntityType.PROCESS, bundles[0].getProcessName()), 2); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java index 421be1e..f11f2e0 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java @@ -30,14 +30,11 @@ import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.TestNGException; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -61,8 +58,7 @@ public class PrismProcessDeleteTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -966,9 +962,4 @@ public class PrismProcessDeleteTest extends BaseTestClass { return temp; } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java index c3d8c00..ecbedab 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java @@ -26,18 +26,14 @@ import org.apache.falcon.regression.core.util.BundleUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.TestNGException; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Resume process via prism tests. @@ -50,7 +46,6 @@ public class PrismProcessResumeTest extends BaseTestClass { private OozieClient cluster1OC = serverOC.get(0); private OozieClient cluster2OC = serverOC.get(1); private String aggregateWorkflowDir = baseHDFSDir + "/PrismProcessResumeTest/aggregator"; - private static final Logger LOGGER = Logger.getLogger(PrismProcessResumeTest.class); @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -58,8 +53,7 @@ public class PrismProcessResumeTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -451,9 +445,4 @@ public class PrismProcessResumeTest extends BaseTestClass { } } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java index e00b4db..c3dcf6e 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java @@ -31,19 +31,15 @@ import org.apache.falcon.regression.core.util.OozieUtil; import org.apache.falcon.regression.core.util.TimeUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.TestNGException; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; /** @@ -57,7 +53,6 @@ public class PrismProcessScheduleTest extends BaseTestClass { private OozieClient cluster2OC = serverOC.get(1); private String aggregateWorkflowDir = baseHDFSDir + "/PrismProcessScheduleTest/aggregator"; private String workflowForNoIpOp = baseHDFSDir + "/PrismProcessScheduleTest/noinop"; - private static final Logger LOGGER = Logger.getLogger(PrismProcessScheduleTest.class); private String process1; private String process2; @@ -68,8 +63,7 @@ public class PrismProcessScheduleTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -391,10 +385,4 @@ public class PrismProcessScheduleTest extends BaseTestClass { InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(processObj.toString()), 2, CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS, 10); } - - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java index 6dd6341..b802d0a 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java @@ -32,14 +32,11 @@ import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Submit and schedule process via prism tests. @@ -61,8 +58,7 @@ public class PrismProcessSnSTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { bundles[i] = new Bundle(bundle, servers.get(i)); @@ -237,9 +233,4 @@ public class PrismProcessSnSTest extends BaseTestClass { Assert.assertEquals(cluster1.getProcessHelper() .submitAndSchedule(process2).getCode(), 404); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java index 43635bf..7c927b0 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java @@ -26,18 +26,14 @@ import org.apache.falcon.regression.core.util.BundleUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; -import org.apache.log4j.Logger; import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Suspend process tests. @@ -50,7 +46,6 @@ public class PrismProcessSuspendTest extends BaseTestClass { private OozieClient cluster2OC = serverOC.get(1); private boolean restartRequired; private String aggregateWorkflowDir = baseHDFSDir + "/PrismProcessSuspendTest/aggregator"; - private static final Logger LOGGER = Logger.getLogger(PrismProcessSuspendTest.class); @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -58,8 +53,7 @@ public class PrismProcessSuspendTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { restartRequired = false; Bundle bundle = BundleUtil.readLateDataBundle(); for (int i = 0; i < 2; i++) { @@ -276,9 +270,4 @@ public class PrismProcessSuspendTest extends BaseTestClass { AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData())); AssertUtil.assertFailed(cluster2.getProcessHelper().suspend(bundles[1].getProcessData())); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java index f176da7..9cd3a34 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java @@ -29,14 +29,11 @@ import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.net.ConnectException; import java.util.List; @@ -60,8 +57,7 @@ public class PrismSubmitTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { restartRequired = false; bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster1); @@ -573,9 +569,4 @@ public class PrismSubmitTest extends BaseTestClass { Util.getProcessName(bundles[0].getProcessData()), 1); AssertUtil.compareDataStoreStates(beforeSubmitCluster2, afterSubmitCluster2, 0); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java index 48459ff..9585b41 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java @@ -35,15 +35,12 @@ import org.apache.oozie.client.OozieClient; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.log4j.Logger; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -66,8 +63,7 @@ public class ProcessPartitionExpVariableTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); bundles[0].generateUniqueBundle(); @@ -148,10 +144,4 @@ public class ProcessPartitionExpVariableTest extends BaseTestClass { } return dates; } - - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java index 32c9783..1ad24c2 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java @@ -29,14 +29,11 @@ import org.apache.falcon.regression.core.util.TimeUtil; import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -57,8 +54,7 @@ public class RescheduleKilledProcessTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); bundles[0].generateUniqueBundle(); @@ -127,9 +123,4 @@ public class RescheduleKilledProcessTest extends BaseTestClass { AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(processData)); AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(processData)); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java index 321fca1..541840a 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java @@ -35,7 +35,6 @@ import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.log4j.Logger; import org.apache.oozie.client.Job.Status; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -43,7 +42,6 @@ import org.testng.annotations.Test; import javax.xml.bind.JAXBException; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.List; @@ -85,8 +83,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { @BeforeMethod(alwaysRun = true) - public void setUp(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setUp() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); bundles[0].generateUniqueBundle(); @@ -208,9 +205,4 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { Assert.assertTrue(r.getMessage().contains("(process) not found")); AssertUtil.assertFailed(r); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java index 8cae1e2..ac4aac8 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java @@ -44,7 +44,6 @@ import org.apache.oozie.client.OozieClientException; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -53,7 +52,6 @@ import org.testng.annotations.Test; import javax.jms.JMSException; import javax.jms.MapMessage; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; @@ -75,8 +73,7 @@ public class RetentionTest extends BaseTestClass { private static final int[] GAPS = new int[]{2, 4, 5, 1}; @BeforeMethod(alwaysRun = true) - public void testName(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readRetentionBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].setInputFeedDataPath(testHDFSDir); @@ -282,7 +279,7 @@ public class RetentionTest extends BaseTestClass { * Provides different sets of parameters for retention workflow. */ @DataProvider(name = "betterDP") - public Object[][] getTestData(Method m) { + public Object[][] getTestData() { // a negative value like -4 should be covered in validation scenarios. Integer[] retentionPeriods = new Integer[]{0, 10080, 60, 8, 24}; RetentionUnit[] retentionUnits = new RetentionUnit[]{ @@ -295,9 +292,4 @@ public class RetentionTest extends BaseTestClass { return MatrixUtil.crossProduct(retentionPeriods, retentionUnits, gaps, freqTypes, withData); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java index a72d1cc..6a78bbb 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java @@ -45,7 +45,6 @@ import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; import org.joda.time.DateTime; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -55,7 +54,6 @@ import org.apache.log4j.Logger; import javax.xml.bind.JAXBException; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.List; @@ -80,8 +78,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws IOException { - LOGGER.info("test name: " + method.getName()); + public void setup() throws IOException { Bundle bundle = BundleUtil.readFeedReplicationBundle(); bundles[0] = new Bundle(bundle, cluster1); bundles[1] = new Bundle(bundle, cluster2); @@ -99,7 +96,6 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); removeBundles(processBundle); } @@ -637,17 +633,4 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { testDataDir + "/", dataDates); return feed; } - - @AfterMethod(alwaysRun = true) - public void tearDown(Method method) { - LOGGER.info("tearDown " + method.getName()); - processBundle.deleteBundle(prism); - bundles[0].deleteBundle(prism); - processBundle.deleteBundle(prism); - } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/AclValidationTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/AclValidationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/AclValidationTest.java index 0a638e4..71259cc 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/AclValidationTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/AclValidationTest.java @@ -32,23 +32,18 @@ import org.apache.falcon.regression.core.util.HadoopUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Tests if ACL info is consistent with user submitting the entity. */ @Test(groups = "authorization") public class AclValidationTest extends BaseTestClass { - private static final Logger LOGGER = Logger.getLogger(AclValidationTest.class); private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); @@ -66,8 +61,7 @@ public class AclValidationTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].generateUniqueBundle(); @@ -138,9 +132,4 @@ public class AclValidationTest extends BaseTestClass { public void tearDown() { removeBundles(); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java index 00d5b7d..7c56788 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java @@ -30,23 +30,18 @@ import org.apache.falcon.regression.core.util.MatrixUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Tests ACL of cluster with different operations. */ @Test(groups = "authorization") public class ClusterAclTest extends BaseTestClass { - private static final Logger LOGGER = Logger.getLogger(ClusterAclTest.class); private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); @@ -62,8 +57,7 @@ public class ClusterAclTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].generateUniqueBundle(); @@ -149,9 +143,4 @@ public class ClusterAclTest extends BaseTestClass { public void tearDown() { removeBundles(); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java index 1b5750a..6ea2be3 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java @@ -28,22 +28,17 @@ import org.apache.falcon.regression.core.util.HadoopUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Tests falcon client's working in presence of ACL errors. */ @Test(groups = "authorization") public class FalconClientTest extends BaseTestClass { - private static final Logger LOGGER = Logger.getLogger(AclValidationTest.class); private final ColoHelper cluster = servers.get(0); private final FileSystem clusterFS = serverFS.get(0); @@ -57,8 +52,7 @@ public class FalconClientTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].generateUniqueBundle(); @@ -97,9 +91,4 @@ public class FalconClientTest extends BaseTestClass { public void tearDown() { removeBundles(); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java index 9b49957..3d052a4 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java @@ -31,24 +31,19 @@ import org.apache.falcon.regression.core.util.MatrixUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; /** * Tests ACL of feed with different operations. */ @Test(groups = "authorization") public class FeedAclTest extends BaseTestClass { - private static final Logger LOGGER = Logger.getLogger(FeedAclTest.class); private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); @@ -64,8 +59,7 @@ public class FeedAclTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].generateUniqueBundle(); @@ -254,9 +248,4 @@ public class FeedAclTest extends BaseTestClass { public void tearDown() { removeBundles(); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java index ec6eb4f..12270d0 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java @@ -31,19 +31,15 @@ import org.apache.falcon.regression.core.util.MatrixUtil; import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; import java.util.Date; /** @@ -51,7 +47,6 @@ import java.util.Date; */ @Test(groups = "authorization") public class ProcessAclTest extends BaseTestClass { - private static final Logger LOGGER = Logger.getLogger(ProcessAclTest.class); private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); @@ -67,8 +62,7 @@ public class ProcessAclTest extends BaseTestClass { } @BeforeMethod(alwaysRun = true) - public void setup(Method method) throws Exception { - LOGGER.info("test name: " + method.getName()); + public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].generateUniqueBundle(); @@ -263,9 +257,4 @@ public class ProcessAclTest extends BaseTestClass { public void tearDown() { removeBundles(); } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } } http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java index cd32ea4..22568f8 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java @@ -128,7 +128,6 @@ public class LineageGraphTest extends BaseUITestClass { public void tearDown() throws IOException { closeBrowser(); removeBundles(); - cleanTestDirs(); } /** http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java index d62d82e..42bfe49 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java @@ -46,7 +46,6 @@ import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.OozieClient; import org.apache.oozie.client.OozieClientException; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -55,7 +54,6 @@ import org.testng.asserts.SoftAssert; import javax.xml.bind.JAXBException; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.Date; import java.util.List; @@ -161,7 +159,7 @@ public class ProcessUITest extends BaseUITestClass { @AfterMethod(alwaysRun = true) - public void tearDown(Method method) throws IOException { + public void tearDown() throws IOException { closeBrowser(); removeBundles(); } @@ -227,9 +225,4 @@ public class ProcessUITest extends BaseUITestClass { } } } - - @AfterClass(alwaysRun = true) - public void tearDownClass() throws IOException { - cleanTestDirs(); - } }
