From 7b8cbb17ca041e7b818d6c073e95e25261febc7b Mon Sep 17 00:00:00 2001
From: Dennis van der Wals <dennis@vdwals.de>
Date: Thu, 9 Nov 2023 16:08:48 +0100
Subject: [PATCH] Merged new tests into existing transformation test

---
 ...ced-json-output-grouping-unit-testing.hpl} |   0
 ...=> 0068-enhanced-json-output-grouping.hpl} |   0
 .../main-0068-enhanced-json-2927.hwf          |  90 ++++++++++-
 .../main-0069-enhanced-json-grouping.hwf      | 147 ------------------
 ... => 0068-enhanced-json-grouping-test.json} |   4 +-
 5 files changed, 85 insertions(+), 156 deletions(-)
 rename integration-tests/transforms/{0069-enhanced-json-output-grouping-unit-testing.hpl => 0068-enhanced-json-output-grouping-unit-testing.hpl} (100%)
 rename integration-tests/transforms/{0069-enhanced-json-output-grouping.hpl => 0068-enhanced-json-output-grouping.hpl} (100%)
 delete mode 100644 integration-tests/transforms/main-0069-enhanced-json-grouping.hwf
 rename integration-tests/transforms/metadata/unit-test/{0069-enhanced-json-grouping-test.json => 0068-enhanced-json-grouping-test.json} (93%)

diff --git a/integration-tests/transforms/0069-enhanced-json-output-grouping-unit-testing.hpl b/integration-tests/transforms/0068-enhanced-json-output-grouping-unit-testing.hpl
similarity index 100%
rename from integration-tests/transforms/0069-enhanced-json-output-grouping-unit-testing.hpl
rename to integration-tests/transforms/0068-enhanced-json-output-grouping-unit-testing.hpl
diff --git a/integration-tests/transforms/0069-enhanced-json-output-grouping.hpl b/integration-tests/transforms/0068-enhanced-json-output-grouping.hpl
similarity index 100%
rename from integration-tests/transforms/0069-enhanced-json-output-grouping.hpl
rename to integration-tests/transforms/0068-enhanced-json-output-grouping.hpl
diff --git a/integration-tests/transforms/main-0068-enhanced-json-2927.hwf b/integration-tests/transforms/main-0068-enhanced-json-2927.hwf
index 7fd88c5028b..30fae18c058 100644
--- a/integration-tests/transforms/main-0068-enhanced-json-2927.hwf
+++ b/integration-tests/transforms/main-0068-enhanced-json-2927.hwf
@@ -60,8 +60,6 @@ limitations under the License.
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
       <filename>${PROJECT_HOME}/0068-enhanced-json-output-empty-stream.hpl</filename>
-      <logext/>
-      <logfile/>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -83,8 +81,8 @@ limitations under the License.
       <attributes/>
       <always_log_rows>N</always_log_rows>
       <parallel>N</parallel>
-      <xloc>640</xloc>
-      <yloc>48</yloc>
+      <xloc>736</xloc>
+      <yloc>224</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -93,8 +91,51 @@ limitations under the License.
       <type>DUMMY</type>
       <attributes/>
       <parallel>N</parallel>
-      <xloc>336</xloc>
-      <yloc>160</yloc>
+      <xloc>1264</xloc>
+      <yloc>48</yloc>
+      <attributes_hac/>
+    </action>
+    <action>
+      <name>0068-enhanced-json-output-grouping.hpl</name>
+      <description/>
+      <type>PIPELINE</type>
+      <attributes/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <clear_files>N</clear_files>
+      <clear_rows>N</clear_rows>
+      <create_parent_folder>N</create_parent_folder>
+      <exec_per_row>N</exec_per_row>
+      <filename>${PROJECT_HOME}/0068-enhanced-json-output-grouping.hpl</filename>
+      <logext/>
+      <logfile/>
+      <loglevel>Basic</loglevel>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <params_from_previous>N</params_from_previous>
+      <run_configuration>direct</run_configuration>
+      <set_append_logfile>N</set_append_logfile>
+      <set_logfile>N</set_logfile>
+      <wait_until_finished>Y</wait_until_finished>
+      <parallel>N</parallel>
+      <xloc>736</xloc>
+      <yloc>48</yloc>
+      <attributes_hac/>
+    </action>
+    <action>
+      <name>Run Pipeline Unit Tests</name>
+      <description/>
+      <type>RunPipelineTests</type>
+      <attributes/>
+      <test_names>
+        <test_name>
+          <name>0068-enhanced-json-grouping-test</name>
+        </test_name>
+      </test_names>
+      <parallel>N</parallel>
+      <xloc>1040</xloc>
+      <yloc>48</yloc>
       <attributes_hac/>
     </action>
   </actions>
