commit 1e8be6ff174f1d7027e848d5788d63ef9827c659
author Gary D. Gregory <ggregory@apache.org> Wed Jun 27 21:45:08 2018 +0000
committer Gary D. Gregory <ggregory@apache.org> Wed Jun 27 21:45:08 2018 +0000
tree 0ee67c4159b11b053eff75bc448f918d572e16ed
parent f51af10fb453a7a9d9871452c361c5cfeac026d3

Change indirect accesses to static members to direct accesses (accesses through subtypes.)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk@1834549 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java

diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java
index ea94e48..a0849a3 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java
@@ -158,7 +158,7 @@
         final BooleanConverter bc = new BooleanConverter(
             trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
         final BooleanArrayConverter converter = new BooleanArrayConverter(
-            bc, BooleanArrayConverter.NO_DEFAULT);
+            bc, AbstractArrayConverter.NO_DEFAULT);
 
         final boolean[] results = (boolean[]) converter.convert(null, "NOPE, sure, sure");
         assertNotNull(results);
@@ -263,7 +263,7 @@
             trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
 
         final BooleanArrayConverter converter = new BooleanArrayConverter(
-            bc, BooleanArrayConverter.NO_DEFAULT);
+            bc, AbstractArrayConverter.NO_DEFAULT);
 
         ConvertUtils.register(converter, BooleanArrayConverter.MODEL);
         final boolean[] sample = new boolean[0];

src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java

diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
index 2d1293f..da2d06f 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
@@ -27,6 +27,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.commons.beanutils2.BeanUtilsBean;
 import org.apache.commons.beanutils2.BeanUtilsTestCase;
 import org.apache.commons.beanutils2.ContextClassLoaderLocal;
 import org.apache.commons.beanutils2.ConversionException;
@@ -299,7 +300,7 @@
         assertEquals("Signal not set by test thread", 2, signal.getSignal());
         assertTrue(
                     "Different LocaleBeanUtilsBean instances per context classloader",
-                    LocaleBeanUtilsBean.getInstance() != signal.getBean());
+                    BeanUtilsBean.getInstance() != signal.getBean());
         assertTrue(
                     "Different LocaleConvertUtilsBean instances per context classloader",
                     LocaleConvertUtilsBean.getInstance() != signal.getConvertUtils());

src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java

diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
index 8859297..116f607 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -72,7 +72,7 @@
 
         LocaleConvertUtils.deregister();
 
-        final NumberFormat nf = DecimalFormat.getNumberInstance();
+        final NumberFormat nf = NumberFormat.getNumberInstance();
         final String result = nf.format(1.1);
 
         // could be commas instead of stops in Europe.