Merge pull request #78 from abes-esr/CDE-399-les-isbn-a-10-chiffres-s…

…ont-rejetes-pour-non-conformite-a-tort modif regex pour ajouter X + tu
abes-esr · Mar 22, 2024 · 6bb076a · 6bb076a
2 parents cd8ad14 + efab4d3
commit 6bb076a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/fr/abes/sudoc/service/IsbnService.java b/src/main/java/fr/abes/sudoc/service/IsbnService.java
@@ -21,7 +21,7 @@ public IsbnService(BaseXmlFunctionsCaller caller) {
 
     @Override
     public boolean checkFormat(String isbn) {
-        return isbn != null && isbn.matches("^[0-9]((?:-?[0-9]){9}|(?:-?[0-9]){12})$");
+        return isbn != null && isbn.matches("^[0-9]((?:-?[0-9]){9}|(?:-?[0-9]){8}X|(?:-?[0-9]){12})$");
     }
 
     @Override

diff --git a/src/test/java/fr/abes/sudoc/service/IsbnServiceTest.java b/src/test/java/fr/abes/sudoc/service/IsbnServiceTest.java
@@ -58,6 +58,9 @@ void checkFormatIsbn10Characters() {
 
         String isbn6 = "-22225-555---3--1";
         Assertions.assertFalse(isbnService.checkFormat(isbn6));
+
+        String isbn7 = "274758450X";
+        Assertions.assertTrue(isbnService.checkFormat(isbn7));
     }
 
     @Test