@@ -114,12 +155,47 @@ limitations under the License.
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>0068-enhanced-json-output-empty-stream.hpl</from>
+      <from>0068-enhanced-json-output-grouping.hpl</from>
+      <to>Run Pipeline Unit Tests</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>Run Pipeline Unit Tests</from>
       <to>ok</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>0068-enhanced-json-output-empty-stream.hpl</from>
+      <to>0068-enhanced-json-output-grouping.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>0068-enhanced-json-output-grouping.hpl</from>
+      <to>Run Pipeline Unit Tests</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>0068-enhanced-json-output-grouping.hpl</from>
+      <to>not ok</to>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>Run Pipeline Unit Tests</from>
+      <to>not ok</to>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/integration-tests/transforms/main-0069-enhanced-json-grouping.hwf b/integration-tests/transforms/main-0069-enhanced-json-grouping.hwf
deleted file mode 100644
index 50b44cbad2a..00000000000
--- a/integration-tests/transforms/main-0069-enhanced-json-grouping.hwf
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--->
-<workflow>
-  <name>main-0069-enhanced-json-grouping</name>
-  <name_sync_with_filename>Y</name_sync_with_filename>
-  <description/>
-  <extended_description/>
-  <workflow_version/>
-  <created_user>-</created_user>
-  <created_date>2023/11/07 21:34:50.471</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2023/11/07 21:34:50.471</modified_date>
-  <parameters>
-    </parameters>
-  <actions>
-    <action>
-      <name>Start</name>
-      <description/>
-      <type>SPECIAL</type>
-      <attributes/>
-      <DayOfMonth>1</DayOfMonth>
-      <hour>12</hour>
-      <intervalMinutes>60</intervalMinutes>
-      <intervalSeconds>0</intervalSeconds>
-      <minutes>0</minutes>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <weekDay>1</weekDay>
-      <parallel>N</parallel>
-      <xloc>50</xloc>
-      <yloc>50</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>0069-enhanced-json-output-grouping.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/0069-enhanced-json-output-grouping.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>direct</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>304</xloc>
-      <yloc>48</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Success</name>
-      <description/>
-      <type>SUCCESS</type>
-      <attributes/>
-      <parallel>N</parallel>
-      <xloc>752</xloc>
-      <yloc>48</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Failed</name>
-      <description/>
-      <type>ABORT</type>
-      <attributes/>
-      <always_log_rows>N</always_log_rows>
-      <parallel>N</parallel>
-      <xloc>304</xloc>
-      <yloc>192</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Run Pipeline Unit Tests</name>
-      <description/>
-      <type>RunPipelineTests</type>
-      <attributes/>
-      <test_names>
-        <test_name>
-          <name>0069-enhanced-json-grouping-test</name>
-        </test_name>
-      </test_names>
-      <parallel>N</parallel>
-      <xloc>560</xloc>
-      <yloc>48</yloc>
-      <attributes_hac/>
-    </action>
-  </actions>
-  <hops>
-    <hop>
-      <from>Start</from>
-      <to>0069-enhanced-json-output-grouping.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>0069-enhanced-json-output-grouping.hpl</from>
-      <to>Failed</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>0069-enhanced-json-output-grouping.hpl</from>
-      <to>Run Pipeline Unit Tests</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Run Pipeline Unit Tests</from>
-      <to>Success</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-  </hops>
-  <notepads>
-  </notepads>
-  <attributes/>
-</workflow>
diff --git a/integration-tests/transforms/metadata/unit-test/0069-enhanced-json-grouping-test.json b/integration-tests/transforms/metadata/unit-test/0068-enhanced-json-grouping-test.json
similarity index 93%
rename from integration-tests/transforms/metadata/unit-test/0069-enhanced-json-grouping-test.json
rename to integration-tests/transforms/metadata/unit-test/0068-enhanced-json-grouping-test.json
index ec40af2a336..fb84adaad9b 100644
--- a/integration-tests/transforms/metadata/unit-test/0069-enhanced-json-grouping-test.json
+++ b/integration-tests/transforms/metadata/unit-test/0068-enhanced-json-grouping-test.json
@@ -61,10 +61,10 @@
       "transform_name": "CSV file input"
     }
   ],
-  "name": "0069-enhanced-json-grouping-test",
+  "name": "0068-enhanced-json-grouping-test",
   "description": "",
   "persist_filename": "",
   "trans_test_tweaks": [],
-  "pipeline_filename": "./0069-enhanced-json-output-grouping-unit-testing.hpl",
+  "pipeline_filename": "./0068-enhanced-json-output-grouping-unit-testing.hpl",
   "test_type": "UNIT_TEST"
 }
\ No newline at end of file