[asterixdb] branch master updated: [NO ISSUE][TEST] Change output dir in SqlppRQGTestBase

[dlych]

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

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new a4b434a  [NO ISSUE][TEST] Change output dir in SqlppRQGTestBase
a4b434a is described below

commit a4b434a1030a10ca3d487b57aeced2f846ed5cae
Author: Dmitry Lychagin <dmitry.lycha...@couchbase.com>
AuthorDate: Wed Oct 14 15:10:50 2020 -0700

    [NO ISSUE][TEST] Change output dir in SqlppRQGTestBase
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    - SqlppRQGTestBase should use subclass
      name for output directory name
    
    Change-Id: I022aa1b8764817490490f2cae62ea56e5f28133b
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8424
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Dmitry Lychagin <dmitry.lycha...@couchbase.com>
    Reviewed-by: Ali Alsuliman <ali.al.solai...@gmail.com>
---
 .../java/org/apache/asterix/test/runtime/SqlppRQGTestBase.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppRQGTestBase.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppRQGTestBase.java
index 44af727..0c13cdf 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppRQGTestBase.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppRQGTestBase.java
@@ -87,8 +87,6 @@ public abstract class SqlppRQGTestBase {
 
     protected static final char TABLE_FILE_COLUMN_SEPARATOR = '|';
 
-    protected static final Path RESULT_OUTPUT_DIR = Paths.get("target", 
SqlppRQGGroupingSetsIT.class.getSimpleName());
-
     protected static final String UNIQUE_1 = "unique1";
     protected static final String UNIQUE_2 = "unique2";
     protected static final String TWO = "two";
@@ -118,10 +116,11 @@ public abstract class SqlppRQGTestBase {
 
     protected static Statement stmt;
 
+    protected final Path outputDir = Paths.get("target", 
getClass().getSimpleName());
+
     public static void setUpBeforeClass() throws Exception {
         startAsterix();
         startPostgres();
-        FileUtils.forceMkdir(RESULT_OUTPUT_DIR.toFile());
     }
 
     public static void tearDownAfterClass() throws Exception {
@@ -330,8 +329,10 @@ public abstract class SqlppRQGTestBase {
     }
 
     protected File writeResult(ArrayNode result, int testcaseId, String 
resultKind, String comment) throws IOException {
+        File outDir = outputDir.toFile();
         String outFileName = String.format("%d.%s.txt", testcaseId, 
resultKind);
-        File outFile = new File(RESULT_OUTPUT_DIR.toFile(), outFileName);
+        FileUtils.forceMkdir(outDir);
+        File outFile = new File(outDir, outFileName);
         try (PrintWriter pw = new PrintWriter(outFile, 
StandardCharsets.UTF_8.name())) {
             pw.print("---");
             pw.println(comment);