[SYSTEMDS-3842] Improve test coverage of API components: ScriptExecutorUtils & JMLConnection

Author: e-strauss

.github/workflows/javaTests.yml

@@ -50,41 +50,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         tests: [
-          "org.apache.sysds.test.applications.**",
-          "**.test.usertest.**",
-          "**.component.c**.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.component.e**.**,**.component.f**.**,**.component.m**.**",
-          "**.component.p**.**,**.component.r**.**,**.component.s**.**,**.component.t**.**,**.component.u**.**",
-          "**.functions.a**.**,**.functions.binary.matrix.**,**.functions.binary.scalar.**,**.functions.binary.tensor.**",
-          "**.functions.blocks.**,**.functions.data.rand.**,",
-          "**.functions.countDistinct.**,**.functions.countDistinctApprox.**",
-          "**.functions.data.misc.**,**.functions.lineage.**",
-          "**.functions.compress.**,**.functions.data.tensor.**,**.functions.codegenalg.parttwo.**,**.functions.codegen.**,**.functions.caching.**",
-          "**.functions.binary.matrix_full_cellwise.**,**.functions.binary.matrix_full_other.**",
-          "**.functions.federated.algorithms.**,**.functions.federated.io.**,**.functions.federated.paramserv.**",
-          "**.functions.federated.transform.**,**.functions.federated.fedplanner.**",
-          "**.functions.federated.primitives.part1.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.functions.federated.primitives.part2.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.functions.federated.primitives.part3.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.functions.federated.primitives.part4.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.functions.federated.primitives.part5.** -Dtest-threadCount=1 -Dtest-forkCount=1",
-          "**.functions.federated.monitoring.**,**.functions.federated.multitenant.**",
-          "**.functions.federated.codegen.**,**.functions.federated.FederatedTestObjectConstructor",
-          "**.functions.codegenalg.partone.**",
-          "**.functions.builtin.part1.**",
-          "**.functions.builtin.part2.**",
-          "**.functions.frame.**,**.functions.indexing.**,**.functions.io.**,**.functions.iogen.**",
-          "**.functions.dnn.**",
-          "**.functions.paramserv.**",
-          "**.functions.recompile.**,**.functions.misc.**",
-          "**.functions.mlcontext.**",
-          "**.functions.nary.**,**.functions.quaternary.**",
-          "**.functions.parfor.**,**.functions.pipelines.**",
-          "**.functions.homomorphicEncryption.**",
-          "**.functions.unary.scalar.**,**.functions.updateinplace.**,**.functions.vect.**",
-          "**.functions.reorg.**,**.functions.rewrite.**,**.functions.ternary.**",
-          "**.functions.transform.**","**.functions.unique.**",
-          "**.functions.unary.matrix.**,**.functions.linearization.**,**.functions.jmlc.**"
+          "**.functions.jmlc.**"
         ]
         java: ['11']
         javadist: ['adopt']

src/main/java/org/apache/sysds/api/jmlc/Connection.java

@@ -827,19 +827,6 @@ public FrameBlock convertToFrame(InputStream input, int rows, int cols, String f
 	// Read transform meta data
 	////////////////////////////////////////////
 
-	/**
-	 * Reads transform meta data from an HDFS file path and converts it into an in-memory
-	 * FrameBlock object. The column names in the meta data file 'column.names' is processed
-	 * with default separator ','.
-	 * 
-	 * @param metapath  hdfs file path to meta data directory
-	 * @return FrameBlock object representing transform metadata
-	 * @throws IOException if IOException occurs
-	 */
-	public FrameBlock readTransformMetaDataFromFile(String metapath) throws IOException {
-		return readTransformMetaDataFromFile(null, metapath, TfUtils.TXMTD_SEP);
-	}
-	
 	/**
 	 * Reads transform meta data from an HDFS file path and converts it into an in-memory
 	 * FrameBlock object. The column names in the meta data file 'column.names' is processed

src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java

@@ -21,19 +21,31 @@
 package org.apache.sysds.test.component.misc;
 
 
+import org.apache.commons.cli.ParseException;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.sysds.api.DMLScript;
+import org.apache.sysds.api.ScriptExecutorUtils;
+import org.apache.sysds.api.mlcontext.Script;
+import org.apache.sysds.conf.ConfigurationManager;
+import org.apache.sysds.parser.DMLProgram;
 import org.apache.sysds.parser.LanguageException;
+import org.apache.sysds.parser.ParserFactory;
+import org.apache.sysds.parser.ParserWrapper;
+import org.apache.sysds.runtime.controlprogram.Program;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContextFactory;
 import org.apache.sysds.test.LoggingUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -42,6 +54,8 @@
 
 import static org.apache.sysds.api.DMLScript.executeScript;
 import static org.apache.sysds.api.DMLScript.readDMLScript;
+import static org.apache.sysds.api.mlcontext.ScriptFactory.dml;
+import static org.junit.Assert.assertTrue;
 
 @net.jcip.annotations.NotThreadSafe
 public class DMLScriptTest {
@@ -359,5 +373,44 @@ public void executeDMLWithScriptAndDebugTest() throws IOException {
     public void createDMLScriptInstance(){
         DMLScript script = new DMLScript();
         Assert.assertTrue(script != null);
+
+    }
+
+    @Test
+    public void testLineageScriptExecutorUtilTestTest() throws IOException {
+        // just for code coverage
+        new ScriptExecutorUtils();
+
+        String cl = "systemds -lineage estimate -s \"print('hello')\"";
+        String[] args = cl.split(" ");
+        final PrintStream originalOut = System.out;
+        try {
+            final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
+            System.setOut(new PrintStream(outputStreamCaptor));
+            executeScript(args);
+            System.setOut(originalOut);
+            String[] lines = outputStreamCaptor.toString().split(System.lineSeparator());
+            Assert.assertTrue(lines[0].startsWith("hello"));
+            Assert.assertTrue(Arrays.stream(lines).anyMatch(s -> s.startsWith("Compute Time (Elapsed/Saved):")));
+            Assert.assertTrue(Arrays.stream(lines).anyMatch(s -> s.startsWith("Space Used (C/R/L):")));
+            Assert.assertTrue(Arrays.stream(lines).anyMatch(s -> s.startsWith("Cache Full Timestamp:")));
+        } finally {
+            System.setOut(originalOut);
+        }
+    }
+
+    @Test
+    public void testScriptExecutorUtilTestTest() throws IOException, ParseException {
+        boolean old = DMLScript.USE_ACCELERATOR;
+        DMLScript.USE_ACCELERATOR = true;
+        try {
+            ExecutionContext ec = ExecutionContextFactory.createContext();
+            ScriptExecutorUtils.executeRuntimeProgram(null, ec, ConfigurationManager.getDMLConfig(), 0, null);
+        } catch (Error e){
+            Assert.assertTrue("Expecting Message starting with \"Error while loading native library. Instead got:"
+                    + e.getMessage(), e.getMessage().startsWith("Error while loading native library"));
+        } finally {
+            DMLScript.USE_ACCELERATOR = old;
+        }
     }
 }