try fix unit test

Author: andiwand

app/src/androidTest/java/at/tomtasche/reader/test/CoreTest.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import at.tomtasche.reader.background.CoreWrapper;
 
@@ -27,6 +28,12 @@ public class CoreTest {
 
     private File m_testFile;
 
+    @Before
+    public void initializeCore() {
+        Context testCtx = InstrumentationRegistry.getInstrumentation().getContext();
+        CoreWrapper.initialize(testCtx);
+    }
+
     @Before
     public void extractTestFile() throws IOException {
         Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
@@ -47,7 +54,7 @@ public void cleanupTestFile() {
     }
 
     private static void copy(InputStream src, File dst) throws IOException {
-        try (OutputStream out = new FileOutputStream(dst)) {
+        try (OutputStream out = Files.newOutputStream(dst.toPath())) {
             byte[] buf = new byte[1024];
             int len;
             while ((len = src.read(buf)) > 0) {
@@ -58,8 +65,6 @@ private static void copy(InputStream src, File dst) throws IOException {
 
     @Test
     public void test() {
-        CoreWrapper core = new CoreWrapper();
-
         File cacheDir = InstrumentationRegistry.getInstrumentation().getTargetContext().getCacheDir();
         File htmlFile = new File(cacheDir, "html");
 
@@ -68,15 +73,15 @@ public void test() {
         coreOptions.outputPath = htmlFile.getPath();
         coreOptions.editable = true;
 
-        CoreWrapper.CoreResult coreResult = core.parse(coreOptions);
+        CoreWrapper.CoreResult coreResult = CoreWrapper.parse(coreOptions);
         Assert.assertEquals(0, coreResult.errorCode);
 
         File resultFile = new File(cacheDir, "result");
         coreOptions.outputPath = resultFile.getPath();
 
         String htmlDiff = "{\"modifiedText\":{\"3\":\"This is a simple test document to demonstrate the DocumentLoadewwwwr example!\"}}";
 
-        CoreWrapper.CoreResult result = core.backtranslate(coreOptions, htmlDiff);
+        CoreWrapper.CoreResult result = CoreWrapper.backtranslate(coreOptions, htmlDiff);
         Assert.assertEquals(0, coreResult.errorCode);
     }
 }

app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java

@@ -9,13 +9,11 @@
 import java.util.List;
 
 public class CoreWrapper {
-
     static {
         System.loadLibrary("odr-core");
     }
 
     public static class GlobalParams {
-
         public String coreDataPath;
         public String fontconfigDataPath;
         public String popplerDataPath;
@@ -47,7 +45,6 @@ public static void initialize(Context context) {
     }
 
     public static class CoreOptions {
-
         public boolean ooxml;
         public boolean txt;
         public boolean pdf;
@@ -68,27 +65,21 @@ public static CoreResult parse(CoreOptions options) {
         switch (result.errorCode) {
             case 0:
                 break;
-
             case -1:
                 result.exception = new CoreCouldNotOpenException();
                 break;
-
             case -2:
                 result.exception = new CoreEncryptedException();
                 break;
-
             case -3:
                 result.exception = new CoreUnknownErrorException();
                 break;
-
             case -4:
                 result.exception = new CoreCouldNotTranslateException();
                 break;
-
             case -5:
                 result.exception = new CoreUnexpectedFormatException();
                 break;
-
             default:
                 result.exception = new CoreUnexpectedErrorCodeException();
         }
@@ -140,7 +131,6 @@ public static void close() {
     public static native void stopServer();
 
     public static class CoreResult {
-
         public int errorCode;
 
         public Exception exception;
@@ -168,5 +158,4 @@ public static class CoreUnknownErrorException extends RuntimeException {}
     public static class CoreCouldNotEditException extends RuntimeException {}
 
     public static class CoreCouldNotSaveException extends RuntimeException {}
-
 }