From 0f1731af3a268f65276c9c3cf946ba5e1b4cc79f Mon Sep 17 00:00:00 2001 From: shaofengshi Date: Thu, 25 Dec 2014 10:59:38 +0800 Subject: [PATCH 1/2] Refactor mini cluster test case --- .../common/util/AbstractKylinTestCase.java | 4 ++-- .../common/util/HBaseMetadataTestCase.java | 22 ++++++++++++++++++---- .../common/persistence/HBaseResourceStoreTest.java | 17 ++--------------- .../com/kylinolap/job/BuildCubeWithEngineTest.java | 13 +++++++------ .../com/kylinolap/query/test/KylinQueryTest.java | 10 +++++----- .../kylinolap/rest/service/ServiceTestBase.java | 15 ++++++--------- .../com/kylinolap/storage/test/StorageTest.java | 8 +++----- 7 files changed, 43 insertions(+), 46 deletions(-) diff --git a/common/src/main/java/com/kylinolap/common/util/AbstractKylinTestCase.java b/common/src/main/java/com/kylinolap/common/util/AbstractKylinTestCase.java index e4b0041..6213754 100644 --- a/common/src/main/java/com/kylinolap/common/util/AbstractKylinTestCase.java +++ b/common/src/main/java/com/kylinolap/common/util/AbstractKylinTestCase.java @@ -30,9 +30,9 @@ public static final String SANDBOX_TEST_DATA = "../examples/test_case_data/sandbox"; - public abstract void createTestMetadata(); + public abstract void createTestMetadata() throws Exception; - public abstract void cleanupTestMetadata(); + public abstract void cleanupTestMetadata() throws Exception; public KylinConfig getTestConfig() { return KylinConfig.getInstanceFromEnv(); diff --git a/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java b/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java index 95f659b..87c8f6c 100644 --- a/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java +++ b/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java @@ -22,20 +22,34 @@ * @author ysong1 */ public class HBaseMetadataTestCase extends AbstractKylinTestCase { - + public static void staticCleanupTestMetadata() { System.clearProperty(KylinConfig.KYLIN_CONF); KylinConfig.destoryInstance(); } @Override - public void createTestMetadata() { - staticCreateTestMetadata(SANDBOX_TEST_DATA); + public void createTestMetadata() throws Exception { + if (useMiniCluster()) { + HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.MINICLUSTER_TEST_DATA); + HBaseMiniclusterMetadataTestCase.startupMinicluster(); + } else { + HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA); + } } @Override public void cleanupTestMetadata() { - staticCleanupTestMetadata(); + HBaseMetadataTestCase.staticCleanupTestMetadata(); + if (useMiniCluster()) { + HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); + } + } + + public static boolean useMiniCluster() { + String queryUseMinicluster = System.getProperty("queryUseMinicluster"); + return Boolean.parseBoolean(queryUseMinicluster); + } } diff --git a/common/src/test/java/com/kylinolap/common/persistence/HBaseResourceStoreTest.java b/common/src/test/java/com/kylinolap/common/persistence/HBaseResourceStoreTest.java index dd34101..a1b4006 100644 --- a/common/src/test/java/com/kylinolap/common/persistence/HBaseResourceStoreTest.java +++ b/common/src/test/java/com/kylinolap/common/persistence/HBaseResourceStoreTest.java @@ -28,28 +28,15 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import com.kylinolap.common.KylinConfig; -import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; +import com.kylinolap.common.util.HBaseMetadataTestCase; import com.kylinolap.common.util.HadoopUtil; -public class HBaseResourceStoreTest extends HBaseMiniclusterMetadataTestCase { // HBaseMetadataTestCase { +public class HBaseResourceStoreTest extends HBaseMetadataTestCase { // HBaseMetadataTestCase { - @BeforeClass - public static void setupResource() throws Exception { - startupMinicluster(); - } - - @AfterClass - public static void tearDownResource() { - shutdownMiniCluster(); - } - - @Before public void setup() throws Exception { this.createTestMetadata(); diff --git a/job/src/test/java/com/kylinolap/job/BuildCubeWithEngineTest.java b/job/src/test/java/com/kylinolap/job/BuildCubeWithEngineTest.java index 3461c5a..92da5b8 100644 --- a/job/src/test/java/com/kylinolap/job/BuildCubeWithEngineTest.java +++ b/job/src/test/java/com/kylinolap/job/BuildCubeWithEngineTest.java @@ -34,6 +34,7 @@ import com.google.common.collect.Lists; import com.kylinolap.common.KylinConfig; +import com.kylinolap.common.util.AbstractKylinTestCase; import com.kylinolap.common.util.ClasspathUtil; import com.kylinolap.common.util.HBaseMetadataTestCase; import com.kylinolap.common.util.JsonUtil; @@ -50,24 +51,24 @@ /** * @author ysong1 */ -public class BuildCubeWithEngineTest extends HBaseMetadataTestCase { +public class BuildCubeWithEngineTest { protected JobManager jobManager; protected JobEngineConfig engineConfig; @BeforeClass public static void beforeClass() throws Exception { - ClasspathUtil.addClasspath(new File(SANDBOX_TEST_DATA).getAbsolutePath()); + ClasspathUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath()); } @Before public void before() throws Exception { - this.createTestMetadata(); + HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA); DeployUtil.initCliWorkDir(); DeployUtil.deployMetadata(); DeployUtil.overrideJobJarLocations(); - DeployUtil.overrideJobConf(SANDBOX_TEST_DATA); + DeployUtil.overrideJobConf(HBaseMetadataTestCase.SANDBOX_TEST_DATA); engineConfig = new JobEngineConfig(KylinConfig.getInstanceFromEnv()); jobManager = new JobManager("Build_Test_Cube_Engine", engineConfig); @@ -81,7 +82,7 @@ public void after() throws Exception { if (exitCode == 0) exportHBaseData(); - this.cleanupTestMetadata(); + HBaseMetadataTestCase.staticCleanupTestMetadata(); } @Test @@ -234,7 +235,7 @@ protected void waitCubeBuilt(List jobs) throws Exception { CubeManager cubeMgr = CubeManager.getInstance(KylinConfig.getInstanceFromEnv()); CubeInstance cube = cubeMgr.getCube(cubename); - CubeManager.getInstance(this.getTestConfig()).loadCubeCache(cube); + CubeManager.getInstance(KylinConfig.getInstanceFromEnv()).loadCubeCache(cube); System.out.println(JsonUtil.writeValueAsIndentString(cube)); List newSegments = cubeMgr.allocateSegments(cube, jobType, startDate, endDate); diff --git a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java index bb5022b..093cfea 100644 --- a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java +++ b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.*; import java.io.File; -import java.io.IOException; import java.sql.DriverManager; import java.sql.SQLException; import java.util.List; @@ -64,9 +63,7 @@ protected static void setupAll() throws Exception { private static void setUpEnv() throws Exception { - String queryUseMinicluster = System.getProperty("queryUseMinicluster"); - - if (Boolean.parseBoolean(queryUseMinicluster)) { + if (HBaseMetadataTestCase.useMiniCluster()) { HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.MINICLUSTER_TEST_DATA); HBaseMiniclusterMetadataTestCase.startupMinicluster(); } else { @@ -97,7 +94,10 @@ public static void tearDown() throws Exception { printInfo("tearDown"); printInfo("Closing connection..."); clean(); - HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); + + if (HBaseMetadataTestCase.useMiniCluster()) { + HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); + } } protected static void clean() { diff --git a/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java b/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java index f3b67ff..8869b95 100644 --- a/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java +++ b/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java @@ -16,9 +16,6 @@ package com.kylinolap.rest.service; -import com.kylinolap.dict.DictionaryManager; -import com.kylinolap.invertedindex.IIManager; -import com.kylinolap.metadata.project.ProjectManager; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -32,9 +29,12 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; +import com.kylinolap.common.util.HBaseMetadataTestCase; import com.kylinolap.cube.CubeManager; +import com.kylinolap.dict.DictionaryManager; +import com.kylinolap.invertedindex.IIManager; import com.kylinolap.metadata.MetadataManager; +import com.kylinolap.metadata.project.ProjectManager; /** * @author xduo @@ -42,24 +42,21 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:applicationContext.xml", "classpath:kylinSecurity.xml" }) @ActiveProfiles("testing") -public class ServiceTestBase extends HBaseMiniclusterMetadataTestCase { //HBaseMetadataTestCase { +public class ServiceTestBase extends HBaseMetadataTestCase { //HBaseMetadataTestCase { @BeforeClass public static void setupResource() throws Exception { - startupMinicluster(); - Authentication authentication = new TestingAuthenticationToken("ADMIN", "ADMIN", "ROLE_ADMIN"); SecurityContextHolder.getContext().setAuthentication(authentication); } @AfterClass public static void tearDownResource() { - shutdownMiniCluster(); } @Before - public void setUp() { + public void setUp() throws Exception { this.createTestMetadata(); MetadataManager.removeInstance(this.getTestConfig()); diff --git a/storage/src/test/java/com/kylinolap/storage/test/StorageTest.java b/storage/src/test/java/com/kylinolap/storage/test/StorageTest.java index 05ab5ce..1ecc8a7 100644 --- a/storage/src/test/java/com/kylinolap/storage/test/StorageTest.java +++ b/storage/src/test/java/com/kylinolap/storage/test/StorageTest.java @@ -29,13 +29,13 @@ import org.junit.Test; import com.kylinolap.common.KylinConfig; -import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; +import com.kylinolap.common.util.HBaseMetadataTestCase; import com.kylinolap.cube.CubeInstance; import com.kylinolap.cube.CubeManager; import com.kylinolap.metadata.model.ColumnDesc; -import com.kylinolap.metadata.model.TableDesc; import com.kylinolap.metadata.model.FunctionDesc; import com.kylinolap.metadata.model.ParameterDesc; +import com.kylinolap.metadata.model.TableDesc; import com.kylinolap.metadata.model.TblColRef; import com.kylinolap.storage.IStorageEngine; import com.kylinolap.storage.StorageContext; @@ -50,7 +50,7 @@ import com.kylinolap.storage.tuple.ITuple; import com.kylinolap.storage.tuple.ITupleIterator; -public class StorageTest extends HBaseMiniclusterMetadataTestCase { +public class StorageTest extends HBaseMetadataTestCase { private IStorageEngine storageEngine; private CubeInstance cube; @@ -58,12 +58,10 @@ @BeforeClass public static void setupResource() throws Exception { - startupMinicluster(); } @AfterClass public static void tearDownResource() { - shutdownMiniCluster(); } @Before From dc66766ff307b07531c798a3832f08d46adae7cb Mon Sep 17 00:00:00 2001 From: shaofengshi Date: Thu, 25 Dec 2014 17:28:19 +0800 Subject: [PATCH 2/2] Update test case. --- .../common/util/HBaseMetadataTestCase.java | 31 +++++------- .../util/HBaseMiniclusterMetadataTestCase.java | 59 ++++++---------------- .../java/com/kylinolap/job/ExportHBaseData.java | 4 +- .../java/com/kylinolap/job/ImportHBaseData.java | 5 +- pom.xml | 36 ++++++++++++- .../com/kylinolap/query/test/KylinQueryTest.java | 13 +---- 6 files changed, 69 insertions(+), 79 deletions(-) diff --git a/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java b/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java index 77a001e..456084d 100644 --- a/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java +++ b/common/src/main/java/com/kylinolap/common/util/HBaseMetadataTestCase.java @@ -16,39 +16,34 @@ package com.kylinolap.common.util; -import com.kylinolap.common.KylinConfig; - /** * @author ysong1 */ public class HBaseMetadataTestCase extends AbstractKylinTestCase { - public static void staticCleanupTestMetadata() { - System.clearProperty(KylinConfig.KYLIN_CONF); - KylinConfig.destoryInstance(); - } - @Override public void createTestMetadata() throws Exception { - if (useMiniCluster()) { - HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.MINICLUSTER_TEST_DATA); - HBaseMiniclusterMetadataTestCase.startupMinicluster(); - } else { - HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA); - } + staticCreateTestMetadata(); } @Override public void cleanupTestMetadata() { HBaseMetadataTestCase.staticCleanupTestMetadata(); - if (useMiniCluster()) { - HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); + } + + public static void staticCreateTestMetadata() throws Exception { + if (useSandbox()) { + HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA); + } else { + HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.MINICLUSTER_TEST_DATA); + HBaseMiniclusterMetadataTestCase.startupMinicluster(); } + } - public static boolean useMiniCluster() { - String queryUseMinicluster = System.getProperty("querySkipUsingMinicluster"); - return !Boolean.parseBoolean(queryUseMinicluster); + public static boolean useSandbox() { + String useSandbox = System.getProperty("useSandbox"); + return Boolean.parseBoolean(useSandbox); } diff --git a/common/src/main/java/com/kylinolap/common/util/HBaseMiniclusterMetadataTestCase.java b/common/src/main/java/com/kylinolap/common/util/HBaseMiniclusterMetadataTestCase.java index 4f7b8c9..9ff92a9 100644 --- a/common/src/main/java/com/kylinolap/common/util/HBaseMiniclusterMetadataTestCase.java +++ b/common/src/main/java/com/kylinolap/common/util/HBaseMiniclusterMetadataTestCase.java @@ -39,7 +39,7 @@ * * @author shaoshi */ -public class HBaseMiniclusterMetadataTestCase extends AbstractKylinTestCase { +public class HBaseMiniclusterMetadataTestCase { private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); @@ -50,6 +50,10 @@ protected static Configuration config = null; protected static String hbaseconnectionUrl = ""; + + public static final String TEST_METADATA_TABLE = "kylin_metadata_qa"; + + public static final String CUBE_STORAGE_PREFIX = "KYLIN_"; private static final Log logger = LogFactory.getLog(HBaseMiniclusterMetadataTestCase.class); @@ -57,38 +61,18 @@ Runtime.getRuntime().addShutdownHook(new Thread() { @Override public void run() { - try { - UTIL.shutdownMiniMapReduceCluster(); - } catch (Exception e) { - e.printStackTrace(); - } - - try { - UTIL.shutdownMiniCluster(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + shutdownMiniCluster(); } }); } - @Override - public void createTestMetadata() { - // do nothing, as the Test metadata has been initialized in BeforeClass - staticCreateTestMetadata(MINICLUSTER_TEST_DATA); - - // Overwrite the hbase url with the minicluster's - updateKylinConfigWithMinicluster(); - } - /** * Start the minicluster; Sub-classes should invoke this in BeforeClass method. * * @throws Exception */ public static void startupMinicluster() throws Exception { - staticCreateTestMetadata(MINICLUSTER_TEST_DATA); + HBaseMetadataTestCase.staticCreateTestMetadata(HBaseMetadataTestCase.MINICLUSTER_TEST_DATA); if (!clusterStarted) { synchronized (HBaseMiniclusterMetadataTestCase.class) { @@ -104,7 +88,7 @@ public static void startupMinicluster() throws Exception { private static void updateKylinConfigWithMinicluster() { - KylinConfig.getInstanceFromEnv().setMetadataUrl("kylin_metadata_qa@" + hbaseconnectionUrl); + KylinConfig.getInstanceFromEnv().setMetadataUrl(TEST_METADATA_TABLE + "@" + hbaseconnectionUrl); KylinConfig.getInstanceFromEnv().setStorageUrl(hbaseconnectionUrl); } @@ -127,21 +111,19 @@ private static void startupMiniClusterAndImportData() throws Exception { config.set(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, "60000"); hbaseconnectionUrl = "hbase:" + host + ":" + port + ":" + parent; - - UTIL.startMiniMapReduceCluster(); updateKylinConfigWithMinicluster(); + + UTIL.startMiniMapReduceCluster(); + // create the metadata htables; HBaseResourceStore store = new HBaseResourceStore(KylinConfig.getInstanceFromEnv()); // import the table content - importHBaseData(true,true); + importHBaseData(); } - public static void importHBaseData(boolean importMetadataTables, boolean importCubeTables) throws IOException, ClassNotFoundException, InterruptedException { - - if (!importMetadataTables && !importCubeTables) - return; + public static void importHBaseData() throws IOException, ClassNotFoundException, InterruptedException { if (System.getenv("JAVA_HOME") == null) { System.err.println("Didn't find $JAVA_HOME, this will cause HBase data import failed. Please set $JAVA_HOME."); @@ -178,11 +160,11 @@ public static void importHBaseData(boolean importMetadataTables, boolean importC for (String table : tableNames) { - if (!(table.equalsIgnoreCase("kylin_metadata_qa") && importMetadataTables || table.startsWith("KYLIN_") && importCubeTables)) { + if (!(table.equalsIgnoreCase(TEST_METADATA_TABLE) || table.startsWith(CUBE_STORAGE_PREFIX))) { continue; } - if (table.startsWith("KYLIN_")) { + if (table.startsWith(CUBE_STORAGE_PREFIX)) { // create the cube table; otherwise the import will fail. HBaseConnection.createHTableIfNeeded(KylinConfig.getInstanceFromEnv().getStorageUrl(), table, "F1", "F2"); } @@ -209,17 +191,11 @@ private static boolean runImport(String[] args) throws IOException, InterruptedE return job.isSuccessful(); } - @Override - public void cleanupTestMetadata() { - staticCleanupTestMetadata(); - } - /** - * Shutdown the minicluster; Sub-classes should invoke this method in AfterClass method. + * Shutdown the minicluster; */ public static void shutdownMiniCluster() { - /* System.out.println("Going to shutdown mini cluster."); try { UTIL.shutdownMiniMapReduceCluster(); @@ -232,18 +208,15 @@ public static void shutdownMiniCluster() { } catch (Exception e) { e.printStackTrace(); } - */ } public static void main(String[] args) { HBaseMiniclusterMetadataTestCase t = new HBaseMiniclusterMetadataTestCase(); try { HBaseMiniclusterMetadataTestCase.startupMinicluster(); - t.createTestMetadata(); } catch (Exception e) { e.printStackTrace(); } finally { - t.cleanupTestMetadata(); HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); } } diff --git a/job/src/test/java/com/kylinolap/job/ExportHBaseData.java b/job/src/test/java/com/kylinolap/job/ExportHBaseData.java index 76daa43..15e7005 100644 --- a/job/src/test/java/com/kylinolap/job/ExportHBaseData.java +++ b/job/src/test/java/com/kylinolap/job/ExportHBaseData.java @@ -11,6 +11,7 @@ import com.kylinolap.common.persistence.HBaseConnection; import com.kylinolap.common.util.AbstractKylinTestCase; import com.kylinolap.common.util.CliCommandExecutor; +import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; import com.kylinolap.common.util.SSHClient; public class ExportHBaseData { @@ -91,8 +92,7 @@ public void exportTables() throws IOException { for (HTableDescriptor table : allTables) { String tName = table.getNameAsString(); - if (!tName.startsWith(tableNameBase) && !tName.startsWith("KYLIN_")) -// if (!tName.equals(tableNameBase) ) // this is for debug + if (!tName.equals(tableNameBase) && !tName.startsWith(HBaseMiniclusterMetadataTestCase.CUBE_STORAGE_PREFIX)) continue; cli.execute("hbase org.apache.hadoop.hbase.mapreduce.Export " + tName + " " + exportFolder + tName); diff --git a/job/src/test/java/com/kylinolap/job/ImportHBaseData.java b/job/src/test/java/com/kylinolap/job/ImportHBaseData.java index d683ac3..e4165a1 100644 --- a/job/src/test/java/com/kylinolap/job/ImportHBaseData.java +++ b/job/src/test/java/com/kylinolap/job/ImportHBaseData.java @@ -15,6 +15,7 @@ import com.kylinolap.common.persistence.HBaseResourceStore; import com.kylinolap.common.util.AbstractKylinTestCase; import com.kylinolap.common.util.CliCommandExecutor; +import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; import com.kylinolap.common.util.SSHClient; import com.kylinolap.common.util.TarGZUtil; @@ -78,11 +79,11 @@ public void importTables() throws IOException { for (String tableLocation : tablelocations) { String table = tableLocation.substring(tableLocation.lastIndexOf("/") + 1); - if (!(table.equalsIgnoreCase("kylin_metadata_qa") || table.startsWith("KYLIN_"))) { + if (!(table.equalsIgnoreCase(tableNameBase) || table.startsWith(HBaseMiniclusterMetadataTestCase.CUBE_STORAGE_PREFIX))) { continue; } - if (table.startsWith("KYLIN_")) { + if (table.startsWith(HBaseMiniclusterMetadataTestCase.CUBE_STORAGE_PREFIX)) { // create the cube table; otherwise the import will fail. HBaseConnection.createHTableIfNeeded(KylinConfig.getInstanceFromEnv().getStorageUrl(), table, "F1", "F2"); } diff --git a/pom.xml b/pom.xml index 0355d11..7d63357 100644 --- a/pom.xml +++ b/pom.xml @@ -529,10 +529,12 @@ **/BuildCubeWithEngineTest.java **/SampleCubeSetupTest.java **/KylinQueryTest.java + **/SnapshotManagerTest.java + **/SampleCubeSetupTest.java - querySkipUsingMinicluster + useSandbox false @@ -549,7 +551,37 @@ - e2e + sandbox + + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + + **/BuildCubeWithEngineTest.java + **/SampleCubeSetupTest.java + **/KylinQueryTest.java + + + + useSandbox + true + + + buildCubeUsingProvidedData + false + + + + + + + diff --git a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java index 535b621..e65db4a 100644 --- a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java +++ b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java @@ -32,9 +32,7 @@ import org.junit.Test; import com.kylinolap.common.KylinConfig; -import com.kylinolap.common.util.AbstractKylinTestCase; import com.kylinolap.common.util.HBaseMetadataTestCase; -import com.kylinolap.common.util.HBaseMiniclusterMetadataTestCase; import com.kylinolap.cube.CubeManager; import com.kylinolap.metadata.project.ProjectInstance; import com.kylinolap.query.enumerator.OLAPQuery; @@ -62,13 +60,7 @@ protected static void setupAll() throws Exception { } private static void setUpEnv() throws Exception { - - if (HBaseMetadataTestCase.useMiniCluster()) { - HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.MINICLUSTER_TEST_DATA); - HBaseMiniclusterMetadataTestCase.startupMinicluster(); - } else { - HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA); - } + HBaseMetadataTestCase.staticCreateTestMetadata(); config = KylinConfig.getInstanceFromEnv(); } @@ -104,9 +96,6 @@ protected static void clean() { closeConnection(h2Connection); ObserverEnabler.forceCoprocessorUnset(); - if (HBaseMetadataTestCase.useMiniCluster()) { - HBaseMiniclusterMetadataTestCase.shutdownMiniCluster(); - } HBaseMetadataTestCase.staticCleanupTestMetadata(); }