Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/target/
.classpath
.project
/.settings
/.settings
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,13 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
3 changes: 0 additions & 3 deletions src/main/java/fr/diginamic/enumerations/Saison.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ public static Saison valueOfLibelle(String libelle) {
if (libelle.equals(saison.getLibelle())) {
return saison;
}
else {
return null;
}
}
return null;
}
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/fr/diginamic/utils/StringUtils.java
Original file line number Diff line number Diff line change
@@ -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
*
Expand All @@ -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];
Expand All @@ -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;
Expand Down
38 changes: 38 additions & 0 deletions src/test/java/fr/diginamic/enumerations/SaisonTest.java
Original file line number Diff line number Diff line change
@@ -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");
}
}
40 changes: 40 additions & 0 deletions src/test/java/fr/diginamic/utils/StringUtilsTest.java
Original file line number Diff line number Diff line change
@@ -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");
}
}