Cleanup tests

orientechnologies · Mar 26, 2015 · d7b852b · d7b852b
1 parent 514a8eb
commit d7b852b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/CSVTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/CSVTransformerTest.java
@@ -36,7 +36,7 @@ public void testEmpty() {
   public void testOneObject() {
     OETLProcessor proc = getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }], loader: { test: {} } }").execute();
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 2);
     assertEquals(doc.field("name"), "Jay");
     assertEquals(doc.field("surname"), "Miner");
@@ -51,8 +51,7 @@ public void testSmallSet() {
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), names.length);
 
     int i = 0;
-    for (Object o : ((TestLoader) proc.getLoader()).getResult()) {
+    for (ODocument doc : ((TestLoader) proc.getLoader()).getResult()) {
-      ODocument doc = (ODocument) o;
       assertEquals(doc.fields(), 3);
       assertEquals(doc.field("name"), names[i]);
       assertEquals(doc.field("surname"), surnames[i]);

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 void testValue() {
     OETLProcessor proc = getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', value: 33}}], loader: { test: {} } }").execute();
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
 
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 3);
     assertEquals(doc.field("name"), "Jay");
     assertEquals(doc.field("surname"), "Miner");
@@ -44,7 +44,7 @@ public void testExpression() {
     OETLProcessor proc = getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'test', expression: 'surname'}}], loader: { test: {} } }").execute();
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
 
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 3);
     assertEquals(doc.field("name"), "Jay");
     assertEquals(doc.field("surname"), "Miner");
@@ -55,7 +55,7 @@ public void testRemove() {
     OETLProcessor proc = getProcessor("{source: { content: { value: 'name,surname\nJay,Miner' } }, extractor : { row: {} }, transformers: [{ csv: {} }, {field: {fieldName:'surname', operation: 'remove'}}], loader: { test: {} } }").execute();
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
 
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 1);
     assertEquals(doc.field("name"), "Jay");
   }

diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/JsonExtractorTest.java b/src/test/java/com/orientechnologies/orient/etl/extractor/JsonExtractorTest.java
@@ -36,13 +36,14 @@ public void testEmptyCollection() {
   public void testEmptyObject() {
     OETLProcessor proc = getProcessor("{source: { content: { value: {} }  }, extractor : { json: {} }, loader: { test: {} } }").execute();
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 0);
   }
 
   public void testOneObject() {
-    OETLProcessor proc = getProcessor("{source: { content: { value: { name: 'Jay', surname: 'Miner' } } }, extractor : { json: {} }, loader: { test: {} } }").execute(); assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
+    OETLProcessor proc = getProcessor("{source: { content: { value: { name: 'Jay', surname: 'Miner' } } }, extractor : { json: {} }, loader: { test: {} } }").execute();
-    ODocument doc = ((ODocument) ((TestLoader) proc.getLoader()).getResult().get(0));
+    assertEquals(((TestLoader) proc.getLoader()).getResult().size(), 1);
+    ODocument doc = ((TestLoader) proc.getLoader()).getResult().get(0);
     assertEquals(doc.fields(), 2);
     assertEquals(doc.field("name"), "Jay");
     assertEquals(doc.field("surname"), "Miner");
@@ -56,14 +57,12 @@ public void testSmallSet() {
       content += "{name:'" + names[i] + "',surname:'" + surnames[i] + "',id:" + i + "}";
     }
 
-    OETLProcessor proc = getProcessor(
+    OETLProcessor proc = getProcessor("{source: { content: { value: [" + content + "] } }, extractor : { json: {} }, loader: { test: {} } }").execute();
-        "{source: { content: { value: [" + content + "] } }, extractor : { json: {} }, loader: { test: {} } }").execute();
 
     assertEquals(((TestLoader) proc.getLoader()).getResult().size(), names.length);
 
     int i = 0;
-    for (Object o : ((TestLoader) proc.getLoader()).getResult()) {
+    for (ODocument doc : ((TestLoader) proc.getLoader()).getResult()) {
-      ODocument doc = (ODocument) o;
       assertEquals(doc.fields(), 3);
       assertEquals(doc.field("name"), names[i]);
       assertEquals(doc.field("surname"), surnames[i]);

diff --git a/src/test/java/com/orientechnologies/orient/etl/extractor/TestLoader.java b/src/test/java/com/orientechnologies/orient/etl/extractor/TestLoader.java
@@ -21,6 +21,7 @@
 package com.orientechnologies.orient.etl.extractor;
 
 import com.orientechnologies.orient.core.command.OCommandContext;
+import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.etl.loader.OAbstractLoader;
 
 import java.util.ArrayList;
@@ -32,18 +33,18 @@
  * @author Luca Garulli on 27/11/14.
  */
 public class TestLoader extends OAbstractLoader {
-  private List<Object> result = new ArrayList<Object>();
+  private List<ODocument> result = new ArrayList<ODocument>();
 
   public TestLoader() {
   }
 
-  public List<Object> getResult() {
+  public List<ODocument> getResult() {
     return result;
   }
 
   @Override
   public void load(Object input, OCommandContext context) {
-    result.add(input);
+    result.add((ODocument)input);
   }
 
   @Override