github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-21 11:21:39 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2159: Sqoop2: Use BeforeSuite/AfterSuite for startHadoop/stopHadoop in integration tests

Browse Source 
(Jarek Jarcec Cecho via Abraham Elmahrek)
This commit is contained in:
Abraham Elmahrek 2015-03-02 18:19:58 -08:00
parent 337266b9fc
commit 68595856f6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
View File

@ -44,6 +44,7 @@
import org.apache.sqoop.validation.Status;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -80,7 +81,7 @@ public void finished(MSubmission submission) {
}
};
@BeforeClass(alwaysRun = true)
@BeforeSuite(alwaysRun = true)
public static void startHadoop() throws Exception {
// Start Hadoop Clusters
hadoopCluster = HadoopRunnerFactory.getHadoopCluster(System.getProperties(), HadoopMiniClusterRunner.class);

13
test/src/main/java/org/apache/sqoop/test/testcases/TomcatTestCase.java
View File

@ -32,10 +32,13 @@
import org.apache.sqoop.test.hadoop.HadoopLocalRunner;
import org.apache.sqoop.test.minicluster.TomcatSqoopMiniCluster;
import org.apache.sqoop.test.utils.HdfsUtils;
import org.testng.ITest;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
/**
* Basic test case that will bootstrap Sqoop server running in external Tomcat
@ -88,7 +91,7 @@ abstract public class TomcatTestCase {
*/
private SqoopClient client;
@BeforeClass(alwaysRun = true)
@BeforeSuite(alwaysRun = true)
public static void startHadoop() throws Exception {
// Start Hadoop Clusters
hadoopCluster = HadoopRunnerFactory.getHadoopCluster(System.getProperties(), HadoopLocalRunner.class);
@ -103,7 +106,11 @@ public static void startHadoop() throws Exception {
@BeforeMethod(alwaysRun = true)
public void findMethodName(Method method) {
name = method.getName();
if(this instanceof ITest) {
name = ((ITest)this).getTestName();
} else {
name = method.getName();
}
}
@BeforeMethod(alwaysRun = true)
@ -127,7 +134,7 @@ public void stopServer() throws Exception {
cluster.stop();
}
@AfterClass(alwaysRun = true)
@AfterSuite(alwaysRun = true)
public static void stopHadoop() throws Exception {
hadoopCluster.stop();
}