Pull up EtlBaseTest.process()

orientechnologies · Mar 27, 2015 · ae4d85e · ae4d85e
1 parent c6555ef
commit ae4d85e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 40 deletions.
diff --git a/src/test/java/com/orientechnologies/orient/etl/ETLBaseTest.java b/src/test/java/com/orientechnologies/orient/etl/ETLBaseTest.java
@@ -58,4 +58,8 @@ protected OETLProcessor getProcessor(final String cfgJson) {
   protected List<ODocument> getResult() {
     return ((TestLoader) proc.getLoader()).getResult();
   }
+
+  protected void process(String cfgJson) {
+    getProcessor(cfgJson).execute();
+  }
 }
diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/CSVTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/CSVTransformerTest.java
@@ -40,10 +40,6 @@ public void testEmpty() {
     assertEquals(0, getResult().size());
   }
 
-  protected OETLProcessor process(String cfgJson) {
-    return getProcessor(cfgJson).execute();
-  }
-
   @Test
   public void testOneObject() {
     process("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }], loader: { test: {} } }");

diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/EdgeTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/EdgeTransformerTest.java
@@ -42,11 +42,9 @@ public void setUp() {
 
   @Test
   public void testNotLightweightEdge() {
-    getProcessor(
+    process("{source: { content: { value: 'name,surname,friend\nJay,Miner,Luca' } }, extractor : { row: {} },"
-        "{source: { content: { value: 'name,surname,friend\nJay,Miner,Luca' } }, extractor : { row: {} },"
+        + " transformers: [{csv: {}}, {vertex: {class:'V1'}}, {edge:{class:'Friend',joinFieldName:'friend',lookup:'V2.name'}},"
-            + " transformers: [{csv: {}}, {vertex: {class:'V1'}}, {edge:{class:'Friend',joinFieldName:'friend',lookup:'V2.name'}},"
+        + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }")
-        .execute();
 
     assertEquals(1, graph.countVertices("V1"));
     assertEquals(1, graph.countVertices("V2"));

diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/FieldTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/FieldTransformerTest.java
@@ -33,7 +33,7 @@ public class FieldTransformerTest extends ETLBaseTest {
 
   @Test
   public void testValue() {
-    getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', value: 33}}], loader: { test: {} } }").execute();
+    process("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', value: 33}}], loader: { test: {} } }");
     assertEquals(1, getResult().size());
 
     ODocument doc = getResult().get(0);
@@ -45,7 +45,7 @@ public void testValue() {
 
   @Test
   public void testExpression() {
-    getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', expression: 'surname'}}], loader: { test: {} } }").execute();
+    process("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', expression: 'surname'}}], loader: { test: {} } }");
     assertEquals(1, getResult().size());
 
     ODocument doc = getResult().get(0);
@@ -57,7 +57,7 @@ public void testExpression() {
 
   @Test
   public void testRemove() {
-    getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'surname', operation: 'remove'}}], loader: { test: {} } }").execute();
+    process("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'surname', operation: 'remove'}}], loader: { test: {} } }");
     assertEquals(1, getResult().size());
 
     ODocument doc = getResult().get(0);
@@ -67,7 +67,7 @@ public void testRemove() {
 
   @Test
   public void testSave() {
-    getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field:{fieldName:'@class', value:'Test'}}, {field:{ fieldName:'test', value: 33, save: true}}], loader: { orientdb: { dbURL: 'memory:ETLBaseTest' } } }").execute();
+    process("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field:{fieldName:'@class', value:'Test'}}, {field:{ fieldName:'test', value: 33, save: true}}], loader: { orientdb: { dbURL: 'memory:ETLBaseTest' } } }");
     assertEquals(1, graph.countVertices("Test"));
   }
 }
diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/FlowTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/FlowTransformerTest.java
@@ -34,10 +34,9 @@
 public class FlowTransformerTest extends ETLBaseTest {
   @Test
   public void testSkip() {
-    getProcessor(
+    process("{source: { content: { value: 'name,surname\nJay,Miner\nJay,Test' } }, extractor : { row: {} },"
-        "{source: { content: { value: 'name,surname\nJay,Miner\nJay,Test' } }, extractor : { row: {} },"
+        + " transformers: [{csv: {}}, {vertex: {class:'V'}}, {flow:{operation:'skip',if: 'name <> \'Jay\''}},{field:{fieldName:'name', value:'3'}}"
-            + " transformers: [{csv: {}}, {vertex: {class:'V'}}, {flow:{operation:'skip',if: 'name <> \'Jay\''}},{field:{fieldName:'name', value:'3'}}"
+        + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph' } } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph' } } }").execute();
 
     assertEquals(2, graph.countVertices("V"));
 
@@ -56,10 +55,9 @@ public void testSkip() {
 
   @Test
   public void testSkipNever() {
-    getProcessor(
+    process("{source: { content: { value: 'name,surname\nJay,Miner\nTest,Test' } }, extractor : { row: {} },"
-        "{source: { content: { value: 'name,surname\nJay,Miner\nTest,Test' } }, extractor : { row: {} },"
+        + " transformers: [{csv: {}}, {vertex: {class:'V'}}, {flow:{operation:'skip',if: 'name = \'Jay\''}},{field:{fieldName:'name', value:'3'}}"
-            + " transformers: [{csv: {}}, {vertex: {class:'V'}}, {flow:{operation:'skip',if: 'name = \'Jay\''}},{field:{fieldName:'name', value:'3'}}"
+        + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph'} } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph'} } }").execute();
 
     assertEquals(2, graph.countVertices("V"));
 

diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/JsonExtractorTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/JsonExtractorTest.java
@@ -33,21 +33,21 @@ public class JsonExtractorTest extends ETLBaseTest {
 
   @Test
   public void testEmptyCollection() {
-    getProcessor("{source: { content: { value: [] }  }, extractor : { json: {} }, loader: { test: {} } }").execute();
+    process("{source: { content: { value: [] }  }, extractor : { json: {} }, loader: { test: {} } }");
     assertEquals(0, getResult().size());
   }
 
   @Test
   public void testEmptyObject() {
-    getProcessor("{source: { content: { value: {} }  }, extractor : { json: {} }, loader: { test: {} } }").execute();
+    process("{source: { content: { value: {} }  }, extractor : { json: {} }, loader: { test: {} } }");
     assertEquals(1, getResult().size());
     ODocument doc = getResult().get(0);
     assertEquals(0, doc.fields());
   }
 
   @Test
   public void testOneObject() {
-    getProcessor("{source: { content: { value: { name: 'Jay', surname: 'Miner' } } }, extractor : { json: {} }, loader: { test: {} } }").execute();
+    process("{source: { content: { value: { name: 'Jay', surname: 'Miner' } } }, extractor : { json: {} }, loader: { test: {} } }");
     assertEquals(1, getResult().size());
     ODocument doc = getResult().get(0);
     assertEquals(2, doc.fields());
@@ -64,7 +64,7 @@ public void testSmallSet() {
       content += "{name:'" + names[i] + "',surname:'" + surnames[i] + "',id:" + i + "}";
     }
 
-    getProcessor("{source: { content: { value: [" + content + "] } }, extractor : { json: {} }, loader: { test: {} } }").execute();
+    process("{source: { content: { value: [" + content + "] } }, extractor : { json: {} }, loader: { test: {} } }");
 
     assertEquals(getResult().size(), names.length);
 

diff --git a/src/test/java/com/orientechnologies/orient/etl/transformer/OVertexTransformerNGTest.java b/src/test/java/com/orientechnologies/orient/etl/transformer/OVertexTransformerNGTest.java
@@ -41,31 +41,25 @@ public void setUp() {
 
   @Test
   public void testCreateVertex() {
-    getProcessor(
+    process("{source: { content: { value: 'name,\nGregor' } }, extractor : { row: {} },"
-            "{source: { content: { value: 'name,\nGregor' } }, extractor : { row: {} },"
+    + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:false}},"
-            + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:false}},"
+    + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }")
-            .execute();
     assertEquals(1, graph.countVertices("Person"));
   }
 
   @Test
   public void testErrorOnDuplicateVertex() {
-    getProcessor(
+    process("{source: { content: { value: 'name,\nGregor\nGregor\nHans' } }, extractor : { row: {} },"
-            "{source: { content: { value: 'name,\nGregor\nGregor\nHans' } }, extractor : { row: {} },"
+    + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:false}},"
-            + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:false}},"
+    + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }")
-            .execute();
     assertEquals(1, graph.countVertices("Person"));
   }
 
   @Test
   public void testSkipDuplicateVertex() {
-    getProcessor(
+    process("{source: { content: { value: 'name,\nGregor\nGregor\nHans' } }, extractor : { row: {} },"
-            "{source: { content: { value: 'name,\nGregor\nGregor\nHans' } }, extractor : { row: {} },"
+    + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:true}},"
-            + " transformers: [{csv: {}}, {vertex: {class:'Person', skipDuplicates:true}},"
+    + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }");
-            + "], loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', useLightweightEdges:false } } }")
-            .execute();
     assertEquals(2, graph.countVertices("Person"));
   }
 }