You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/12/26 15:44:50 UTC
[1/2] incubator-falcon git commit: FALCON-942 Cleanup BaseTestClass
and setUp/tearDown methods. Contributed by Ruslan Ostafiychuk
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();
- }
}
[2/2] incubator-falcon git commit: FALCON-942 Cleanup BaseTestClass
and setUp/tearDown methods. Contributed by Ruslan Ostafiychuk
Posted by ro...@apache.org.
FALCON-942 Cleanup BaseTestClass and setUp/tearDown methods. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/b18ed3ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/b18ed3ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/b18ed3ed
Branch: refs/heads/master
Commit: b18ed3ed229fec897ddcc6702f05184f248ae931
Parents: df66fb0
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Dec 26 16:41:34 2014 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Fri Dec 26 16:41:34 2014 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
falcon-regression/README.md | 4 ++++
.../core/enumsAndConstants/MerlinConstants.java | 4 ++--
.../regression/core/util/InstanceUtil.java | 3 ---
.../regression/core/util/KerberosHelper.java | 3 ---
.../regression/testHelper/BaseTestClass.java | 14 ++++++++------
.../falcon/regression/AuthorizationTest.java | 10 +---------
.../regression/ELExpFutureAndLatestTest.java | 11 +----------
.../falcon/regression/ELValidationsTest.java | 15 +--------------
.../falcon/regression/EmbeddedPigScriptTest.java | 11 +----------
.../apache/falcon/regression/ExternalFSTest.java | 5 +----
.../falcon/regression/FeedClusterUpdateTest.java | 12 +-----------
.../regression/FeedInstanceStatusTest.java | 11 +----------
.../falcon/regression/FeedLateRerunTest.java | 4 +---
.../falcon/regression/FeedReplicationTest.java | 10 +---------
.../apache/falcon/regression/FeedResumeTest.java | 13 +------------
.../falcon/regression/FeedScheduleTest.java | 13 +------------
.../apache/falcon/regression/FeedStatusTest.java | 11 +----------
.../regression/FeedSubmitAndScheduleTest.java | 12 +-----------
.../apache/falcon/regression/FeedSubmitTest.java | 13 +------------
.../falcon/regression/FeedSuspendTest.java | 13 +------------
.../falcon/regression/InstanceParamTest.java | 13 ++-----------
.../falcon/regression/InstanceSummaryTest.java | 15 ++-------------
.../apache/falcon/regression/NewRetryTest.java | 11 +----------
.../falcon/regression/NoOutputProcessTest.java | 11 +----------
.../falcon/regression/ProcessFrequencyTest.java | 11 +----------
.../regression/ProcessInstanceColoMixedTest.java | 14 ++------------
.../regression/ProcessInstanceKillsTest.java | 14 ++------------
.../regression/ProcessInstanceRerunTest.java | 14 ++------------
.../regression/ProcessInstanceResumeTest.java | 14 ++------------
.../regression/ProcessInstanceRunningTest.java | 11 +----------
.../regression/ProcessInstanceStatusTest.java | 12 ++----------
.../regression/ProcessInstanceSuspendTest.java | 11 +----------
.../falcon/regression/ProcessLateRerunTest.java | 4 +---
.../falcon/regression/ProcessLibPathTest.java | 11 +----------
.../regression/entity/ListEntitiesTest.java | 1 -
.../regression/hcat/HCatFeedOperationsTest.java | 7 +------
.../falcon/regression/hcat/HCatProcessTest.java | 7 -------
.../regression/hcat/HCatReplicationTest.java | 6 ------
.../regression/hcat/HCatRetentionTest.java | 9 +--------
.../regression/lineage/EntitySummaryTest.java | 2 +-
.../lineage/LineageApiProcessInstanceTest.java | 10 +---------
.../regression/lineage/LineageApiTest.java | 7 -------
.../lineage/ListFeedInstancesTest.java | 1 -
.../lineage/ListProcessInstancesTest.java | 6 ------
.../regression/lineage/ProcessPipelineTest.java | 6 ------
.../regression/prism/EntityDryRunTest.java | 14 ++------------
.../prism/FeedDelayParallelTimeoutTest.java | 11 +----------
.../prism/NewPrismProcessUpdateTest.java | 10 +---------
.../regression/prism/OptionalInputTest.java | 11 +----------
.../regression/prism/PrismClusterDeleteTest.java | 13 +------------
.../prism/PrismConcurrentRequestTest.java | 11 +----------
.../regression/prism/PrismFeedDeleteTest.java | 11 +----------
.../prism/PrismFeedLateReplicationTest.java | 11 +----------
.../PrismFeedReplicationPartitionExpTest.java | 10 +---------
.../prism/PrismFeedReplicationUpdateTest.java | 10 +---------
.../regression/prism/PrismFeedResumeTest.java | 13 +------------
.../regression/prism/PrismFeedScheduleTest.java | 10 +---------
.../regression/prism/PrismFeedSnSTest.java | 11 +----------
.../regression/prism/PrismFeedSuspendTest.java | 13 +------------
.../regression/prism/PrismFeedUpdateTest.java | 11 +----------
.../regression/prism/PrismProcessDeleteTest.java | 11 +----------
.../regression/prism/PrismProcessResumeTest.java | 13 +------------
.../prism/PrismProcessScheduleTest.java | 14 +-------------
.../regression/prism/PrismProcessSnSTest.java | 11 +----------
.../prism/PrismProcessSuspendTest.java | 13 +------------
.../falcon/regression/prism/PrismSubmitTest.java | 11 +----------
.../prism/ProcessPartitionExpVariableTest.java | 12 +-----------
.../prism/RescheduleKilledProcessTest.java | 11 +----------
.../RescheduleProcessInFinalStatesTest.java | 10 +---------
.../falcon/regression/prism/RetentionTest.java | 12 ++----------
.../prism/UpdateAtSpecificTimeTest.java | 19 +------------------
.../regression/security/AclValidationTest.java | 13 +------------
.../regression/security/ClusterAclTest.java | 13 +------------
.../regression/security/FalconClientTest.java | 13 +------------
.../falcon/regression/security/FeedAclTest.java | 13 +------------
.../regression/security/ProcessAclTest.java | 13 +------------
.../falcon/regression/ui/LineageGraphTest.java | 1 -
.../falcon/regression/ui/ProcessUITest.java | 9 +--------
79 files changed, 90 insertions(+), 714 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 91a1b6c..faa835f 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -36,6 +36,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-942 Cleanup BaseTestClass and setUp/tearDown methods (Ruslan Ostafiychuk)
+
FALCON-962 Fortify ListFeedInstancesTest (Paul Isaychuk via Ruslan Ostafiychuk)
FALCON-963 Add option to exclude tests in falcon-regression (Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/README.md
----------------------------------------------------------------------
diff --git a/falcon-regression/README.md b/falcon-regression/README.md
index 33fd7cf..5e1743c 100644
--- a/falcon-regression/README.md
+++ b/falcon-regression/README.md
@@ -81,6 +81,10 @@ For each cluster specify properties:
cluster1.service_stop_cmd = /usr/lib/falcon/bin/falcon-stop
cluster1.service_start_cmd = /usr/lib/falcon/bin/falcon-start
+To not clean root tests dir before every test:
+
+ clean_tests_dir=false
+
Setting up HDFS Dirs
--------------------
On all cluster as user that started falcon server do:
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
index 76ebb29..1c517b4 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
@@ -79,8 +79,8 @@ public final class MerlinConstants {
public static final String WASB_SECRET = Config.getProperty("wasb.secret", "");
public static final String WASB_ACCOUNT = Config.getProperty("wasb.account", "");
- public static final boolean CLEAN_TEST_DIR =
- Boolean.valueOf(Config.getProperty("clean_test_dir", "true"));
+ public static final boolean CLEAN_TESTS_DIR =
+ Boolean.valueOf(Config.getProperty("clean_tests_dir", "true"));
/* initialize keyTabMap */
static {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
index ce9e15b..25b6c51 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
@@ -40,9 +40,6 @@ import org.apache.falcon.resource.APIResult;
import org.apache.falcon.resource.InstancesResult;
import org.apache.falcon.resource.InstancesSummaryResult;
import org.apache.falcon.request.BaseRequest;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.http.HttpResponse;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
index dc3dfae..9d028fa 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
@@ -20,7 +20,6 @@ package org.apache.falcon.regression.core.util;
import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.log4j.Logger;
import java.io.IOException;
@@ -32,8 +31,6 @@ public final class KerberosHelper {
throw new AssertionError("Instantiating utility class...");
}
- private static final Logger LOGGER = Logger.getLogger(KerberosHelper.class);
-
public static UserGroupInformation getUGI(String user) throws IOException {
// if unsecure cluster create a remote user object
if (!MerlinConstants.IS_SECURE) {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
index 49bdf03..a282ee0 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
@@ -58,14 +58,16 @@ public class BaseTestClass {
servers = getServers();
serverFS = new ArrayList<FileSystem>();
serverOC = new ArrayList<OozieClient>();
- for (ColoHelper server : servers) {
- try {
+ try {
+ for (ColoHelper server : servers) {
serverFS.add(server.getClusterHelper().getHadoopFS());
serverOC.add(server.getClusterHelper().getOozieClient());
- } catch (IOException e) {
- throw new RuntimeException(e);
}
+ cleanTestsDirs();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
+
bundles = new Bundle[serverNames.length];
}
@@ -109,8 +111,8 @@ public class BaseTestClass {
}
}
- public void cleanTestDirs() throws IOException {
- if (MerlinConstants.CLEAN_TEST_DIR) {
+ public final void cleanTestsDirs() throws IOException {
+ if (MerlinConstants.CLEAN_TESTS_DIR) {
for (FileSystem fs : serverFS) {
HadoopUtil.deleteDirIfExists(baseHDFSDir, fs);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
index 2a33ac1..ad697fc 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
@@ -44,7 +44,6 @@ import org.apache.oozie.client.Job;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.OozieClientException;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -53,7 +52,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;
@@ -77,8 +75,7 @@ public class AuthorizationTest 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();
@@ -685,9 +682,4 @@ public class AuthorizationTest 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/ELExpFutureAndLatestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
index c031ab6..aea788a 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
@@ -32,14 +32,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;
/**
@@ -77,8 +74,7 @@ public class ELExpFutureAndLatestTest 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();
@@ -116,9 +112,4 @@ public class ELExpFutureAndLatestTest extends BaseTestClass {
InstanceUtil.waitTillInstanceReachState(clusterOC, bundles[0].getProcessName(), 3,
CoordinatorAction.Status.SUCCEEDED, 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/ELValidationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
index 8614a9c..1306dc3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
@@ -31,14 +31,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.BeforeMethod;
import org.testng.annotations.DataProvider;
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.text.DecimalFormat;
import java.text.ParseException;
@@ -62,11 +59,6 @@ public class ELValidationsTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ELValidationsTest.class);
private String aggregateWorkflowDir = baseHDFSDir + "/ELTest/aggregator";
- //test for instance when process time line is subset of feed time
- @BeforeMethod(alwaysRun = true)
- public void testName(Method method) {
- LOGGER.info("test name: " + method.getName());
- }
@Test(groups = {"0.1", "0.2"})
public void startInstBeforeFeedStartToday02() throws Exception {
@@ -96,7 +88,7 @@ public class ELValidationsTest extends BaseTestClass {
}
@DataProvider(name = "EL-DP")
- public Object[][] getELData(Method m) {
+ public Object[][] getELData() {
return new Object[][]{
{"now(-3,0)", "now(4,20)"},
{"yesterday(22,0)", "now(4,20)"},
@@ -288,9 +280,4 @@ public class ELValidationsTest extends BaseTestClass {
DecimalFormat df = new DecimalFormat(String.valueOf(zeros));
return df.format(num);
}
-
- @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/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index 1317ae4..bdd5c00 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -43,14 +43,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;
import java.util.List;
/**
@@ -89,8 +86,7 @@ public class EmbeddedPigScriptTest 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();
@@ -172,9 +168,4 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(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/ExternalFSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ExternalFSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ExternalFSTest.java
index d6d9854..bb63985 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ExternalFSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ExternalFSTest.java
@@ -57,7 +57,6 @@ import org.testng.annotations.Test;
import javax.xml.bind.JAXBException;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.List;
/**
@@ -94,8 +93,7 @@ public class ExternalFSTest extends BaseTestClass{
}
@BeforeMethod(alwaysRun = true)
- public void setUp(Method method) throws JAXBException, IOException {
- LOGGER.info("test name: " + method.getName());
+ public void setUp() throws JAXBException, IOException {
Bundle bundle = BundleUtil.readFeedReplicationBundle();
bundles[0] = new Bundle(bundle, cluster);
@@ -117,7 +115,6 @@ public class ExternalFSTest extends BaseTestClass{
@AfterClass(alwaysRun = true)
public void tearDownClass() throws IOException {
- cleanTestDirs();
wasbFS.delete(new Path(baseWasbDir), true);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
index 97048b8..a24a0ee 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
@@ -36,14 +36,11 @@ 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.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed cluster update tests.
@@ -87,9 +84,7 @@ public class FeedClusterUpdateTest 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));
@@ -915,9 +910,4 @@ public class FeedClusterUpdateTest 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/FeedInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
index dfd5d0b..5929117 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
@@ -33,14 +33,11 @@ import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.falcon.resource.InstancesResult;
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;
/**
@@ -65,8 +62,7 @@ public class FeedInstanceStatusTest 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.readELBundle();
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
@@ -235,9 +231,4 @@ public class FeedInstanceStatusTest extends BaseTestClass {
LOGGER.info(responseInstance.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/FeedLateRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
index d0a6dde..8de35d7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
@@ -38,7 +38,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;
@@ -65,8 +64,7 @@ public class FeedLateRerunTest extends BaseTestClass {
private String target = null;
@BeforeMethod(alwaysRun = true)
- public void setUp(Method method) throws JAXBException, IOException {
- LOGGER.info("test name: " + method.getName());
+ public void setUp() throws JAXBException, IOException {
Bundle bundle = BundleUtil.readFeedReplicationBundle();
bundles[0] = new Bundle(bundle, cluster1);
bundles[1] = new Bundle(bundle, cluster2);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index e99bebd..35842e4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -45,14 +45,12 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
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;
@@ -78,8 +76,7 @@ public class FeedReplicationTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(FeedReplicationTest.class);
@BeforeMethod(alwaysRun = true)
- public void setUp(Method method) throws JAXBException, IOException {
- LOGGER.info("test name: " + method.getName());
+ public void setUp() throws JAXBException, IOException {
Bundle bundle = BundleUtil.readFeedReplicationBundle();
bundles[0] = new Bundle(bundle, cluster1);
@@ -353,9 +350,4 @@ public class FeedReplicationTest extends BaseTestClass {
LOGGER.info("Data on target cluster: " + cluster2ReplicatedData);
AssertUtil.checkForListSizes(cluster1ReplicatedData, cluster2ReplicatedData);
}
-
- @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/FeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index 669c4fa..49e4b62 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -27,17 +27,13 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
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.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed resume tests.
@@ -49,11 +45,9 @@ public class FeedResumeTest extends BaseTestClass {
private String feed;
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
- private static final Logger LOGGER = Logger.getLogger(FeedResumeTest.class);
@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);
@@ -121,9 +115,4 @@ public class FeedResumeTest extends BaseTestClass {
Assert.assertTrue(response.getMessage().contains(colo + "/RUNNING"));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, 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/FeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
index 8500d84..c498807 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
@@ -25,16 +25,12 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
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.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed schedule tests.
@@ -45,11 +41,9 @@ public class FeedScheduleTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String feed;
- private static final Logger LOGGER = Logger.getLogger(FeedScheduleTest.class);
@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();
@@ -142,9 +136,4 @@ public class FeedScheduleTest extends BaseTestClass {
public void scheduleNonExistentFeed() throws Exception {
AssertUtil.assertFailed(prism.getFeedHelper().schedule(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/FeedStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
index 6278513..57a6164 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
@@ -31,13 +31,10 @@ 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.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed status tests. Checks getStatus functionality.
@@ -52,8 +49,7 @@ public class FeedStatusTest 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);
@@ -168,9 +164,4 @@ public class FeedStatusTest extends BaseTestClass {
response.getMessage().contains(Util.readEntityName(feed) + " (FEED) not found"));
}
-
- @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/FeedSubmitAndScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
index c020127..14f0517 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
@@ -29,17 +29,14 @@ import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.Util;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
-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.BeforeMethod;
import org.testng.annotations.Test;
import javax.xml.bind.JAXBException;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URISyntaxException;
/**
@@ -50,12 +47,10 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
- private static final Logger LOGGER = Logger.getLogger(FeedSubmitAndScheduleTest.class);
private String feed;
@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();
@@ -158,9 +153,4 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
}
-
- @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/FeedSubmitTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
index 8d96741..bcee706 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
@@ -25,14 +25,10 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
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.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed submission tests.
@@ -42,11 +38,9 @@ public class FeedSubmitTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private String feed;
- private static final Logger LOGGER = Logger.getLogger(FeedSubmitTest.class);
@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);
@@ -121,9 +115,4 @@ public class FeedSubmitTest extends BaseTestClass {
response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
}
-
- @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/FeedSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
index 9676a30..6b74b37 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
@@ -25,16 +25,12 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
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.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Feed suspend tests.
@@ -45,11 +41,9 @@ public class FeedSuspendTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String feed;
- private static final Logger LOGGER = Logger.getLogger(FeedSuspendTest.class);
@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);
@@ -144,9 +138,4 @@ public class FeedSuspendTest extends BaseTestClass {
response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertFailed(response);
}
-
- @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/InstanceParamTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
index 0833f06..a83a319 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
@@ -37,7 +37,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.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -45,7 +44,6 @@ import org.testng.annotations.Test;
import javax.xml.bind.JAXBException;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URISyntaxException;
/**
@@ -76,8 +74,7 @@ public class InstanceParamTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void setup(Method method) throws Exception {
- LOGGER.info("test name: " + method.getName());
+ public void setup() throws Exception {
processBundle = BundleUtil.readELBundle();
processBundle = new Bundle(processBundle, cluster1);
processBundle.generateUniqueBundle();
@@ -156,15 +153,9 @@ public class InstanceParamTest extends BaseTestClass {
@AfterMethod(alwaysRun = true)
public void tearDown() throws IOException {
- processBundle.deleteBundle(prism);
- removeBundles();
+ removeBundles(processBundle);
for (FileSystem fs : serverFS) {
HadoopUtil.deleteDirIfExists(Util.getPathPrefix(feedInputPath), fs);
}
}
-
- @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/InstanceSummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
index 287572b..23f93ac 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
@@ -34,10 +34,8 @@ import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.falcon.resource.InstancesSummaryResult;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.apache.log4j.Logger;
import org.apache.oozie.client.CoordinatorAction.Status;
import org.apache.oozie.client.OozieClientException;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -45,7 +43,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.text.ParseException;
import java.util.List;
@@ -67,7 +64,6 @@ public class InstanceSummaryTest extends BaseTestClass {
private String endTime;
private ColoHelper cluster3 = servers.get(2);
private Bundle processBundle;
- private static final Logger LOGGER = Logger.getLogger(InstanceSummaryTest.class);
private String processName;
@BeforeClass(alwaysRun = true)
@@ -85,8 +81,7 @@ public class InstanceSummaryTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void setup(Method method) throws Exception {
- LOGGER.info("test name: " + method.getName());
+ public void setup() throws Exception {
processBundle = BundleUtil.readELBundle();
processBundle = new Bundle(processBundle, cluster3);
processBundle.generateUniqueBundle();
@@ -268,12 +263,6 @@ public class InstanceSummaryTest extends BaseTestClass {
@AfterMethod(alwaysRun = true)
public void tearDown() throws IOException {
- processBundle.deleteBundle(prism);
- removeBundles();
- }
-
- @AfterClass(alwaysRun = true)
- public void tearDownClass() throws IOException {
- cleanTestDirs();
+ removeBundles(processBundle);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
index ed6523d..b5aa514 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
@@ -49,15 +49,12 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
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.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -89,7 +86,7 @@ public class NewRetryTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void setUp(Method method) throws Exception {
+ public void setUp() throws Exception {
bundles[0] = new Bundle(BundleUtil.readRetryBundle(), cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
@@ -108,7 +105,6 @@ public class NewRetryTest extends BaseTestClass {
@AfterMethod(alwaysRun = true)
public void tearDown() {
-
removeBundles();
}
@@ -1182,10 +1178,5 @@ public class NewRetryTest extends BaseTestClass {
return new Frequency(retry.getDelay().getTimeUnit() + "(" + delay + ")");
}
-
- @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/NoOutputProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
index 7a4fee4..9f23f06 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
@@ -36,14 +36,11 @@ 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.List;
@@ -78,8 +75,7 @@ public class NoOutputProcessTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void testName(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);
@@ -147,9 +143,4 @@ public class NoOutputProcessTest extends BaseTestClass {
Assert.assertEquals(consumerProcessMsg.getReceivedMessages().size(), 3,
" Message for all the 3 instance not found");
}
-
- @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/ProcessFrequencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
index 79c89df..3ce68c4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
@@ -37,15 +37,12 @@ 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.DataProvider;
import org.testng.annotations.Test;
-import java.io.IOException;
-import java.lang.reflect.Method;
/**
* Test process with different frequency combinations.
@@ -68,8 +65,7 @@ public class ProcessFrequencyTest 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();
@@ -81,11 +77,6 @@ public class ProcessFrequencyTest extends BaseTestClass {
removeBundles();
}
- @AfterClass(alwaysRun = true)
- public void tearDownClass() throws IOException {
- cleanTestDirs();
- }
-
/**
* Test Process submission with different frequency. Expecting process workflow to run
* successfully.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
index 85d7134..21dc8de 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
@@ -38,14 +38,11 @@ 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;
import java.util.List;
/**
@@ -71,8 +68,7 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void setup(Method method) throws Exception {
- LOGGER.info("test name: " + method.getName());
+ public void setup() throws Exception {
//get 3 unique bundles
bundles[0] = BundleUtil.readELBundle();
@@ -97,8 +93,7 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
}
@AfterMethod(alwaysRun = true)
- public void tearDown(Method method) {
- LOGGER.info("tearDown " + method.getName());
+ public void tearDown() {
removeBundles();
}
@@ -251,10 +246,5 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
AssertUtil.assertSucceeded(responseInstance);
Assert.assertTrue(responseInstance.getInstances() != 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/ProcessInstanceKillsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
index 88c52d9..1382cbd 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
@@ -38,14 +38,11 @@ import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.client.CoordinatorJob;
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.Arrays;
import java.util.List;
@@ -77,8 +74,7 @@ public class ProcessInstanceKillsTest 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();
@@ -91,8 +87,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
}
@AfterMethod(alwaysRun = true)
- public void tearDown(Method method) {
- LOGGER.info("tearDown " + method.getName());
+ public void tearDown() {
removeBundles();
}
@@ -313,9 +308,4 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
"?start=2010-01-02T01:00Z&end=2010-01-02T01:04Z");
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.SUCCEEDED);
}
-
- @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/ProcessInstanceRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
index 74ff0b9..c9bf4a9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
@@ -37,14 +37,11 @@ import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowJob.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;
import java.util.List;
/**
@@ -76,8 +73,7 @@ public class ProcessInstanceRerunTest 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();
@@ -89,8 +85,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
}
@AfterMethod(alwaysRun = true)
- public void tearDown(Method method) {
- LOGGER.info("tearDown " + method.getName());
+ public void tearDown() {
removeBundles();
}
@@ -286,9 +281,4 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
Assert.assertEquals(s, CoordinatorAction.Status.WAITING,
"instance should have been in WAITING state");
}
-
- @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/ProcessInstanceResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
index 0fdd419..f42ef1c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
@@ -35,14 +35,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;
/**
* Process instance resume tests.
@@ -71,8 +68,7 @@ public class ProcessInstanceResumeTest 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();
@@ -87,8 +83,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
}
@AfterMethod(alwaysRun = true)
- public void tearDown(Method method) {
- LOGGER.info("tearDown " + method.getName());
+ public void tearDown() {
removeBundles();
}
@@ -267,9 +262,4 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
r = prism.getProcessHelper().getProcessInstanceStatus(processName, wholeRange);
InstanceUtil.validateResponse(r, 6, 6, 0, 0, 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/ProcessInstanceRunningTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
index f3bb4a3..3155930 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
@@ -39,14 +39,11 @@ 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.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;
/**
* Regression for instance running api.
@@ -76,8 +73,7 @@ public class ProcessInstanceRunningTest 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();
@@ -192,9 +188,4 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(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/ProcessInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
index 4bdda8a..24079ea 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
@@ -43,7 +43,6 @@ import org.apache.oozie.client.Job;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.OozieClientException;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -51,7 +50,6 @@ import org.testng.annotations.Test;
import javax.xml.bind.JAXBException;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URISyntaxException;
/**
@@ -89,8 +87,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
* Configures general process definition which particular properties can be overwritten.
*/
@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();
@@ -176,7 +173,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0);
OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0);
- InstanceUtil.waitTillInstanceReachState(serverOC.get(0), processName, 5 ,
+ InstanceUtil.waitTillInstanceReachState(serverOC.get(0), processName, 5,
CoordinatorAction.Status.RUNNING, EntityType.PROCESS);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, null);
InstanceUtil.validateResponse(r, 6, 5, 0, 1, 0);
@@ -383,9 +380,4 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
"?start=2010-01-02T01:00Z&end=2010-01-02T01:11Z");
InstanceUtil.validateFailedInstances(r, 3);
}
-
- @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/ProcessInstanceSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
index 2d028ac..89ff0f3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
@@ -36,14 +36,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;
/**
* Process instance suspend tests.
@@ -71,8 +68,7 @@ public class ProcessInstanceSuspendTest 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();
@@ -256,9 +252,4 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
"?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(result, 5, 4, 1, 0, 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/ProcessLateRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
index 6804b8d..20129cb 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
@@ -36,7 +36,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.lang.reflect.Method;
import java.util.*;
/**
@@ -56,8 +55,7 @@ public class ProcessLateRerunTest 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 < 1; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
index f335f04..2dd9241 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
@@ -33,14 +33,11 @@ import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job.Status;
-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;
/**
@@ -73,8 +70,7 @@ public class ProcessLibPathTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true)
- public void testName(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();
@@ -130,9 +126,4 @@ public class ProcessLibPathTest extends BaseTestClass {
OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0);
InstanceUtil.waitForBundleToReachState(cluster, processName, Status.SUCCEEDED);
}
-
- @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/entity/ListEntitiesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
index 3ab375d..9bfbe25 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
@@ -112,7 +112,6 @@ public class ListEntitiesTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void tearDown() throws IOException {
- cleanTestDirs();
CleanupUtil.cleanAllEntities(prism);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
index b24abe3..04bcdce 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
@@ -39,7 +39,6 @@ import org.apache.hive.hcatalog.api.HCatClient;
import org.apache.hive.hcatalog.api.HCatCreateTableDesc;
import org.apache.hive.hcatalog.common.HCatException;
import org.apache.hive.hcatalog.data.schema.HCatFieldSchema;
-import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
import org.apache.oozie.client.OozieClient;
import org.testng.Assert;
@@ -50,7 +49,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -72,7 +70,6 @@ public class HCatFeedOperationsTest extends BaseTestClass {
private String randomTblName = "randomTable_HcatFeedOperationsTest";
private String feed;
private String aggregateWorkflowDir = baseHDFSDir + "/HCatFeedOperationsTest/aggregator";
- private static final Logger LOGGER = Logger.getLogger(HCatFeedOperationsTest.class);
public void uploadWorkflow() throws Exception {
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
@@ -95,8 +92,7 @@ public class HCatFeedOperationsTest 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.readHCatBundle();
bundles[0] = new Bundle(bundle, cluster.getPrefix());
bundles[0].generateUniqueBundle();
@@ -118,7 +114,6 @@ public class HCatFeedOperationsTest extends BaseTestClass {
clusterHC.dropTable(dbName, tableName, true);
clusterHC.dropTable(dbName, randomTblName, true);
cluster2HC.dropTable(dbName, tableName, true);
- cleanTestDirs();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
index fbf856e..2c33337 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
@@ -51,13 +51,11 @@ import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -641,9 +639,4 @@ public class HCatProcessTest 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/hcat/HCatReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
index 76c9078..bf01a4a 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
@@ -48,7 +48,6 @@ import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.client.OozieClient;
import org.joda.time.format.DateTimeFormat;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -357,9 +356,4 @@ public class HCatReplicationTest 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/hcat/HCatRetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
index c3699e2..bfae1c6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
@@ -45,7 +45,6 @@ import org.apache.oozie.client.OozieClient;
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.Test;
@@ -53,7 +52,6 @@ import org.testng.annotations.DataProvider;
import org.apache.log4j.Logger;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -270,7 +268,7 @@ public class HCatRetentionTest extends BaseTestClass {
}
@DataProvider(name = "loopBelow")
- public Object[][] getTestData(Method m) {
+ public Object[][] getTestData() {
RetentionUnit[] retentionUnits = new RetentionUnit[]{
RetentionUnit.HOURS,
RetentionUnit.DAYS,
@@ -286,9 +284,4 @@ public class HCatRetentionTest extends BaseTestClass {
};
return MatrixUtil.crossProduct(periods, retentionUnits, dataTypes);
}
-
- @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/lineage/EntitySummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java
index 39d1e52..591810d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java
@@ -99,7 +99,7 @@ public class EntitySummaryTest extends BaseTestClass {
@AfterMethod(alwaysRun = true)
public void tearDown() throws IOException {
- cleanTestDirs();
+ cleanTestsDirs();
CleanupUtil.cleanAllEntities(prism);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
index 38e1cb2..f29cbfe 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
@@ -39,14 +39,11 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
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;
@@ -79,7 +76,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
}
@BeforeMethod(alwaysRun = true, firstTimeOnly = true)
- public void setup(Method method) throws Exception {
+ public void setup() throws Exception {
HadoopUtil.deleteDirIfExists(baseTestHDFSDir, clusterFS);
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
@@ -228,9 +225,4 @@ public class LineageApiProcessInstanceTest 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/lineage/LineageApiTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
index bedb456..0daa0f0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
@@ -42,13 +42,11 @@ import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.http.HttpResponse;
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.util.List;
import java.util.Map;
import java.util.Random;
@@ -655,9 +653,4 @@ public class LineageApiTest extends BaseTestClass {
AssertUtil.checkForListSize(userIncoming.filterByName(feed.getName()), 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/lineage/ListFeedInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
index 83b96a5..b90c8ed 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
@@ -485,6 +485,5 @@ public class ListFeedInstancesTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void tearDown() throws IOException {
removeBundles();
- cleanTestDirs();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b18ed3ed/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
index 485d121..49efcb8 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
@@ -32,7 +32,6 @@ 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;
@@ -350,9 +349,4 @@ public class ListProcessInstancesTest extends BaseTestClass {
r = prism.getProcessHelper().listInstances(processName, params, null);
InstanceUtil.validateResponse(r, 6, 1, 0, 5, 0);
}
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() 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/lineage/ProcessPipelineTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
index 4bc1806..b20f0b6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
@@ -31,7 +31,6 @@ import org.apache.falcon.resource.EntityList.EntityElement;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
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;
@@ -181,9 +180,4 @@ public class ProcessPipelineTest extends BaseTestClass{
},
};
}
-
- @AfterClass(alwaysRun = true)
- public void tearDownClass() throws IOException {
- cleanTestDirs();
- }
}