You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2016/08/22 11:50:40 UTC
lens git commit: LENS-1241 : Fix tests failures with setup and
teardown issues
Repository: lens
Updated Branches:
refs/heads/master 210e31fc0 -> 443ec5f5f
LENS-1241 : Fix tests failures with setup and teardown issues
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/443ec5f5
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/443ec5f5
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/443ec5f5
Branch: refs/heads/master
Commit: 443ec5f5fe18c5d60e8de835f3dedd08a0ffab7a
Parents: 210e31f
Author: Sushil Mohanty <su...@apache.org>
Authored: Mon Aug 22 17:20:25 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Aug 22 17:20:25 2016 +0530
----------------------------------------------------------------------
.../lens/server/metrics/MetricsServiceImpl.java | 6 ------
.../org/apache/lens/server/TestServerMode.java | 20 +++++++++++++++-----
.../server/healthcheck/TestHealthChecks.java | 4 +---
.../server/metastore/TestMetastoreService.java | 11 +++++++++--
.../metrics/TestResourceMethodMetrics.java | 15 ++++++++++-----
.../lens/server/query/TestEventService.java | 4 ++--
.../server/query/TestQueryEndEmailNotifier.java | 10 +++++++++-
.../server/query/TestQueryResultPurger.java | 8 +++-----
.../lens/server/query/TestQueryService.java | 10 +++++++++-
.../lens/server/query/TestResultFormatting.java | 16 +++++++++++-----
.../query/save/TestSavedQueryService.java | 14 ++++++++++----
.../TestUserQueryToCubeQueryRewriter.java | 4 ++--
.../lens/server/scheduler/AlarmServiceTest.java | 4 ++--
.../server/session/TestSessionResource.java | 9 +++++++--
.../lens/server/user/TestUserConfigLoader.java | 8 +++-----
15 files changed, 93 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
index e09180f..b88c717 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
@@ -585,12 +585,6 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
isHealthy = false;
}
- // Also unhealthy if 30% of queries have failed.
- if (getTotalFailedQueries()/(float)getTotalAcceptedQueries() > 0.3) {
- details.append("30% of queries have failed.");
- isHealthy = false;
- }
-
if (!isHealthy) {
log.error(details.toString());
}
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
index caf968a..bc3955d 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
@@ -43,9 +43,7 @@ import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
/**
* The Class TestServerMode.
@@ -61,8 +59,12 @@ public class TestServerMode extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- LensServerTestUtil.createTable("test_table", target(), RestAPITestUtil.openFooBarSession(target(), defaultMT),
- defaultMT);
+ }
+ @BeforeClass
+ public void create() throws Exception {
+ LensSessionHandle fooBarSessonHandle = RestAPITestUtil.openFooBarSession(target(), defaultMT);
+ LensServerTestUtil.createTable("test_table", target(), fooBarSessonHandle, defaultMT);
+ RestAPITestUtil.closeSession(target(), fooBarSessonHandle, defaultMT);
}
/*
@@ -75,6 +77,14 @@ public class TestServerMode extends LensAllApplicationJerseyTest {
super.tearDown();
}
+ @AfterClass
+ public void drop() throws Exception {
+ LensSessionHandle fooBarSessonHandle = RestAPITestUtil.openFooBarSession(target(), defaultMT);
+ LensServerTestUtil.dropTable("test_table", target(), fooBarSessonHandle,
+ defaultMT);
+ RestAPITestUtil.closeSession(target(), fooBarSessonHandle, defaultMT);
+ }
+
/**
* Test read only mode.
*
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java b/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
index 56c67fb..1a1476a 100644
--- a/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
+++ b/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
@@ -32,9 +32,7 @@ import org.apache.lens.server.quota.QuotaServiceImpl;
import org.apache.lens.server.scheduler.SchedulerServiceImpl;
import org.apache.lens.server.session.HiveSessionService;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import com.codahale.metrics.health.HealthCheck;
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
index be1326f..9384e1c 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
@@ -85,18 +85,25 @@ public class TestMetastoreService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
cubeObjectFactory = new ObjectFactory();
metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
-
}
@AfterTest
public void tearDown() throws Exception {
- metastoreService.closeSession(lensSessionId);
super.tearDown();
}
+ @AfterClass
+ public void drop() throws Exception {
+ metastoreService.closeSession(lensSessionId);
+ }
+
@Override
protected Application configure() {
enable(TestProperties.LOG_TRAFFIC);
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
index c20ddf8..14fae18 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
@@ -55,9 +55,7 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.test.TestProperties;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -78,13 +76,16 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
metricsSvc = LensServices.get().getService(MetricsService.NAME);
metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
methodMetricsMap = metricsSvc.getMethodMetricsFactory().getMethodMetricsMap();
//reset
}
-
private void createTable(String tblName) throws InterruptedException {
LensServerTestUtil.createTable(tblName, target(), lensSessionId, defaultMT);
}
@@ -95,9 +96,13 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
LensServerTestUtil.dropTable(TestQueryService.TEST_TABLE, target(), lensSessionId, defaultMT);
metastoreService.closeSession(lensSessionId);
- super.tearDown();
}
private void disableResourceMethodMetering() {
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
index 50baf5f..94011d2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
@@ -47,7 +47,7 @@ import org.apache.lens.server.api.session.SessionRestored;
import org.apache.lens.server.query.QueryExecutionServiceImpl.QueryStatusLogger;
import org.apache.lens.server.stats.event.query.QueryExecutionStatistics;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import lombok.extern.slf4j.Slf4j;
@@ -277,7 +277,7 @@ public class TestEventService {
*
* @throws Exception the exception
*/
- @BeforeTest
+ @BeforeClass
public void setup() throws Exception {
System.setProperty(LensConfConstants.CONFIG_LOCATION, "target/test-classes/");
LensServices.get().init(LensServerConf.getHiveConf());
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
index 5196c9b..cfdd1dd 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
@@ -85,6 +85,10 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
wiser = new Wiser();
wiser.setHostname("localhost");
wiser.setPort(25000);
@@ -112,10 +116,14 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
wiser.stop();
dropTable(TEST_TABLE);
queryService.closeSession(lensSessionId);
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
index c498ada..50415de 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
@@ -30,9 +30,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
@Test(groups = "unit-test")
public class TestQueryResultPurger {
@@ -47,7 +45,7 @@ public class TestQueryResultPurger {
* @throws IOException Signals that an I/O exception has occurred.
*/
- @BeforeTest
+ @BeforeClass
public void setUp() throws IOException {
String resultsetPath = "target/" + getClass().getSimpleName();
conf = new Configuration();
@@ -59,7 +57,7 @@ public class TestQueryResultPurger {
createTestFiles();
}
- @AfterTest
+ @AfterClass
public void cleanup() throws Exception {
Path dir = new Path(conf.get(LensConfConstants.RESULT_SET_PARENT_DIR));
FileSystem fs = dir.getFileSystem(conf);
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index a1ecaa6..4fd4fdb 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -127,6 +127,10 @@ public class TestQueryService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
queryService = LensServices.get().getService(QueryExecutionService.NAME);
metricsSvc = LensServices.get().getService(MetricsService.NAME);
Map<String, String> sessionconf = new HashMap<>();
@@ -166,6 +170,11 @@ public class TestQueryService extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
dropTable(TEST_TABLE);
queryService.closeSession(lensSessionId);
for (LensDriver driver : queryService.getDrivers()) {
@@ -173,7 +182,6 @@ public class TestQueryService extends LensJerseyTest {
assertFalse(((HiveDriver) driver).hasLensSession(lensSessionId));
}
}
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
index cb0d858..4f8b8ff 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
@@ -52,9 +52,7 @@ import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -79,10 +77,14 @@ public class TestResultFormatting extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
queryService = LensServices.get().getService(QueryExecutionService.NAME);
lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
createTable(testTable, target(), lensSessionId,
- "(ID INT, IDSTR STRING, IDARR ARRAY<INT>, IDSTRARR ARRAY<STRING>)", defaultMT);
+ "(ID INT, IDSTR STRING, IDARR ARRAY<INT>, IDSTRARR ARRAY<STRING>)", defaultMT);
loadDataFromClasspath(testTable, TestResourceFile.TEST_DATA2_FILE.getValue(), target(), lensSessionId, defaultMT);
}
@@ -93,9 +95,13 @@ public class TestResultFormatting extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
dropTable(testTable, target(), lensSessionId, defaultMT);
queryService.closeSession(lensSessionId);
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
index a8b58b2..af156ad 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
@@ -45,9 +45,7 @@ import org.apache.lens.server.query.QueryExecutionServiceImpl;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.session.SessionState;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import com.beust.jcommander.internal.Maps;
import com.beust.jcommander.internal.Sets;
@@ -93,6 +91,10 @@ public class TestSavedQueryService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
savedQueryService = LensServices.get().getService(SavedQueryService.NAME);
queryService = LensServices.get().getService(QueryExecutionService.NAME);
metricsSvc = LensServices.get().getService(MetricsService.NAME);
@@ -105,10 +107,14 @@ public class TestSavedQueryService extends LensJerseyTest {
@AfterTest
public void tearDown() throws Exception {
super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
queryService.closeSession(lensSessionId);
- super.tearDown();
}
+
@Override
protected Application configure() {
return new SavedQueryTestApp();
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
index 38f8d71..0f0187d 100644
--- a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
+++ b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
@@ -30,7 +30,7 @@ import org.apache.lens.server.api.query.rewrite.Phase1Rewriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class TestUserQueryToCubeQueryRewriter {
@@ -66,7 +66,7 @@ public class TestUserQueryToCubeQueryRewriter {
UserQueryToCubeQueryRewriter rewriter;
- @BeforeTest
+ @BeforeClass
public void setup() throws LensException {
Configuration conf = new Configuration();
conf.set(LensConfConstants.QUERY_PHASE1_REWRITERS, Rewriter1.class.getName() + "," + Rewriter2.class.getName());
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
index 02f371c..4feef4f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
@@ -41,8 +41,8 @@ import org.joda.time.format.DateTimeFormatter;
import org.quartz.*;
import org.quartz.impl.StdSchedulerFactory;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import lombok.extern.slf4j.Slf4j;
@@ -75,7 +75,7 @@ public class AlarmServiceTest {
events = new LinkedList<>();
}
- @BeforeTest
+ @BeforeClass
public void setUp() {
System.setProperty(LensConfConstants.CONFIG_LOCATION, "target/test-classes/");
LensServices.get().init(LensServerConf.getHiveConf());
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
index 3aa3163..c7c56e3 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
@@ -65,6 +65,8 @@ import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.test.TestProperties;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
+
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -85,11 +87,14 @@ public class TestSessionResource extends LensJerseyTest {
*/
@BeforeTest
public void setUp() throws Exception {
- metricsSvc = LensServices.get().getService(MetricsService.NAME);
- LensServices.get().getLogSegregationContext().setLogSegregationId("logid");
super.setUp();
}
+ @BeforeClass
+ public void create() throws Exception {
+ metricsSvc = LensServices.get().getService(MetricsService.NAME);
+ LensServices.get().getLogSegregationContext().setLogSegregationId("logid");
+ }
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/lens/blob/443ec5f5/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
index 1656f4e..6e96f63 100644
--- a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
+++ b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
@@ -33,9 +33,7 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.hsqldb.server.Server;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import liquibase.Liquibase;
import liquibase.database.jvm.HsqlConnection;
@@ -54,7 +52,7 @@ public class TestUserConfigLoader {
/**
* Inits the.
*/
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void init() {
conf = new HiveConf(LensServerConf.getHiveConf());
}
@@ -62,7 +60,7 @@ public class TestUserConfigLoader {
/**
* Reset factory.
*/
- @AfterTest
+ @AfterClass
public void resetFactory() {
init();
UserConfigLoaderFactory.init(conf);