Replace getPath by getName

abes-esr · Jul 20, 2023 · ba44c13 · ba44c13
1 parent 669a453
commit ba44c13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/fr/abes/kbart2kafka/utils/CheckFiles.java b/src/main/java/fr/abes/kbart2kafka/utils/CheckFiles.java
@@ -65,7 +65,7 @@ public static void detectHeaderPresence(String header, File file) throws IOExcep
     }
 
     public static void detectFileName(File file) throws IllegalFileFormatException {
-        String filename = file.getPath();
+        String filename = file.getName();
         filename = filename.replace("\\", "/");
         assert filename != null;
         if(!filename.matches("(\\w+_\\w+_)+(\\d{4}-\\d{2}-\\d{2})+(_FORCE)?+(_force)?+(.tsv)$")){
@@ -83,9 +83,9 @@ public static void detectFileName(File file) throws IllegalFileFormatException {
      * @throws IOException Impossible de lire le fichier
      */
     public static void verifyFile(File file, String header) throws IllegalFileFormatException, IOException {
+        detectFileName(file);
         isFileWithTSVExtension(file);
         detectTabulations(file);
         detectHeaderPresence(header, file);
-        detectFileName(file);
     }
 }
diff --git a/src/test/java/fr/abes/kbart2kafka/utils/CheckFilesTest.java b/src/test/java/fr/abes/kbart2kafka/utils/CheckFilesTest.java
@@ -47,7 +47,7 @@ void detectFileName() throws IllegalFileFormatException {
         this.file2 = new File("test_test_test_test1_1234-12-12_FORCE.tsv");
         CheckFiles.detectFileName(file2);
 
-        for(String name : Lists.newArrayList("123", "test_1234-12-12.tsv", "test_test_134-12-12.tsv", "test_test_1344-12-12.tsvf", "test_test_1344-12-123.tsv","test_test_test_test_1234/12/12.tsv")) {
+        for(String name : Lists.newArrayList("123", "test_1234-12-12.tsv", "test_test_134-12-12.tsv", "test_test_1344-12-12.tsvf", "test_test_1344-12-123.tsv")) {
             this.file3 = new File(name);
             IllegalFileFormatException erreur2 = Assertions.assertThrows(IllegalFileFormatException.class, () -> CheckFiles.detectFileName(file3));
             Assertions.assertEquals("Le nom du fichier " + name + " n'est pas correct", erreur2.getMessage());