LENS-525 : Remove static jars and disable tests which require them (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/51ca965c Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/51ca965c Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/51ca965c Branch: refs/heads/master Commit: 51ca965c6ca604a723294a440e50543d44436351 Parents: 81302fa Author: Amareshwari Sriramadasu <[email protected]> Authored: Mon Apr 27 14:32:18 2015 +0530 Committer: Amareshwari Sriramadasu <[email protected]> Committed: Mon Apr 27 14:33:01 2015 +0530 ---------------------------------------------------------------------- .../driver/jdbc/TestColumnarSQLRewriter.java | 5 +-- lens-driver-jdbc/testdata/serde.jar | Bin 733 -> 0 bytes lens-driver-jdbc/testdata/test.jar | Bin 726 -> 0 bytes lens-driver-jdbc/testdata/test2.jar | Bin 700 -> 0 bytes lens-ml-lib/testjars/serde.jar | Bin 1369 -> 0 bytes lens-ml-lib/testjars/test.jar | Bin 697 -> 0 bytes .../org/apache/lens/server/LensJerseyTest.java | 4 +-- .../org/apache/lens/server/LensTestUtil.java | 2 +- .../lens/server/query/TestQueryService.java | 4 +-- .../session/TestDatabaseResourceService.java | 35 ++++++++++--------- .../server/session/TestSessionClassLoaders.java | 27 +++++++------- lens-server/testdata/serde.jar | Bin 1033 -> 0 bytes lens-server/testdata/test.jar | Bin 726 -> 0 bytes lens-server/testdata/test2.jar | Bin 700 -> 0 bytes 14 files changed, 40 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java index dc1ecba..5471ba2 100644 --- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java +++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java @@ -776,8 +776,9 @@ public class TestColumnarSQLRewriter { * * @throws Exception the exception */ - @Test - public void testReplaceDBName() throws Exception { + // Disabling the test for LENS-350 + //@Test + private void testReplaceDBName() throws Exception { File jarDir = new File("testdata"); File testJarFile = new File(jarDir, "test.jar"); File serdeJarFile = new File(jarDir, "serde.jar"); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/serde.jar ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/testdata/serde.jar b/lens-driver-jdbc/testdata/serde.jar deleted file mode 100644 index b4c0500..0000000 Binary files a/lens-driver-jdbc/testdata/serde.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/test.jar ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/testdata/test.jar b/lens-driver-jdbc/testdata/test.jar deleted file mode 100644 index bd0aa60..0000000 Binary files a/lens-driver-jdbc/testdata/test.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/test2.jar ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/testdata/test2.jar b/lens-driver-jdbc/testdata/test2.jar deleted file mode 100644 index 8f54d8d..0000000 Binary files a/lens-driver-jdbc/testdata/test2.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-ml-lib/testjars/serde.jar ---------------------------------------------------------------------- diff --git a/lens-ml-lib/testjars/serde.jar b/lens-ml-lib/testjars/serde.jar deleted file mode 100644 index ec86e49..0000000 Binary files a/lens-ml-lib/testjars/serde.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-ml-lib/testjars/test.jar ---------------------------------------------------------------------- diff --git a/lens-ml-lib/testjars/test.jar b/lens-ml-lib/testjars/test.jar deleted file mode 100644 index 1644d8c..0000000 Binary files a/lens-ml-lib/testjars/test.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java index 7913845..4b0d392 100644 --- a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java +++ b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java @@ -116,8 +116,8 @@ public abstract class LensJerseyTest extends JerseyTest { hiveConf.setIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_CLIENT_CONNECTION_RETRY_LIMIT, 3); hiveConf.setIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_CLIENT_RETRY_LIMIT, 3); - LensTestUtil.createTestDatabaseResources(new String[]{LensTestUtil.DB_WITH_JARS, LensTestUtil.DB_WITH_JARS_2}, - hiveConf); + // LensTestUtil.createTestDatabaseResources(new String[]{LensTestUtil.DB_WITH_JARS, LensTestUtil.DB_WITH_JARS_2}, + // hiveConf); LensServices.get().init(LensServerConf.getHiveConf()); LensServices.get().start(); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java index 5658d47..beb4532 100644 --- a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java +++ b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java @@ -236,7 +236,7 @@ public final class LensTestUtil { Hive.get().dropTable(tableName); } - public static void createTestDatabaseResources(String[] testDatabases, HiveConf conf) throws Exception { + private static void createTestDatabaseResources(String[] testDatabases, HiveConf conf) throws Exception { File resDir = new File("target/resources"); if (!resDir.exists()) { resDir.mkdir(); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/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 ed4749f..ae49e82 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 @@ -1373,8 +1373,8 @@ public class TestQueryService extends LensJerseyTest { * Check if DB static jars get passed to Hive driver * @throws Exception */ - @Test - public void testHiveDriverGetsDBJars() throws Exception { + //@Test + private void testHiveDriverGetsDBJars() throws Exception { // Set DB to a db with static jars HiveSessionService sessionService = LensServices.get().getService(SessionService.NAME); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java b/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java index 0c24c02..6acd5e5 100644 --- a/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java +++ b/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.lens.server.LensTestUtil; import org.apache.lens.server.api.LensConfConstants; import org.apache.commons.logging.Log; @@ -34,10 +33,8 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.metadata.Hive; import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +// Disabling all tests for LENS-350 public class TestDatabaseResourceService { private static final String DB_PFX = TestDatabaseResourceService.class.getSimpleName(); public static final Log LOG = LogFactory.getLog(TestDatabaseResourceService.class); @@ -52,9 +49,13 @@ public class TestDatabaseResourceService { private final HiveConf conf = new HiveConf(TestDatabaseResourceService.class); private DatabaseResourceService dbResService; - @BeforeClass - public void setup() throws Exception { - LensTestUtil.createTestDatabaseResources(testDatabases, conf); + public void testDisabled() { + // to avoid checkstyle + } + + //@BeforeClass + private void setup() throws Exception { + // LensTestUtil.createTestDatabaseResources(testDatabases, conf); // Start resource service. conf.set(LensConfConstants.DATABASE_RESOURCE_DIR, "target/resources"); dbResService = new DatabaseResourceService(DatabaseResourceService.NAME); @@ -62,16 +63,16 @@ public class TestDatabaseResourceService { dbResService.start(); } - @AfterClass - public void tearDown() throws Exception { + //@AfterClass + private void tearDown() throws Exception { Hive hive = Hive.get(conf); for (String db : testDatabases) { hive.dropDatabase(db, true, true); } } - @Test - public void testClassLoaderCreated() throws Exception { + //@Test + private void testClassLoaderCreated() throws Exception { ClassLoader db1Loader = dbResService.getClassLoader(DB1); ClassLoader db2Loader = dbResService.getClassLoader(DB2); @@ -93,8 +94,8 @@ public class TestDatabaseResourceService { return false; } - @Test - public void testJarsLoaded() throws Exception { + //@Test + private void testJarsLoaded() throws Exception { // Verify that each db's classloader contains corresponding jar Assert.assertTrue(isJarLoaded(dbResService.getClassLoader(DB1), DB1), DB1 + " jar should be loaded"); Assert.assertTrue(isJarLoaded(dbResService.getClassLoader(DB2), DB2), DB2 + " jar should be loaded"); @@ -104,8 +105,8 @@ public class TestDatabaseResourceService { Assert.assertFalse(isJarLoaded(dbResService.getClassLoader(DB1), DB2)); } - @Test - public void testJarOrder() throws Exception { + //@Test + private void testJarOrder() throws Exception { Collection<LensSessionImpl.ResourceEntry> actualOrder = dbResService.getResourcesForDatabase(DB1); List<String> actualOrderList = new ArrayList<String>(); @@ -126,8 +127,8 @@ public class TestDatabaseResourceService { } } - @Test - public void verifyClassLoader() throws Exception { + //@Test + private void verifyClassLoader() throws Exception { // Should fail now since current classloader doesn't have jar loaded try { Class clz = Class.forName("ClassLoaderTestClass", true, getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java index 7dd4486..e93f63f 100644 --- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java +++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java @@ -25,7 +25,6 @@ import java.util.HashMap; import org.apache.lens.api.LensSessionHandle; import org.apache.lens.server.LensServerConf; -import org.apache.lens.server.LensTestUtil; import org.apache.lens.server.api.LensConfConstants; import org.apache.lens.server.user.UserConfigLoaderFactory; @@ -36,10 +35,8 @@ import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hive.service.cli.CLIService; import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +// Disabling all tests for LENS-350 public class TestSessionClassLoaders { private static final Log LOG = LogFactory.getLog(TestSessionClassLoaders.class); @@ -48,8 +45,12 @@ public class TestSessionClassLoaders { private static final String DB1 = TestSessionClassLoaders.class.getSimpleName() + "_db1"; - @BeforeClass - public void setup() throws Exception { + public void testDisabled() { + // to avoid checkstyle + } + + //@BeforeClass + private void setup() throws Exception { /** * Test Setup - * Static test.jar containing ClassLoaderTestClass.class attached to DB1 @@ -57,7 +58,7 @@ public class TestSessionClassLoaders { * test2.jar containing ClassLoaderTestClass2.class added to session via addResource */ // Create test databases and tables - LensTestUtil.createTestDatabaseResources(new String[]{DB1}, conf); + //LensTestUtil.createTestDatabaseResources(new String[]{DB1}, conf); conf.setVar(HiveConf.ConfVars.HIVE_SESSION_IMPL_CLASSNAME, LensSessionImpl.class.getName()); conf.set(LensConfConstants.DATABASE_RESOURCE_DIR, "target/resources"); @@ -75,8 +76,8 @@ public class TestSessionClassLoaders { } - @AfterClass - public void tearDown() throws Exception { + //@AfterClass + private void tearDown() throws Exception { Hive hive = Hive.get(conf); hive.dropDatabase(DB1, true, true); } @@ -86,8 +87,8 @@ public class TestSessionClassLoaders { * Check that DB specific classlaoders are available * @throws Exception */ - @Test - public void testSessionClassLoader() throws Exception { + //@Test + private void testSessionClassLoader() throws Exception { LensSessionHandle sessionHandle = sessionService.openSession("foo", "bar", new HashMap<String, String>()); LensSessionImpl session = sessionService.getSession(sessionHandle); session.setDbResService(sessionService.getDatabaseResourceService()); @@ -148,8 +149,8 @@ public class TestSessionClassLoaders { * Check that any added resources to the session are available after database is switched * @throws Exception */ - @Test - public void testClassLoaderMergeAfterAddResources() throws Exception { + //@Test + private void testClassLoaderMergeAfterAddResources() throws Exception { LensSessionHandle sessionHandle = sessionService.openSession("foo", "bar", new HashMap<String, String>()); LensSessionImpl session = sessionService.getSession(sessionHandle); session.setDbResService(sessionService.getDatabaseResourceService()); http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/serde.jar ---------------------------------------------------------------------- diff --git a/lens-server/testdata/serde.jar b/lens-server/testdata/serde.jar deleted file mode 100644 index 01e6d7c..0000000 Binary files a/lens-server/testdata/serde.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/test.jar ---------------------------------------------------------------------- diff --git a/lens-server/testdata/test.jar b/lens-server/testdata/test.jar deleted file mode 100644 index a5baa57..0000000 Binary files a/lens-server/testdata/test.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/test2.jar ---------------------------------------------------------------------- diff --git a/lens-server/testdata/test2.jar b/lens-server/testdata/test2.jar deleted file mode 100644 index 8f54d8d..0000000 Binary files a/lens-server/testdata/test2.jar and /dev/null differ
