You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/01/31 13:02:05 UTC
[38/50] incubator-kylin git commit: fix ci
fix ci
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/12676d9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/12676d9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/12676d9c
Branch: refs/heads/inverted-index
Commit: 12676d9c3b9281682b741884e0b6d56324ce3f71
Parents: e087f65
Author: qianhao.zhou <qi...@ebay.com>
Authored: Thu Jan 29 17:09:34 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Thu Jan 29 17:09:34 2015 +0800
----------------------------------------------------------------------
.../common/util/LocalFileMetadataTestCase.java | 19 ++++----
.../rest/service/CacheServiceTest.java | 50 ++++++++++++--------
2 files changed, 41 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/12676d9c/common/src/main/java/com/kylinolap/common/util/LocalFileMetadataTestCase.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/com/kylinolap/common/util/LocalFileMetadataTestCase.java b/common/src/main/java/com/kylinolap/common/util/LocalFileMetadataTestCase.java
index 20423ea..d6ebc1e 100644
--- a/common/src/main/java/com/kylinolap/common/util/LocalFileMetadataTestCase.java
+++ b/common/src/main/java/com/kylinolap/common/util/LocalFileMetadataTestCase.java
@@ -29,20 +29,18 @@ import com.kylinolap.common.persistence.ResourceStore;
*/
public class LocalFileMetadataTestCase extends AbstractKylinTestCase {
- protected String tempTestMetadataUrl = null;
-
@Override
public void createTestMetadata() {
createTestMetadata(LOCALMETA_TEST_DATA);
}
- public void createTestMetadata(String test_data_folder) {
+ public static void createTestMetadata(String testDataFolder) {
KylinConfig.destoryInstance();
- this.tempTestMetadataUrl = "../examples/test_metadata";
+ String tempTestMetadataUrl = "../examples/test_metadata";
try {
FileUtils.deleteDirectory(new File(tempTestMetadataUrl));
- FileUtils.copyDirectory(new File(test_data_folder), new File(tempTestMetadataUrl));
+ FileUtils.copyDirectory(new File(testDataFolder), new File(tempTestMetadataUrl));
} catch (IOException e) {
e.printStackTrace();
}
@@ -51,18 +49,21 @@ public class LocalFileMetadataTestCase extends AbstractKylinTestCase {
System.setProperty(KylinConfig.KYLIN_CONF, tempTestMetadataUrl);
KylinConfig.getInstanceFromEnv().setMetadataUrl(tempTestMetadataUrl);
-
}
- @Override
- public void cleanupTestMetadata() {
+ public static void cleanAfterClass() {
+ String tempTestMetadataUrl = "../examples/test_metadata";
try {
FileUtils.deleteDirectory(new File(tempTestMetadataUrl));
} catch (IOException e) {
throw new IllegalStateException("Can't delete directory " + tempTestMetadataUrl, e);
}
staticCleanupTestMetadata();
- this.tempTestMetadataUrl = null;
+ }
+
+ @Override
+ public void cleanupTestMetadata() {
+ cleanAfterClass();
}
protected ResourceStore getStore() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/12676d9c/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java b/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
index 1020791..b1fffce 100644
--- a/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
+++ b/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
@@ -36,29 +36,27 @@ import static org.junit.Assert.*;
public class CacheServiceTest extends LocalFileMetadataTestCase {
- private Server server;
+ private static Server server;
- private KylinConfig configA;
- private KylinConfig configB;
+ private static KylinConfig configA;
+ private static KylinConfig configB;
private static final Logger logger = org.slf4j.LoggerFactory.getLogger(CacheServiceTest.class);
- private AtomicLong counter = new AtomicLong();
+ private static AtomicLong counter = new AtomicLong();
- @Before
- public void setUp() throws Exception {
- this.createTestMetadata();
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ createTestMetadata(LOCALMETA_TEST_DATA);
+ configA = KylinConfig.getInstanceFromEnv();
+ configB = KylinConfig.getKylinConfigFromInputStream(KylinConfig.getKylinPropertiesAsInputSteam());
+ configB.setMetadataUrl("../examples/test_metadata");
server = new Server(7070);
-
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
server.setHandler(context);
- configA = KylinConfig.getInstanceFromEnv();
- configB = KylinConfig.getKylinConfigFromInputStream(KylinConfig.getKylinPropertiesAsInputSteam());
- configB.setMetadataUrl(tempTestMetadataUrl);
-
context.addServlet(new ServletHolder(new BroadcasterReceiveServlet(new BroadcasterReceiveServlet.BroadcasterHandler() {
@Override
public void handle(String type, String name, String event) {
@@ -87,11 +85,29 @@ public class CacheServiceTest extends LocalFileMetadataTestCase {
}
})), "/");
server.start();
+ }
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ cleanAfterClass();
+ server.stop();
+ }
+
+ @Before
+ public void setUp() throws Exception {
counter.set(0L);
}
+ @After
+ public void after() throws Exception {
+ }
+
private void waitForCounterAndClear(long count) {
- while (!counter.compareAndSet(count, 0L)) {
+ int retryTimes = 0;
+ while ((!counter.compareAndSet(count, 0L))) {
+ if (++retryTimes > 30) {
+ throw new RuntimeException("timeout");
+ }
try {
Thread.sleep(100L);
} catch (InterruptedException e) {
@@ -100,12 +116,6 @@ public class CacheServiceTest extends LocalFileMetadataTestCase {
}
}
- @After
- public void after() throws Exception {
- this.cleanupTestMetadata();
- server.stop();
- }
-
@BeforeClass
public static void startServer() throws Exception {
@@ -146,6 +156,8 @@ public class CacheServiceTest extends LocalFileMetadataTestCase {
assertTrue(!getCubeDescManager(configA).equals(getCubeDescManager(configB)));
assertTrue(!getProjectManager(configA).equals(getProjectManager(configB)));
assertTrue(!getMetadataManager(configA).equals(getMetadataManager(configB)));
+
+ assertEquals(getProjectManager(configA).listAllProjects().size(), getProjectManager(configB).listAllProjects().size());
}
@Test