diff --git a/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java b/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java index 16213bf0..8addea3f 100644 --- a/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java +++ b/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java @@ -9,9 +9,9 @@ public abstract class ExecutorTester { public static final Log LOG = LogFactory.getLog(ExecutorTester.class); - public ZinggBaseCommon executor; + public ZinggBase executor; - public ExecutorTester(ZinggBaseCommon executor) { + public ExecutorTester(ZinggBase executor) { this.executor = executor; } diff --git a/common/core/src/test/java/zingg/common/core/executor/LabellerTester.java b/common/core/src/test/java/zingg/common/core/executor/LabellerTester.java index d522a26b..1751f1fe 100644 --- a/common/core/src/test/java/zingg/common/core/executor/LabellerTester.java +++ b/common/core/src/test/java/zingg/common/core/executor/LabellerTester.java @@ -21,7 +21,7 @@ public LabellerTester(Labeller executor) { public void validateResults() throws ZinggClientException { // check that marked data has at least 1 match row and 1 unmatch row ZFrame dfMarked = executor.getContext().getPipeUtil(). - read(false, false, executor.getContext().getPipeUtil().getTrainingDataMarkedPipe(executor.getArgs())); + read(false, false, executor.getContext().getModelHelper().getTrainingDataMarkedPipe(executor.getArgs())); C matchCond = dfMarked.equalTo(ColName.MATCH_FLAG_COL, 1); C notMatchCond = dfMarked.equalTo(ColName.MATCH_FLAG_COL, 0); diff --git a/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderTester.java b/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderTester.java index c973a0e2..b19cdd9b 100644 --- a/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderTester.java +++ b/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderTester.java @@ -20,7 +20,7 @@ public TrainingDataFinderTester(TrainingDataFinder executor) { public void validateResults() throws ZinggClientException { // check that unmarked data has at least 10 rows ZFrame df = executor.getContext().getPipeUtil().read(false, false, - executor.getContext().getPipeUtil().getTrainingDataUnmarkedPipe( + executor.getContext().getModelHelper().getTrainingDataUnmarkedPipe( (executor.getArgs()))); long trainingDataCount = df.count(); diff --git a/spark/client/src/test/java/zingg/spark/client/TestSparkClient.java b/spark/client/src/test/java/zingg/spark/client/TestSparkClient.java index df404f9c..b5643fe0 100644 --- a/spark/client/src/test/java/zingg/spark/client/TestSparkClient.java +++ b/spark/client/src/test/java/zingg/spark/client/TestSparkClient.java @@ -19,7 +19,7 @@ public void testSetColumnOptionThroughBuildAndSetArguments() { Client client = new SparkClient(); client.buildAndSetArguments(arguments, options); - assertEquals("columnName", client.getArguments().getColumn()); + assertEquals("columnName", ((IArguments)client.getArguments()).getColumn()); } diff --git a/spark/core/src/test/java/zingg/TestDocumenter.java b/spark/core/src/test/java/zingg/TestDocumenter.java index fd8a8363..0becdaa5 100644 --- a/spark/core/src/test/java/zingg/TestDocumenter.java +++ b/spark/core/src/test/java/zingg/TestDocumenter.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.BeforeEach; import zingg.common.client.Arguments; +import zingg.common.client.IArguments; import zingg.spark.core.executor.ZinggSparkTester; public class TestDocumenter extends ZinggSparkTester{ @@ -12,7 +13,7 @@ public class TestDocumenter extends ZinggSparkTester{ public void setUp(){ try { - args = argsUtil.createArgumentsFromJSON(getClass().getResource("/testDocumenter/config.json").getFile()); + args = (IArguments) argsUtil.createArgumentsFromJSON(getClass().getResource("/testDocumenter/config.json").getFile()); //fail("Exception was expected for missing config file"); } catch (Throwable e) { e.printStackTrace(); diff --git a/spark/core/src/test/java/zingg/TestFebrlDataset.java b/spark/core/src/test/java/zingg/TestFebrlDataset.java index a7ef4912..b27d4f30 100644 --- a/spark/core/src/test/java/zingg/TestFebrlDataset.java +++ b/spark/core/src/test/java/zingg/TestFebrlDataset.java @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test; import zingg.common.client.Arguments; +import zingg.common.client.IArguments; import zingg.common.client.ZinggClientException; import zingg.common.client.pipe.FilePipe; import zingg.common.client.pipe.Pipe; @@ -31,7 +32,7 @@ public class TestFebrlDataset extends ZinggSparkTester{ public void setUp() throws Exception, ZinggClientException{ String configFilePath = getClass().getResource("../testFebrl/config.json").getFile(); System.out.println("configFilePath "+configFilePath); - args = argsUtil.createArgumentsFromJSON(configFilePath); + args = (IArguments) argsUtil.createArgumentsFromJSON(configFilePath); String modelPath = getClass().getResource("../testFebrl/models").getPath(); System.out.println("modelPath "+modelPath); args.setZinggDir(modelPath); diff --git a/spark/core/src/test/java/zingg/common/core/documenter/TestDataDocumenter.java b/spark/core/src/test/java/zingg/common/core/documenter/TestDataDocumenter.java index 762096cd..4397f297 100644 --- a/spark/core/src/test/java/zingg/common/core/documenter/TestDataDocumenter.java +++ b/spark/core/src/test/java/zingg/common/core/documenter/TestDataDocumenter.java @@ -28,7 +28,7 @@ public class TestDataDocumenter extends ZinggSparkTester { public void setUp(){ try { String configPath = getClass().getResource("../../../../documenter/config.json").getFile(); - docArguments = argsUtil.createArgumentsFromJSON(configPath); + docArguments = (IArguments) argsUtil.createArgumentsFromJSON(configPath); } catch (Throwable e) { e.printStackTrace(); LOG.info("Unexpected exception received " + e.getMessage()); diff --git a/spark/core/src/test/java/zingg/common/core/documenter/TestModelDocumenter.java b/spark/core/src/test/java/zingg/common/core/documenter/TestModelDocumenter.java index 39d8f9db..5a9f8836 100644 --- a/spark/core/src/test/java/zingg/common/core/documenter/TestModelDocumenter.java +++ b/spark/core/src/test/java/zingg/common/core/documenter/TestModelDocumenter.java @@ -33,7 +33,7 @@ public void setUp(){ try { String configPath = getClass().getResource("../../../../documenter/config.json").getFile(); - docArguments = argsUtil.createArgumentsFromJSON(configPath); + docArguments = (IArguments) argsUtil.createArgumentsFromJSON(configPath); String zinggDirPath = getClass().getResource("../../../../"+docArguments.getZinggDir()).getFile(); docArguments.setZinggDir(zinggDirPath); } catch (Throwable e) { @@ -47,21 +47,21 @@ public void setUp(){ public void testIfModelDocumenterGeneratedDocFile() throws Throwable { try { - Files.deleteIfExists(Paths.get(docArguments.getZinggModelDocFile())); + Files.deleteIfExists(Paths.get(zsCTX.getModelHelper().getZinggModelDocFile(docArguments))); } catch (IOException e) { e.printStackTrace(); } ModelDocumenter modelDoc = new SparkModelDocumenter(zsCTX, docArguments); modelDoc.createModelDocument(); - assertTrue(Files.exists(Paths.get(docArguments.getZinggModelDocFile())), "Model documentation file is not generated"); + assertTrue(Files.exists(Paths.get(zsCTX.getModelHelper().getZinggModelDocFile(docArguments))), "Model documentation file is not generated"); } @Test public void testPopulateTemplateDataWhenMarkedRecordsAreAvailable() throws Throwable { ModelDocumenter modelDoc = new SparkModelDocumenter(zsCTX, docArguments); - modelDoc.markedRecords = zsCTX.getPipeUtil().read(false, false, zsCTX.getPipeUtil().getTrainingDataMarkedPipe(docArguments)); + modelDoc.markedRecords = zsCTX.getPipeUtil().read(false, false, zsCTX.getModelHelper().getTrainingDataMarkedPipe(docArguments)); Map root = modelDoc.populateTemplateData(); assertTrue(root.containsKey(TemplateFields.MODEL_ID), "The field does not exist - " + TemplateFields.MODEL_ID); diff --git a/spark/core/src/test/java/zingg/common/core/util/TestPipeUtil.java b/spark/core/src/test/java/zingg/common/core/util/TestPipeUtil.java index 974cc3e4..0b10b054 100644 --- a/spark/core/src/test/java/zingg/common/core/util/TestPipeUtil.java +++ b/spark/core/src/test/java/zingg/common/core/util/TestPipeUtil.java @@ -20,7 +20,7 @@ public class TestPipeUtil extends ZinggSparkTester{ public void testStopWordsPipe() { IArguments args = new Arguments(); String fileName = args.getStopWordsDir() + "file"; - Pipe p = zsCTX.getPipeUtil().getStopWordsPipe(args, fileName); + Pipe p = zsCTX.getModelHelper().getStopWordsPipe(fileName); assertEquals(Pipe.FORMAT_CSV, p.getFormat(), "Format is not CSV"); assertEquals("true", p.get(FilePipe.HEADER).toLowerCase(), "Property 'header' is set to 'false'"); diff --git a/spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java b/spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java index ba1ed937..d7c97931 100644 --- a/spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java +++ b/spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java @@ -6,7 +6,7 @@ import org.apache.spark.sql.SparkSession; import org.apache.spark.sql.types.DataType; -import zingg.common.client.IArguments; +import zingg.common.client.IZArgs; import zingg.common.client.ZFrame; import zingg.common.client.ZinggClientException; import zingg.common.client.options.ZinggOptions; @@ -30,7 +30,7 @@ public JunitSparkLabeller(ZinggSparkContext sparkContext) { } @Override - public void setArgs(IArguments args) { + public void setArgs(IZArgs args) { super.setArgs(args); junitLabeller.setArgs(args); }