refactor test; related to #182

Author: Jorrit Poelen

nomer-name-suggest/src/test/java/org/eol/globi/taxon/CapitalizeFirstWordTest.java nomer-taxon-resolver/src/test/java/org/eol/globi/taxon/CapitalizerTest.java

@@ -1,36 +1,36 @@
 package org.eol.globi.taxon;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
-public class CapitalizeFirstWordTest {
+public class CapitalizerTest {
 
     @Test
     public void undoLowerCase() {
-        String corrected = new CapitalizeFirstWord().suggest("homo sapiens");
+        String corrected = Capitalizer.capitalize("homo sapiens");
         assertThat(corrected, is("Homo sapiens"));
     }
 
     @Test
     public void undoLowerCase2() {
-        String corrected = new CapitalizeFirstWord().suggest("io");
+        String corrected = Capitalizer.capitalize("io");
         assertThat(corrected, is("Io"));
     }
 
     @Test
     public void doNothing() {
-        String corrected = new CapitalizeFirstWord().suggest("Homo Sapiens");
+        String corrected = Capitalizer.capitalize("Homo Sapiens");
         assertThat(corrected, is("Homo Sapiens"));
     }
 
     @Test(timeout = 10)
     public void longName() {
         String aLongName = "7 small acorns or other seed found in cheek pouches during preparation. Seeds are brown, pointed at one end and flattened on the other, 0.75 x 0.6cm.";
-        String corrected = new CapitalizeFirstWord().suggest(aLongName);
+        String corrected = Capitalizer.capitalize(aLongName);
         assertThat(corrected, is(aLongName));
     }
 
@@ -42,23 +42,21 @@ public void capitalizeLongName() {
         assertThat(corrected, is(aLongName));
     }
 
-
     @Test(timeout = 10)
     public void anotherLongName() {
         String anotherLongName = "Acorns or   found  cheek pouches during preparation   are brown  pointed at  end  flattened  the   x  cm";
         String corrected
-                = new CapitalizeFirstWord()
-                .suggest(anotherLongName);
+                = Capitalizer.capitalize(anotherLongName);
         assertThat(corrected, is(anotherLongName));
     }
 
     @Test(timeout = 10)
     public void yetAnotherLongName() {
         String anotherLongName = "Acorns or found cheek pouches during preparation are brown pointed at end flattened the x cm";
         String corrected
-                = new CapitalizeFirstWord()
-                .suggest(anotherLongName);
+                = Capitalizer.capitalize(anotherLongName);
         assertThat(corrected, is(anotherLongName));
     }
 
+
 }

nomer/src/main/java/org/globalbioticinteractions/nomer/util/HeaderRowHandler.java

@@ -1,6 +1,5 @@
 package org.globalbioticinteractions.nomer.util;
 
-import org.apache.commons.lang.StringUtils;
 import org.eol.globi.service.PropertyEnricherException;
 import org.eol.globi.taxon.Capitalizer;
 import org.eol.globi.taxon.RowHandler;