[tika] branch main updated: Fix file exist judgement in method TikaTest#getResourceAsFile (#386)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new 0fdda51  Fix file exist judgement in method TikaTest#getResourceAsFile (#386)
0fdda51 is described below

commit 0fdda515135ef8f1ad48bfbaa8a835a16b8fd776
Author: Lee <55...@users.noreply.github.com>
AuthorDate: Thu Nov 19 20:49:50 2020 +0800

    Fix file exist judgement in method TikaTest#getResourceAsFile (#386)
    
    * Fix file exist judgement in method TikaTest#getResourceAsFile
    
    * Fix test error in test case SimpleComparerTest
    
    1. Fix file can't find in method testChinese
    Test file don't exist. Use method Paths.get.
    
    2. Fix file name typo in method testTagsOutOfOrder
    Change file name typo from "file16_badtags.html" to "file16_badTags.html".
    This typo won't affect windows because file name on windows can ignore case.
---
 tika-core/src/test/java/org/apache/tika/TikaTest.java               | 2 +-
 .../src/test/java/org/apache/tika/eval/SimpleComparerTest.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tika-core/src/test/java/org/apache/tika/TikaTest.java b/tika-core/src/test/java/org/apache/tika/TikaTest.java
index a0b910b..b243d3f 100644
--- a/tika-core/src/test/java/org/apache/tika/TikaTest.java
+++ b/tika-core/src/test/java/org/apache/tika/TikaTest.java
@@ -106,7 +106,7 @@ public abstract class TikaTest {
            // We got the path
            uri = getResourceAsUri(".");
            File file = new File(new File(uri), name);
-           if (file == null) {
+           if (!file.exists()) {
               fail("Unable to find requested file " + name);
            }
            return file;
diff --git a/tika-eval/src/test/java/org/apache/tika/eval/SimpleComparerTest.java b/tika-eval/src/test/java/org/apache/tika/eval/SimpleComparerTest.java
index 9dd3c39..18883ac 100644
--- a/tika-eval/src/test/java/org/apache/tika/eval/SimpleComparerTest.java
+++ b/tika-eval/src/test/java/org/apache/tika/eval/SimpleComparerTest.java
@@ -155,7 +155,7 @@ public class SimpleComparerTest extends TikaTest {
         );
         EvalFilePaths fpsB = new EvalFilePaths(
                 Paths.get("non-existent.json"),
-                getResourceAsFile("/test-dirs/extractsB/non-existent.json").toPath());
+                Paths.get("/test-dirs/extractsB/non-existent.json"));
 
         comparer.compareFiles(fpsA, fpsB);
 
@@ -338,8 +338,8 @@ public class SimpleComparerTest extends TikaTest {
                 getResourceAsFile("/test-dirs/extractsA/file17_tagsOutOfOrder.json").toPath()
         );
         EvalFilePaths fpsB = new EvalFilePaths(
-                Paths.get("file16_badtags.html"),
-                getResourceAsFile("/test-dirs/extractsB/file16_badtags.html").toPath());
+                Paths.get("file16_badTags.html"),
+                getResourceAsFile("/test-dirs/extractsB/file16_badTags.html").toPath());
         comparer.compareFiles(fpsA, fpsB);
         List<Map<Cols, String>> tableInfosA = WRITER.getTable(ExtractComparer.TAGS_TABLE_A);
         assertEquals(1, tableInfosA.size());