fix core test

Author: andiwand

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

@@ -24,13 +24,12 @@
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class CoreTest {
-
     private File m_testFile;
 
     @Before
     public void initializeCore() {
-        Context testCtx = InstrumentationRegistry.getInstrumentation().getContext();
-        CoreWrapper.initialize(testCtx);
+        Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        CoreWrapper.initialize(appCtx);
     }
 
     @Before
@@ -65,11 +64,11 @@ private static void copy(InputStream src, File dst) throws IOException {
     @Test
     public void test() {
         File cacheDir = InstrumentationRegistry.getInstrumentation().getTargetContext().getCacheDir();
-        File htmlFile = new File(cacheDir, "html");
+        File outputDir = new File(cacheDir, "output");
 
         CoreWrapper.CoreOptions coreOptions = new CoreWrapper.CoreOptions();
         coreOptions.inputPath = m_testFile.getAbsolutePath();
-        coreOptions.outputPath = htmlFile.getPath();
+        coreOptions.outputPath = outputDir.getPath();
         coreOptions.editable = true;
 
         CoreWrapper.CoreResult coreResult = CoreWrapper.parse(coreOptions);

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

@@ -50,7 +50,6 @@
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class MainActivityTests {
-
     private IdlingResource m_idlingResource;
     private static final Map<String, File> s_testFiles = new ArrayMap<>();
 
@@ -185,6 +184,4 @@ public void testPDF() {
                         .perform(click());
             });
     }
-
-
 }

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

@@ -31,10 +31,10 @@ public static void initialize(Context context) {
 
         AssetExtractor ae = new AssetExtractor(context.getAssets());
         ae.setOverwrite();
-        ae.extract(assetsDirectory, "odrcore");
-        ae.extract(assetsDirectory, "fontconfig");
-        ae.extract(assetsDirectory, "poppler");
-        ae.extract(assetsDirectory, "pdf2htmlex");
+        ae.extract(assetsDirectory, "core/odrcore");
+        ae.extract(assetsDirectory, "core/fontconfig");
+        ae.extract(assetsDirectory, "core/poppler");
+        ae.extract(assetsDirectory, "core/pdf2htmlex");
 
         CoreWrapper.GlobalParams globalParams = new CoreWrapper.GlobalParams();
         globalParams.coreDataPath = odrCoreDataDirectory.getAbsolutePath();