[kylin] 05/11: Move out the wrong execute metadata to a test folder

[liyang]

This is an automated email from the ASF dual-hosted git repository.

liyang pushed a commit to branch sync
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 4b2ead2c5d3b9f465a166416477972741a016b5c
Author: nichunen <chunen...@kyligence.io>
AuthorDate: Thu Feb 8 18:54:51 2018 +0800

    Move out the wrong execute metadata to a test folder
---
 .../org/apache/kylin/common/util/LocalFileMetadataTestCase.java     | 6 +++++-
 .../src/test/java/org/apache/kylin/job/ExecutableManagerTest.java   | 2 +-
 .../broken_executable}/execute/d9a2b721-9916-4607-8047-148ceb2473b1 | 0
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java
 
b/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java
index 94c014e..5e6b840 100644
--- 
a/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java
+++ 
b/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java
@@ -33,7 +33,7 @@ public class LocalFileMetadataTestCase extends 
AbstractKylinTestCase {
     @Override
     public void createTestMetadata(String... overlayMetadataDirs) {
         //overlayMetadataDirs is useless yet
-        staticCreateTestMetadata();
+        staticCreateTestMetadata(overlayMetadataDirs);
     }
 
     public static void staticCreateTestMetadata(String... overlayMetadataDirs) 
{
@@ -44,6 +44,10 @@ public class LocalFileMetadataTestCase extends 
AbstractKylinTestCase {
         try {
             FileUtils.deleteDirectory(new File(tempTestMetadataUrl));
             FileUtils.copyDirectory(new File(testDataFolder), new 
File(tempTestMetadataUrl));
+
+            for (String overlay : overlayMetadataDirs) {
+                FileUtils.copyDirectory(new File(overlay), new 
File(tempTestMetadataUrl));
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git 
a/core-job/src/test/java/org/apache/kylin/job/ExecutableManagerTest.java 
b/core-job/src/test/java/org/apache/kylin/job/ExecutableManagerTest.java
index 73f0410..3535d37 100644
--- a/core-job/src/test/java/org/apache/kylin/job/ExecutableManagerTest.java
+++ b/core-job/src/test/java/org/apache/kylin/job/ExecutableManagerTest.java
@@ -45,7 +45,7 @@ public class ExecutableManagerTest extends 
LocalFileMetadataTestCase {
 
     @Before
     public void setup() throws Exception {
-        createTestMetadata();
+        
createTestMetadata("../server/src/test/resources/ut_meta/broken_executable");
         service = 
ExecutableManager.getInstance(KylinConfig.getInstanceFromEnv());
     }
 
diff --git 
a/examples/test_case_data/localmeta/execute/d9a2b721-9916-4607-8047-148ceb2473b1
 
b/server/src/test/resources/ut_meta/broken_executable/execute/d9a2b721-9916-4607-8047-148ceb2473b1
similarity index 100%
rename from 
examples/test_case_data/localmeta/execute/d9a2b721-9916-4607-8047-148ceb2473b1
rename to 
server/src/test/resources/ut_meta/broken_executable/execute/d9a2b721-9916-4607-8047-148ceb2473b1

-- 
To stop receiving notification emails like this one, please contact
liy...@apache.org.