diff --git a/.gitignore b/.gitignore index 6cd7fe0..281d621 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ /target/ .classpath .project -/.settings \ No newline at end of file +/.settings diff --git a/pom.xml b/pom.xml index 0f6ec95..e2601d9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,4 +18,13 @@ + + + + org.junit.jupiter + junit-jupiter-api + 5.10.2 + test + + \ No newline at end of file diff --git a/src/main/java/fr/diginamic/enumerations/Saison.java b/src/main/java/fr/diginamic/enumerations/Saison.java index dbe9ebe..1628e4e 100644 --- a/src/main/java/fr/diginamic/enumerations/Saison.java +++ b/src/main/java/fr/diginamic/enumerations/Saison.java @@ -38,9 +38,6 @@ public static Saison valueOfLibelle(String libelle) { if (libelle.equals(saison.getLibelle())) { return saison; } - else { - return null; - } } return null; } diff --git a/src/main/java/fr/diginamic/utils/StringUtils.java b/src/main/java/fr/diginamic/utils/StringUtils.java index 7650bc6..b2c3ffe 100644 --- a/src/main/java/fr/diginamic/utils/StringUtils.java +++ b/src/main/java/fr/diginamic/utils/StringUtils.java @@ -1,5 +1,7 @@ package fr.diginamic.utils; +import org.w3c.dom.ls.LSOutput; + /** * Classe qui fournit des services de traitements de chaines de caractères * @@ -14,9 +16,13 @@ public final class StringUtils { * @param rhs chaine 2 * @return distance */ - public static int levenshteinDistance(CharSequence lhs, CharSequence rhs) { - int len0 = lhs.length() + 1; - int len1 = rhs.length() + 1; + public static Integer levenshteinDistance(CharSequence lhs, CharSequence rhs) { + if (lhs == null || rhs == null) { + return -1; + } + + int len0 = lhs.toString().trim().length() + 1; + int len1 = rhs.toString().trim().length() + 1; int[] cost = new int[len0]; int[] newcost = new int[len0]; @@ -29,7 +35,7 @@ public static int levenshteinDistance(CharSequence lhs, CharSequence rhs) { newcost[0] = j; for (int i = 1; i < len0; i++) { - int match = (lhs.charAt(i - 1) == rhs.charAt(j - 1)) ? 0 : 1; + int match = (lhs.toString().trim().charAt(i - 1) == rhs.toString().trim().charAt(j - 1)) ? 0 : 1; int costReplace = cost[i - 1] + match; int costInsert = cost[i] + 1; diff --git a/src/test/java/fr/diginamic/enumerations/SaisonTest.java b/src/test/java/fr/diginamic/enumerations/SaisonTest.java new file mode 100644 index 0000000..ec423c1 --- /dev/null +++ b/src/test/java/fr/diginamic/enumerations/SaisonTest.java @@ -0,0 +1,38 @@ +package fr.diginamic.enumerations; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class SaisonTest { + + @BeforeAll + public static void setUpBeforAllTests() { + System.out.println("Befor all"); + } + + @BeforeEach + public void setUpBeforeEachTests() { + System.out.println("Before"); + } + + @Test + public void testValueOfLibelle() { + Saison resultat = Saison.valueOfLibelle("Hiver"); + assertEquals(Saison.HIVER, resultat); + } + + @AfterEach + public void tearDownAfterEachTests() { + System.out.println("After"); + } + + @AfterAll + public static void tearDownAfterAllTests() { + System.out.println("After all"); + } +} diff --git a/src/test/java/fr/diginamic/utils/StringUtilsTest.java b/src/test/java/fr/diginamic/utils/StringUtilsTest.java new file mode 100644 index 0000000..90b819d --- /dev/null +++ b/src/test/java/fr/diginamic/utils/StringUtilsTest.java @@ -0,0 +1,40 @@ +package fr.diginamic.utils; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class StringUtilsTest { + + @BeforeAll + public static void setUpBeforAllTests() { + System.out.println("Befor all"); + } + + @BeforeEach + public void setUpBeforeEachTests() { + System.out.println("Before"); + } + + @Test + public void testlevenshteinDistance() { + + int resultat = StringUtils.levenshteinDistance("Hello", null); + + assertEquals(-1, resultat); + } + + @AfterEach + public void tearDownAfterEachTests() { + System.out.println("After"); + } + + @AfterAll + public static void tearDownAfterAllTests() { + System.out.println("After all"); + } +}