litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update commons-lang to 3.4 (same as used by Jena 3.1.1)

Browse source
This commit is contained in:
Graham Triggs 2016-12-17 20:10:37 +00:00
parent 0665f3ee21
commit 39e0dc438c
97 changed files with 141 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
View file

@ -14,7 +14,7 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Before;
import org.junit.Test;

2
api/src/test/java/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoaderTest.java
View file

@ -11,7 +11,7 @@ import java.nio.file.Paths;
import java.util.Arrays;
import java.util.SortedSet;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import edu.cornell.mannlib.vitro.webapp.freemarker.loader.FreemarkerTemplateLoader.PathPieces;

24
api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetupTest.java
View file

@ -14,8 +14,8 @@ import java.util.Locale;
import javax.servlet.ServletContextEvent;
import org.apache.commons.lang.LocaleUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
@ -66,7 +66,7 @@ public class LocaleSelectionSetupTest extends AbstractTestClass {
@After
public void checkExpectations() {
if (expectedMessageCounts == null) {
fail("expecteMessages() was not called");
fail("expectedMessages() was not called");
}
String message = compareMessageCount("info", ss.getInfoCount(),
@ -194,7 +194,8 @@ public class LocaleSelectionSetupTest extends AbstractTestClass {
public void langaugeIsEmpty() {
props.setProperty(PROPERTY_FORCE_LOCALE, "_ES");
lss.contextInitialized(sce);
expectMessages(0, 1, 0);
expectForced("_ES");
expectMessages(1, 1, 0);
}
@Test
@ -253,13 +254,14 @@ public class LocaleSelectionSetupTest extends AbstractTestClass {
expectMessages(0, 1, 0);
}
@Test
public void funkyVariantIsAcceptable() {
props.setProperty(PROPERTY_FORCE_LOCALE, "es_ES_123_aa");
lss.contextInitialized(sce);
expectForced("es_ES_123_aa");
expectMessages(1, 1, 0);
}
// This shouldn't really be acceptable, so we won't test that it is
// @Test
// public void funkyVariantIsAcceptable() {
// props.setProperty(PROPERTY_FORCE_LOCALE, "es_ES_123_aa");
// lss.contextInitialized(sce);
// expectForced("es_ES_123_aa");
// expectMessages(1, 1, 0);
// }
@Test
public void localeNotRecognizedProducesWarning() {

2
api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java
View file

@ -5,7 +5,7 @@ import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Before;

2
api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
View file

@ -22,7 +22,7 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;