Change in asterixdb[master]: [NO ISSUE][TEST] Test framework refactoring

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3152

Change subject: [NO ISSUE][TEST] Test framework refactoring
......................................................................

[NO ISSUE][TEST] Test framework refactoring

Change-Id: Ib7347cd9c94c9377e6b8223ea1aaee59f923a3be
---
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
M 
asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
3 files changed, 22 insertions(+), 2 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/52/3152/1

diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 282d83d..aed65e6 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -1620,6 +1620,11 @@
 
     public void executeTest(String actualPath, TestCaseContext testCaseCtx, 
ProcessBuilder pb,
             boolean isDmlRecoveryTest, TestGroup failedGroup) throws Exception 
{
+        executeTest(actualPath, testCaseCtx, pb, isDmlRecoveryTest, 
failedGroup, null);
+    }
+
+    public void executeTest(String actualPath, TestCaseContext testCaseCtx, 
ProcessBuilder pb,
+            boolean isDmlRecoveryTest, TestGroup failedGroup, TestGroup 
passedGroup) throws Exception {
         MutableInt queryCount = new MutableInt(0);
         int numOfErrors = 0;
         int numOfFiles = 0;
@@ -1679,6 +1684,9 @@
                     }
                     LOGGER.info(
                             "[TEST]: " + 
testCaseCtx.getTestCase().getFilePath() + "/" + cUnit.getName() + " PASSED ");
+                    if (passedGroup != null) {
+                        
passedGroup.getTestCase().add(testCaseCtx.getTestCase());
+                    }
                 }
             }
         }
diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
index 75eccfd..cefd292 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
@@ -56,10 +56,15 @@
     private static final boolean cleanupOnStop = true;
     private static final List<String> badTestCases = new ArrayList<>();
     private static TestExecutor testExecutor;
+    private static File baseDir = new File(".");
 
     private static ExternalUDFLibrarian librarian;
     private static final int repeat = Integer.getInteger("test.repeat", 1);
     private static boolean checkStorageDistribution = true;
+
+    public static void setBaseDir(File baseDir) {
+        LangExecutionUtil.baseDir = baseDir;
+    }
 
     public static void setUp(String configFile, TestExecutor executor) throws 
Exception {
         setUp(configFile, executor, false);
@@ -109,7 +114,7 @@
     protected static Collection<Object[]> buildTestsInXml(String xmlfile) 
throws Exception {
         Collection<Object[]> testArgs = new ArrayList<>();
         TestCaseContext.Builder b = new TestCaseContext.Builder();
-        for (TestCaseContext ctx : b.build(new File(PATH_BASE), xmlfile)) {
+        for (TestCaseContext ctx : b.build(new File(baseDir, PATH_BASE), 
xmlfile)) {
             testArgs.add(new Object[] { ctx });
         }
         return testArgs;
diff --git 
a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
 
b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
index 7d0e3bf..859e0bf 100644
--- 
a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
+++ 
b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
@@ -252,9 +252,16 @@
         }
 
         public List<TestCaseContext> build(File tsRoot, String tsXMLFilePath) 
throws Exception {
-            File tsFile = new File(tsRoot, tsXMLFilePath);
+            return build(tsRoot, new File(tsRoot, tsXMLFilePath));
+        }
+
+        public List<TestCaseContext> build(File tsRoot, File tsFile) throws 
Exception {
             TestSuiteParser tsp = new TestSuiteParser();
             TestSuite ts = tsp.parse(tsFile);
+            return build(tsRoot, ts);
+        }
+
+        public List<TestCaseContext> build(File tsRoot, TestSuite ts) throws 
Exception {
             List<TestCaseContext> tccs = new ArrayList<>();
             List<TestGroup> tgPath = new ArrayList<>();
             addContexts(tsRoot, ts, tgPath, ts.getTestGroup(), tccs);

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3152
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7347cd9c94c9377e6b8223ea1aaee59f923a3be
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>