Fixed some exotic singular cases that were being autosingularized incorrectly.

This commit is contained in:
Reinier Zwitserloot committed 2017-07-04 02:18:58 +02:00
1 parent 4ee9215e7b
commit 9094158a7c
2 files changed
+11 -9

No files matched your search

+3 -1
View File
@@ -48,7 +48,9 @@ hives = hive
-shes = sh
-lves = lf
-rves = rf
-ves = fe
saves = save
Leaves = leaf
-ves = !
-ss = !
-us = !
-s =
+8 -8
View File
@@ -22,34 +22,34 @@
package lombok.core;
import static lombok.core.handlers.Singulars.autoSingularize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;
import org.junit.Test;
public class TestSingulars {
@Test
public void testSingulars() {
assertEquals(null, autoSingularize("axes"));
assertNull("axes", autoSingularize("axes"));
assertEquals("adjective", autoSingularize("adjectives"));
assertEquals("bus", autoSingularize("buses"));
assertEquals("octopus", autoSingularize("octopodes"));
assertEquals(null, autoSingularize("octopi"));
assertNull("octopi", autoSingularize("octopi"));
assertEquals("elf", autoSingularize("elves"));
assertEquals("jack", autoSingularize("jacks"));
assertEquals("colloquy", autoSingularize("colloquies"));
assertEquals(null, autoSingularize("series"));
assertNull("series", autoSingularize("series"));
assertEquals("man", autoSingularize("men"));
assertEquals(null, autoSingularize("highwaymen"));
assertNull("highwaymen", autoSingularize("highwaymen"));
assertEquals("caveMan", autoSingularize("caveMen"));
assertEquals(null, autoSingularize("jackss"));
assertEquals(null, autoSingularize("virus"));
assertNull("jackss", autoSingularize("jackss"));
assertNull("virus", autoSingularize("virus"));
assertEquals("quiz", autoSingularize("quizzes"));
assertEquals("database", autoSingularize("databases"));
assertEquals("dataBase", autoSingularize("dataBases"));
assertEquals("Query", autoSingularize("Queries"));
assertEquals("Movie", autoSingularize("Movies"));
assertEquals("cafe", autoSingularize("cafes"));
assertEquals("cave", autoSingularize("caves"));
assertNull("caves", autoSingularize("caves"));
assertEquals("leaf", autoSingularize("leaves"));
assertEquals("autosave", autoSingularize("autosaves"));
}