Extractor Modules / Taverna Extractor / Diff of /src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java

Diff of /src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java [cb66ab] .. [4d1fd3]

Switch to side-by-side view

--- a/src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java
+++ b/src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java
@@ -6,6 +6,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,10 +59,13 @@
 
         matchboxExtractor = new TavernaExtractor(true);
 
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "matchbox.archi"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "matchbox.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "matchbox.archi"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "matchbox.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "matchbox.archi"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "matchbox.t2flow"));
 
         matchboxExtractor.process();
         ALL_RELATIONS = matchboxExtractor.getRelations();
@@ -75,10 +79,13 @@
             CMException, IOException, DeserializationException, IterationTypeMismatchException {
 
         loopingExtractor = new TavernaExtractor(true);
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "looping.archimate"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "looping.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "looping.archimate"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "looping.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "looping.archimate"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "looping.t2flow"));
 
         loopingExtractor.process();
     }
@@ -89,10 +96,13 @@
             CMException, IOException, DeserializationException, IterationTypeMismatchException {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "WSDLActivity.archimate"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "WSDLActivity.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "WSDLActivity.archimate"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "WSDLActivity.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "WSDLActivity.archimate"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "WSDLActivity.t2flow"));
 
         wsdlActivityExtractor.process();
     }
@@ -103,10 +113,13 @@
             CMException, IOException, DeserializationException, IterationTypeMismatchException {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "localTool.archimate"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "localTool.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "localTool.archimate"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "localTool.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "localTool.archimate"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "localTool.t2flow"));
 
         wsdlActivityExtractor.process();
     }
@@ -117,10 +130,13 @@
             CMException, IOException, DeserializationException, IterationTypeMismatchException {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "sshTool.archimate"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "sshTool.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "sshTool.archimate"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "sshTool.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "sshTool.archimate"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "sshTool.t2flow"));
 
         wsdlActivityExtractor.process();
     }
@@ -132,10 +148,13 @@
             CMException, IOException, DeserializationException, IterationTypeMismatchException {
 
         beanshellActivityExtractor = new TavernaExtractor(true);
-        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "beanshellLActivity.archimate"));
-        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
-                .join("test", "resources", "beanshellLActivity.t2flow"));
+//        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "beanshellLActivity.archimate"));
+//        TavernaExtractor.setInputFileName(Joiner.on(File.separator).skipNulls()
+//                .join("test", "resources", "beanshellLActivity.t2flow"));
+
+        TavernaExtractor.setArchimateOutputPath(Paths.get("test", "resources", "beanshellLActivity.archimate"));
+        TavernaExtractor.setInputFileName(Paths.get("test", "resources", "beanshellLActivity.t2flow"));
 
         beanshellActivityExtractor.process();
     }