Updated test cases for changes.

Author: Robin Duda

src/test/java/TestParser.java

@@ -7,42 +7,51 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.IOException;
+import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import static com.codingchili.Model.FileParser.ITEMS;
-
 /**
  * @author Robin Duda
  */
 @RunWith(VertxUnitRunner.class)
 public class TestParser {
-    private static final int ROW_OFFSET = 5;
+    public static final String TEST_XLSX_FILE = "src/test/java/test.xlsx";
+    public static final String TEST_XLS_FILE = "src/test/java/test.xls";
+    public static final String TEST_INVALID_FILE = "src/test/java/test_invalid.xlsx";
+    public static final int ROW_OFFSET = 5;
     private static final String XLSX = ".xlsx";
 
     @Test
     public void failParseInvalid() throws Exception {
         try {
-            new FileParser(new byte[2048], 5, XLSX);
+            new FileParser(new File(TEST_INVALID_FILE), 5, XLSX);
             throw new Exception("Should fail for invalid bytes.");
         } catch (ParserException ignored) {
         }
     }
 
     @Test
     public void testParseOOXML(TestContext context) throws IOException, ParserException {
-        testParseFile(context, "src/test/java/test.xlsx");
+        testParseFile(context, TEST_XLSX_FILE);
     }
 
     @Test
     public void testParse2007(TestContext context) throws IOException, ParserException {
-        testParseFile(context, "src/test/java/test.xls");
+        testParseFile(context, TEST_XLS_FILE);
     }
 
     private void testParseFile(TestContext context, String fileName) throws IOException, ParserException {
-        FileParser parser = new FileParser(Files.readAllBytes(Paths.get(fileName)), ROW_OFFSET, fileName);
-        JsonArray list = parser.toImportable("index", "mapping", false).getJsonArray(ITEMS);
+        FileParser parser = new FileParser(
+                Paths.get(fileName).toFile(),
+                ROW_OFFSET,
+                fileName
+        );
+
+        parser.assertFileParsable();
+
+        JsonArray list = new JsonArray();
+        parser.parseRowRange(0, parser.getNumberOfElements(), list::add);
 
         context.assertEquals(2, list.size());
 

src/test/java/TestWriter.java

@@ -1,5 +1,4 @@
-import com.codingchili.Model.Configuration;
-import com.codingchili.Model.ElasticWriter;
+import com.codingchili.Model.*;
 import io.vertx.core.Vertx;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
@@ -13,6 +12,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 /**
  * @author Robin Duda
  */
@@ -23,6 +27,7 @@ public class TestWriter {
     @Before
     public void setUp(TestContext context) {
         vertx = Vertx.vertx();
+        ImportEventCodec.registerOn(vertx);
         vertx.deployVerticle(new ElasticWriter(), context.asyncAssertSuccess());
     }
 
@@ -35,7 +40,7 @@ public void tearDown(TestContext context) {
     }
 
     @Test
-    public void shouldWriteToElasticPort(TestContext context) {
+    public void shouldWriteToElasticPort(TestContext context) throws IOException {
         Async async = context.async();
 
         vertx.createHttpServer().requestHandler(request -> {
@@ -46,10 +51,16 @@ public void shouldWriteToElasticPort(TestContext context) {
             });
         }).listen(Configuration.getElasticPort());
 
-        vertx.eventBus().send(Configuration.INDEXING_ELASTICSEARCH, new JsonObject()
-                .put("items", new JsonArray().add(new JsonObject().put("test", true)))
-                .put("index", "test-index")
-                .put("clear", false));
+        FileParser fileParser = new FileParser(
+                Paths.get(TestParser.TEST_XLS_FILE).toFile(),
+                TestParser.ROW_OFFSET,
+                "testFileName.xls");
+
+        vertx.eventBus().send(Configuration.INDEXING_ELASTICSEARCH, new ImportEvent()
+                .setParser(fileParser)
+                .setIndex("text-index")
+                .setClearExisting(false)
+                .setMapping("test-mapping"));
     }
 
 }