Repository: falcon Updated Branches: refs/heads/master e422fceb8 -> 0692b2415
http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 4856aba..211de76 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 @@ -54,7 +54,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); - private String baseTestDir = baseHDFSDir + "/RescheduleProcessInFinalStates"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String inputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; private static final Logger LOGGER = Logger.getLogger(RescheduleProcessInFinalStatesTest.class); @@ -64,7 +64,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { LOGGER.info("in @BeforeClass"); uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); Bundle b = BundleUtil.readELBundle(); - b.generateUniqueBundle(); + b.generateUniqueBundle(this); b = new Bundle(b, cluster); b.setProcessWorkflow(aggregateWorkflowDir); @@ -85,7 +85,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { public void setUp() throws Exception { bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(inputPath); bundles[0].setProcessValidity("2010-01-02T01:00Z", "2010-01-02T01:15Z"); bundles[0].setProcessPeriodicity(5, TimeUnit.minutes); @@ -98,7 +98,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 ac4aac8..c049a7e 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 @@ -63,8 +63,8 @@ import java.util.Random; */ @Test(groups = "embedded") public class RetentionTest extends BaseTestClass { - private static final String TEST_FOLDERS = "testFolders/"; - private String baseTestHDFSDir = baseHDFSDir + "/RetentionTest/"; + private static final String TEST_FOLDERS = "/testFolders/"; + private String baseTestHDFSDir = cleanAndGetTestDir(); private String testHDFSDir = baseTestHDFSDir + TEST_FOLDERS; private static final Logger LOGGER = Logger.getLogger(RetentionTest.class); private ColoHelper cluster = servers.get(0); @@ -77,13 +77,13 @@ public class RetentionTest extends BaseTestClass { Bundle bundle = BundleUtil.readRetentionBundle(); bundles[0] = new Bundle(bundle, cluster); bundles[0].setInputFeedDataPath(testHDFSDir); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].submitClusters(prism); } @AfterMethod(alwaysRun = true) public void tearDown() throws Exception { - removeBundles(); + removeTestClassEntities(); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 6a78bbb..e578809 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 @@ -69,8 +69,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { private ColoHelper cluster2 = servers.get(1); private ColoHelper cluster3 = servers.get(2); private FileSystem cluster2FS = serverFS.get(1); - private final String baseTestDir = baseHDFSDir + "/UpdateAtSpecificTimeTest-data"; - private String aggregateWorkflowDir = baseHDFSDir + "/aggregator"; + private final String baseTestDir = cleanAndGetTestDir(); + private String aggregateWorkflowDir = baseTestDir + "/aggregator"; @BeforeClass(alwaysRun = true) public void uploadWorkflow() throws Exception { @@ -84,19 +84,19 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { bundles[1] = new Bundle(bundle, cluster2); bundles[2] = new Bundle(bundle, cluster3); - bundles[0].generateUniqueBundle(); - bundles[1].generateUniqueBundle(); - bundles[2].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); + bundles[1].generateUniqueBundle(this); + bundles[2].generateUniqueBundle(this); processBundle = BundleUtil.readELBundle(); processBundle = new Bundle(processBundle, cluster1); - processBundle.generateUniqueBundle(); + processBundle.generateUniqueBundle(this); processBundle.setProcessWorkflow(aggregateWorkflowDir); } @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(processBundle); + removeTestClassEntities(); } @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 71259cc..3cb33b6 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 @@ -47,7 +47,7 @@ public class AclValidationTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); - private String baseTestDir = baseHDFSDir + "/AuthorizationTest"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; @@ -64,7 +64,7 @@ public class AclValidationTest extends BaseTestClass { public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(feedInputPath); bundles[0].setProcessWorkflow(aggregateWorkflowDir); clusterMerlin = bundles[0].getClusterElement(); @@ -130,6 +130,6 @@ public class AclValidationTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 7c56788..b799b2c 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 @@ -45,7 +45,7 @@ public class ClusterAclTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); - private String baseTestDir = baseHDFSDir + "/ClusterAclTest"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; private final AbstractEntityHelper clusterHelper = prism.getClusterHelper(); @@ -60,7 +60,7 @@ public class ClusterAclTest extends BaseTestClass { public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(feedInputPath); bundles[0].setProcessWorkflow(aggregateWorkflowDir); bundles[0].setCLusterACL(MerlinConstants.CURRENT_USER_NAME, @@ -141,6 +141,6 @@ public class ClusterAclTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java index ad069de..dbaae9b 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java @@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.util.Util; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.log4j.Logger; -import javax.xml.bind.JAXBException; import java.io.IOException; import java.net.URISyntaxException; import java.util.List; @@ -85,22 +84,8 @@ enum EntityOp { public boolean executeAs(String user, AbstractEntityHelper helper, String data) { final String entityName = Util.readEntityName(data); final List<String> entities; - try { - entities = CleanupUtil.getAllEntitiesOfOneType(helper, user); - } catch (IOException e) { - logger.error("Caught exception: " + e); - return false; - } catch (URISyntaxException e) { - logger.error("Caught exception: " + e); - return false; - } catch (AuthenticationException e) { - logger.error("Caught exception: " + e); - return false; - } catch (JAXBException e) { - logger.error("Caught exception: " + e); - return false; - } catch (InterruptedException e) { - logger.error("Caught exception: " + e); + entities = CleanupUtil.getAllEntitiesOfOneType(helper, user); + if (entities == null) { return false; } logger.info("Checking for presence of " + entityName + " in " + entities); http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 6ea2be3..514ca55 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 @@ -42,7 +42,7 @@ public class FalconClientTest extends BaseTestClass { private final ColoHelper cluster = servers.get(0); private final FileSystem clusterFS = serverFS.get(0); - private final String baseTestDir = baseHDFSDir + "/AuthorizationTest"; + private final String baseTestDir = cleanAndGetTestDir(); private final String aggregateWorkflowDir = baseTestDir + "/aggregator"; private final String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; @@ -55,7 +55,7 @@ public class FalconClientTest extends BaseTestClass { public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(feedInputPath); bundles[0].setProcessWorkflow(aggregateWorkflowDir); } @@ -89,6 +89,6 @@ public class FalconClientTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 3d052a4..9a7ef15 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 @@ -47,7 +47,7 @@ public class FeedAclTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); - private String baseTestDir = baseHDFSDir + "/FeedAclTest"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; private final AbstractEntityHelper feedHelper = prism.getFeedHelper(); @@ -62,7 +62,7 @@ public class FeedAclTest extends BaseTestClass { public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(feedInputPath); bundles[0].setProcessWorkflow(aggregateWorkflowDir); bundles[0].setInputFeedACL(MerlinConstants.CURRENT_USER_NAME, @@ -246,6 +246,6 @@ public class FeedAclTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 12270d0..9735567 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 @@ -50,7 +50,7 @@ public class ProcessAclTest extends BaseTestClass { private ColoHelper cluster = servers.get(0); private FileSystem clusterFS = serverFS.get(0); - private String baseTestDir = baseHDFSDir + "/ProcessAclTest"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; private final AbstractEntityHelper processHelper = prism.getProcessHelper(); @@ -65,7 +65,7 @@ public class ProcessAclTest extends BaseTestClass { public void setup() throws Exception { Bundle bundle = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundle, cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setInputFeedDataPath(feedInputPath); bundles[0].setProcessWorkflow(aggregateWorkflowDir); bundles[0].setProcessACL(MerlinConstants.CURRENT_USER_NAME, @@ -255,6 +255,6 @@ public class ProcessAclTest extends BaseTestClass { @AfterMethod(alwaysRun = true) public void tearDown() { - removeBundles(); + removeTestClassEntities(); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 22568f8..9018148 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 @@ -62,7 +62,7 @@ import java.util.Map; public class LineageGraphTest extends BaseUITestClass { private ColoHelper cluster = servers.get(0); - private String baseTestDir = baseHDFSDir + "/LineageGraphTest"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private static final Logger LOGGER = Logger.getLogger(LineageGraphTest.class); private String feedInputPath = baseTestDir + "/input" + MINUTE_DATE_PATTERN; @@ -86,7 +86,7 @@ public class LineageGraphTest extends BaseUITestClass { uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setProcessWorkflow(aggregateWorkflowDir); String startTime = TimeUtil.getTimeWrtSystemTime(0); String endTime = TimeUtil.addMinsToTime(startTime, 5); @@ -127,7 +127,7 @@ public class LineageGraphTest extends BaseUITestClass { @AfterClass(alwaysRun = true) public void tearDown() throws IOException { closeBrowser(); - removeBundles(); + removeTestClassEntities(); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/0692b241/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 42bfe49..4c54409 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 @@ -28,7 +28,6 @@ import org.apache.falcon.entity.v0.process.Process; import org.apache.falcon.regression.core.helpers.ColoHelper; import org.apache.falcon.regression.core.util.AssertUtil; import org.apache.falcon.regression.core.util.BundleUtil; -import org.apache.falcon.regression.core.util.CleanupUtil; import org.apache.falcon.regression.core.util.Generator; import org.apache.falcon.regression.core.util.HadoopUtil; import org.apache.falcon.regression.core.util.InstanceUtil; @@ -46,8 +45,8 @@ 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.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.asserts.SoftAssert; @@ -67,7 +66,7 @@ import java.util.Random; public class ProcessUITest extends BaseUITestClass { private ColoHelper cluster = servers.get(0); - private String baseTestDir = baseHDFSDir + "/TestProcessUI"; + private String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; private static final Logger LOGGER = Logger.getLogger(ProcessUITest.class); private final String feedInputPath = baseTestDir + "/input"; @@ -76,17 +75,16 @@ public class ProcessUITest extends BaseUITestClass { private OozieClient clusterOC = serverOC.get(0); private SoftAssert softAssert = new SoftAssert(); - @BeforeMethod + @BeforeClass public void setUp() throws IOException, JAXBException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, URISyntaxException, AuthenticationException, InterruptedException { - CleanupUtil.cleanAllEntities(prism); uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); openBrowser(); bundles[0] = BundleUtil.readELBundle(); bundles[0] = new Bundle(bundles[0], cluster); - bundles[0].generateUniqueBundle(); + bundles[0].generateUniqueBundle(this); bundles[0].setProcessWorkflow(aggregateWorkflowDir); String startTime = TimeUtil.getTimeWrtSystemTime(0); String endTime = TimeUtil.addMinsToTime(startTime, 5); @@ -136,9 +134,10 @@ public class ProcessUITest extends BaseUITestClass { final FeedMerlin inputMerlin = new FeedMerlin(bundles[0].getInputFeedFromBundle()); final FeedMerlin outputMerlin = new FeedMerlin(bundles[0].getOutputFeedFromBundle()); - + String namePrefix = this.getClass().getSimpleName() + '-'; inputFeeds = LineageApiTest.generateFeeds(numInputFeeds, inputMerlin, - Generator.getNameGenerator("infeed", inputMerlin.getName()), + Generator.getNameGenerator(namePrefix + "infeed", + inputMerlin.getName().replace(namePrefix, "")), Generator.getHadoopPathGenerator(feedInputPath, MINUTE_DATE_PATTERN)); int j = 0; for (FeedMerlin feed : inputFeeds) { @@ -146,7 +145,8 @@ public class ProcessUITest extends BaseUITestClass { } outputFeeds = LineageApiTest.generateFeeds(numOutputFeeds, outputMerlin, - Generator.getNameGenerator("outfeed", outputMerlin.getName()), + Generator.getNameGenerator(namePrefix + "outfeed", + inputMerlin.getName().replace(namePrefix, "")), Generator.getHadoopPathGenerator(feedOutputPath, MINUTE_DATE_PATTERN)); j = 0; for (FeedMerlin feed : outputFeeds) { @@ -158,10 +158,10 @@ public class ProcessUITest extends BaseUITestClass { } - @AfterMethod(alwaysRun = true) + @AfterClass(alwaysRun = true) public void tearDown() throws IOException { closeBrowser(); - removeBundles(); + removeTestClassEntities(); } /**
