diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java index da51a55..6301b72 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java @@ -18,9 +18,9 @@ package org.apache.hive.jdbc.miniHS2; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import org.apache.hive.service.cli.RowSet; import org.apache.hive.service.cli.SessionHandle; import org.junit.After; -import org.junit.Assert; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -39,44 +39,59 @@ public class TestHiveServer2 { private static MiniHS2 miniHS2 = null; - private Map confOverlay; + private static Map confOverlay; @BeforeClass public static void beforeTest() throws Exception { miniHS2 = new MiniHS2(new HiveConf()); + confOverlay = new HashMap(); + confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); + miniHS2.start(confOverlay); + } + + @AfterClass + public static void afterTest() throws Exception { + miniHS2.stop(); } @Before public void setUp() throws Exception { - confOverlay = new HashMap(); - confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); - miniHS2.start(confOverlay); } @After public void tearDown() throws Exception { - miniHS2.stop(); } + /** + * Open a new session and run a test query + * @throws Exception + */ @Test public void testConnection() throws Exception { - String tabName = "testTab1"; + String tabName = "TestHiveServer2TestConnection"; CLIServiceClient serviceClient = miniHS2.getServiceClient(); SessionHandle sessHandle = serviceClient.openSession("foo", "bar"); - serviceClient.executeStatement(sessHandle, "DROP TABLE IF EXISTS tab", confOverlay); serviceClient.executeStatement(sessHandle, "CREATE TABLE " + tabName + " (id INT)", confOverlay); OperationHandle opHandle = serviceClient.executeStatement(sessHandle, "SHOW TABLES", confOverlay); RowSet rowSet = serviceClient.fetchResults(opHandle); assertFalse(rowSet.numRows() == 0); + serviceClient.executeStatement(sessHandle, "DROP TABLE " + tabName, confOverlay); + serviceClient.closeSession(sessHandle); } + + /** + * Open a new session and execute a set command + * @throws Exception + */ @Test public void testGetVariableValue() throws Exception { CLIServiceClient serviceClient = miniHS2.getServiceClient(); SessionHandle sessHandle = serviceClient.openSession("foo", "bar"); OperationHandle opHandle = serviceClient.executeStatement(sessHandle, "set system:os.name", confOverlay); RowSet rowSet = serviceClient.fetchResults(opHandle); - Assert.assertEquals(1, rowSet.numRows()); + assertEquals(1, rowSet.numRows()); + serviceClient.closeSession(sessHandle); } }