Fix ML 9 unit tests

Author: Ryan Dew

marklogic-data-hub/src/test/java/com/marklogic/hub/job/TracingTest.java

@@ -22,12 +22,13 @@
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.RawStructuredQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
+import com.marklogic.hub.ApplicationConfig;
 import com.marklogic.hub.HubConfig;
 import com.marklogic.hub.HubTestBase;
 import com.marklogic.hub.Tracing;
-import com.marklogic.hub.ApplicationConfig;
 import com.marklogic.hub.flow.Flow;
 import com.marklogic.hub.flow.FlowRunner;
+import com.marklogic.hub.impl.Versions;
 import org.apache.commons.io.FileUtils;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.jupiter.api.AfterEach;
@@ -43,21 +44,27 @@
 import java.net.URISyntaxException;
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = { ApplicationConfig.class})
+@ContextConfiguration(classes = {ApplicationConfig.class})
 public class TracingTest extends HubTestBase {
 
-    private static final String BINARY_HEX_ENCODED_XQY = "89504e470d0a1a0a0000000d494844520000000d0000001308060000004b378797000000017352474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b1300000b1301009a9c180000000774494d4507da0811012332d018a204000002af4944415428cf9592cb6e1c4500454f555757573fc6f3308e9f40ac286c909122082b36acf317ec59b2e4a7f8098422a17889402436a3d8c61ecfabbba7bbebc502943d573afb239d2bbeffe1c7d7428849aa539565d9814a9298ea340a04ce39a15325807bebbccb8d591963be534aabaf46d98caa2c383898b13fdb23cd6054569455c5fe74c2d9c95159b73b16cb3521c673a9303c7966397aeee9d47bfe5afc815639c664e42623d50a21252a4970ced1b4bb4e4a34c5f192a75f248cceeff8fdfe35432bf13e60ad63182c2104ac7338ef8921a02c35b7bf1e53ff2610ea635e9c5e90950e44865209b9314829d15a93e7062913a9bc77d44d438c91e9788cd18675bdc5c788f39ec7e58af5664bbbeb98dfdc320cb6550021044288586769bb0e1f5204026b2d006591635d40a72926334a299532998cd199444a49a14b9e1c8d1915157b7b15fbfb5366d329fd60b9b9bb67d7f7a954b1e2f0c50d2f5fc1f4e22dbf5cff44b791f8e0e9074bddb48410e8fb9eaeefb1838dcac78ef575c9add30ced8cd3598e5001008440fe479224a4a98288508e8e873fa7ec6e2db3e909cf8ff791da12a2012211e807cb765bf3f0b0a06e765e451fb1b1c14618a2e261e5c8bb9cb6ed596d362c168fbcbb9e7f501dac8b4a2a8949a648afc06ac6e50c530acabca42c4baaaae4ecf888c13996eb2d314425534a0e2f167cfeada338fb9babd51b525191e739459e331e555455894e53acb5f4d646e93de8d23239481145cd7cf1166f81183fdce7df8e81444a887150cbe68eab9f3fe5fe32a0d353befee44bcc28a0544296698a3c474a496e0c7be3316f2e2fbf519f3d3b6f04b2cc32c5a82cf00cdc3f3cd2343bd6db86f56643bbdbd1b41d8be5aadf6eeb97eae4a3c92ba1d2a70879e87c98eefabe68ba906cb60d4a253ed5babb9ebf5f393bdcd59bf595526a2e628cfcdffd03c6146669f7b691ab0000000049454e44ae426082";
-    private static final String BINARY_HEX_ENCODED_SJS = "89504e470d0a1a0a0000000d494844520000000d0000001308060000004b378797000000017352474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b1300000b1301009a9c180000000774494d4507da0811012332d018a204000002af4944415428cf9592cb6e1c4500454f555757573fc6f3308e9f40ac286c909122082b36acf317ec59b2e4a7f8098422a17889402436a3d8c61ecfabbba7bbebc502943d573afb239d2bbeffe1c7d7428849aa539565d9814a9298ea340a04ce39a15325807bebbccb8d591963be534aabaf46d98caa2c383898b13fdb23cd6054569455c5fe74c2d9c95159b73b16cb3521c673a9303c7966397aeee9d47bfe5afc815639c664e42623d50a21252a4970ced1b4bb4e4a34c5f192a75f248cceeff8fdfe35432bf13e60ad63182c2104ac7338ef8921a02c35b7bf1e53ff2610ea635e9c5e90950e44865209b9314829d15a93e7062913a9bc77d44d438c91e9788cd18675bdc5c788f39ec7e58af5664bbbeb98dfdc320cb6550021044288586769bb0e1f5204026b2d006591635d40a72926334a299532998cd199444a49a14b9e1c8d1915157b7b15fbfb5366d329fd60b9b9bb67d7f7a954b1e2f0c50d2f5fc1f4e22dbf5cff44b791f8e0e9074bddb48410e8fb9eaeefb1838dcac78ef575c9add30ced8cd3598e5001008440fe479224a4a98288508e8e873fa7ec6e2db3e909cf8ff791da12a2012211e807cb765bf3f0b0a06e765e451fb1b1c14618a2e261e5c8bb9cb6ed596d362c168fbcbb9e7f501dac8b4a2a8949a648afc06ac6e50c530acabca42c4baaaae4ecf888c13996eb2d314425534a0e2f167cfeada338fb9babd51b525191e739459e331e555455894e53acb5f4d646e93de8d23239481145cd7cf1166f81183fdce7df8e81444a887150cbe68eab9f3fe5fe32a0d353befee44bcc28a0544296698a3c474a496e0c7be3316f2e2fbf519f3d3b6f04b2cc32c5a82cf00cdc3f3cd2343bd6db86f56643bbdbd1b41d8be5aadf6eeb97eae4a3c92ba1d2a70879e87c98eefabe68ba906cb60d4a253ed5babb9ebf5f393bdcd59bf595526a2e628cfcdffd03c6146669f7b691ab0000000049454e44ae426082";
+    private static final String BINARY_HEX_ENCODED_XQY =
+        "89504e470d0a1a0a0000000d494844520000000d0000001308060000004b378797000000017352474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b1300000b1301009a9c180000000774494d4507da0811012332d018a204000002af4944415428cf9592cb6e1c4500454f555757573fc6f3308e9f40ac286c909122082b36acf317ec59b2e4a7f8098422a17889402436a3d8c61ecfabbba7bbebc502943d573afb239d2bbeffe1c7d7428849aa539565d9814a9298ea340a04ce39a15325807bebbccb8d591963be534aabaf46d98caa2c383898b13fdb23cd6054569455c5fe74c2d9c95159b73b16cb3521c673a9303c7966397aeee9d47bfe5afc815639c664e42623d50a21252a4970ced1b4bb4e4a34c5f192a75f248cceeff8fdfe35432bf13e60ad63182c2104ac7338ef8921a02c35b7bf1e53ff2610ea635e9c5e90950e44865209b9314829d15a93e7062913a9bc77d44d438c91e9788cd18675bdc5c788f39ec7e58af5664bbbeb98dfdc320cb6550021044288586769bb0e1f5204026b2d006591635d40a72926334a299532998cd199444a49a14b9e1c8d1915157b7b15fbfb5366d329fd60b9b9bb67d7f7a954b1e2f0c50d2f5fc1f4e22dbf5cff44b791f8e0e9074bddb48410e8fb9eaeefb1838dcac78ef575c9add30ced8cd3598e5001008440fe479224a4a98288508e8e873fa7ec6e2db3e909cf8ff791da12a2012211e807cb765bf3f0b0a06e765e451fb1b1c14618a2e261e5c8bb9cb6ed596d362c168fbcbb9e7f501dac8b4a2a8949a648afc06ac6e50c530acabca42c4baaaae4ecf888c13996eb2d314425534a0e2f167cfeada338fb9babd51b525191e739459e331e555455894e53acb5f4d646e93de8d23239481145cd7cf1166f81183fdce7df8e81444a887150cbe68eab9f3fe5fe32a0d353befee44bcc28a0544296698a3c474a496e0c7be3316f2e2fbf519f3d3b6f04b2cc32c5a82cf00cdc3f3cd2343bd6db86f56643bbdbd1b41d8be5aadf6eeb97eae4a3c92ba1d2a70879e87c98eefabe68ba906cb60d4a253ed5babb9ebf5f393bdcd59bf595526a2e628cfcdffd03c6146669f7b691ab0000000049454e44ae426082";
+    private static final String BINARY_HEX_ENCODED_SJS =
+        "89504e470d0a1a0a0000000d494844520000000d0000001308060000004b378797000000017352474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b1300000b1301009a9c180000000774494d4507da0811012332d018a204000002af4944415428cf9592cb6e1c4500454f555757573fc6f3308e9f40ac286c909122082b36acf317ec59b2e4a7f8098422a17889402436a3d8c61ecfabbba7bbebc502943d573afb239d2bbeffe1c7d7428849aa539565d9814a9298ea340a04ce39a15325807bebbccb8d591963be534aabaf46d98caa2c383898b13fdb23cd6054569455c5fe74c2d9c95159b73b16cb3521c673a9303c7966397aeee9d47bfe5afc815639c664e42623d50a21252a4970ced1b4bb4e4a34c5f192a75f248cceeff8fdfe35432bf13e60ad63182c2104ac7338ef8921a02c35b7bf1e53ff2610ea635e9c5e90950e44865209b9314829d15a93e7062913a9bc77d44d438c91e9788cd18675bdc5c788f39ec7e58af5664bbbeb98dfdc320cb6550021044288586769bb0e1f5204026b2d006591635d40a72926334a299532998cd199444a49a14b9e1c8d1915157b7b15fbfb5366d329fd60b9b9bb67d7f7a954b1e2f0c50d2f5fc1f4e22dbf5cff44b791f8e0e9074bddb48410e8fb9eaeefb1838dcac78ef575c9add30ced8cd3598e5001008440fe479224a4a98288508e8e873fa7ec6e2db3e909cf8ff791da12a2012211e807cb765bf3f0b0a06e765e451fb1b1c14618a2e261e5c8bb9cb6ed596d362c168fbcbb9e7f501dac8b4a2a8949a648afc06ac6e50c530acabca42c4baaaae4ecf888c13996eb2d314425534a0e2f167cfeada338fb9babd51b525191e739459e331e555455894e53acb5f4d646e93de8d23239481145cd7cf1166f81183fdce7df8e81444a887150cbe68eab9f3fe5fe32a0d353befee44bcc28a0544296698a3c474a496e0c7be3316f2e2fbf519f3d3b6f04b2cc32c5a82cf00cdc3f3cd2343bd6db86f56643bbdbd1b41d8be5aadf6eeb97eae4a3c92ba1d2a70879e87c98eefabe68ba906cb60d4a253ed5babb9ebf5f393bdcd59bf595526a2e628cfcdffd03c6146669f7b691ab0000000049454e44ae426082";
+    private Versions markLogicVersion = null;
 
     @BeforeEach
     public void setup() throws IOException, URISyntaxException {
         XMLUnit.setIgnoreWhitespace(true);
         enableDebugging();
-        clearDatabases(HubConfig.DEFAULT_STAGING_NAME,  HubConfig.DEFAULT_JOB_NAME, HubConfig.DEFAULT_FINAL_NAME);
+        clearDatabases(HubConfig.DEFAULT_STAGING_NAME, HubConfig.DEFAULT_JOB_NAME, HubConfig.DEFAULT_FINAL_NAME);
         clearUserModules();
         deleteProjectDir();
         createProjectDir();
@@ -66,10 +73,13 @@ public void setup() throws IOException, URISyntaxException {
             new File("src/test/resources/tracing-test/plugins"),
             new File(PROJECT_PATH + "/plugins")
         );
+        if (markLogicVersion == null) {
+            markLogicVersion = new Versions(adminHubConfig);
+        }
         installUserModules(adminHubConfig, true);
         //Disable tracing that may have been enabled in previous tests
         Tracing.create(flowRunnerClient).disable();
-     }
+    }
 
     @AfterEach
     public void afterEach() {
@@ -80,6 +90,7 @@ public void afterEach() {
 
     @Test
     public void runXMLFlowSansTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -106,6 +117,7 @@ public void runXMLFlowSansTracing() {
 
     @Test
     public void runJSONFlowSansTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -127,6 +139,7 @@ public void runJSONFlowSansTracing() {
 
     @Test
     public void runXMLFlowWithTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -151,6 +164,7 @@ public void runXMLFlowWithTracing() {
 
     @Test
     public void runXqyXmlFlowWithBinaryContent() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -195,6 +209,7 @@ private RawStructuredQueryDefinition allButCollectors() {
 
     @Test
     public void runXqyJsonFlowWithBinaryContent() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -217,7 +232,7 @@ public void runXqyJsonFlowWithBinaryContent() {
         assertEquals(6, getTracingDocCount());
 
         DocumentRecord doc = finalDocMgr.read("/doc/1.json").next();
-        String finalDoc= doc.getContent(new StringHandle()).get();
+        String finalDoc = doc.getContent(new StringHandle()).get();
         assertJsonEqual(getResource("tracing-test/traces/finalXqyJsonDoc.json"), finalDoc, true);
 
 
@@ -229,6 +244,7 @@ public void runXqyJsonFlowWithBinaryContent() {
 
     @Test
     public void runJSONFlowWithTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -254,6 +270,7 @@ public void runJSONFlowWithTracing() {
 
     @Test
     public void runSjsJsonFlowWithBinaryContent() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -276,7 +293,7 @@ public void runSjsJsonFlowWithBinaryContent() {
         assertEquals(6, getTracingDocCount());
 
         DocumentRecord doc = finalDocMgr.read("1").next();
-        String finalDoc= doc.getContent(new StringHandle()).get();
+        String finalDoc = doc.getContent(new StringHandle()).get();
         assertJsonEqual(getResource("tracing-test/traces/finalSjsJsonDoc.json"), finalDoc, true);
 
         JsonNode node = jobDocMgr.search(allButCollectors(), 1).next().getContent(new JacksonHandle()).get();
@@ -287,6 +304,7 @@ public void runSjsJsonFlowWithBinaryContent() {
 
     @Test
     public void runSjsXmlFlowWithBinaryContent() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -322,6 +340,7 @@ public void runSjsXmlFlowWithBinaryContent() {
 
     @Test
     public void runXMLErrorFlowWithoutTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -347,6 +366,7 @@ public void runXMLErrorFlowWithoutTracing() {
 
     @Test
     public void runXMLWriterErrorFlowWithoutTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -372,6 +392,7 @@ public void runXMLWriterErrorFlowWithoutTracing() {
 
     @Test
     public void runJSONErrorFlowWithoutTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());
 
@@ -399,6 +420,7 @@ public void runJSONErrorFlowWithoutTracing() {
 
     @Test
     public void runJSONWriterErrorFlowWithoutTracing() {
+        assumeTrue(markLogicVersion.getMarkLogicVersion().startsWith("11"));
         assertEquals(0, getFinalDocCount());
         assertEquals(0, getTracingDocCount());