svn commit: r1834549 - in /commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2: converters/BooleanArrayConverterTestCase.java locale/LocaleBeanificationTestCase.java locale/LocaleConvertUtilsTestCase.java

[gg...@apache.org]

Author: ggregory
Date: Wed Jun 27 21:45:08 2018
New Revision: 1834549

URL: http://svn.apache.org/viewvc?rev=1834549&view=rev
Log:
Change indirect accesses to static members to direct accesses (accesses through subtypes.)

Modified:
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java?rev=1834549&r1=1834548&r2=1834549&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanArrayConverterTestCase.java Wed Jun 27 21:45:08 2018
@@ -158,7 +158,7 @@ public class BooleanArrayConverterTestCa
         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 @@ public class BooleanArrayConverterTestCa
             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];

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java?rev=1834549&r1=1834548&r2=1834549&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java Wed Jun 27 21:45:08 2018
@@ -27,6 +27,7 @@ import junit.framework.Test;
 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 @@ public class LocaleBeanificationTestCase
         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());

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java?rev=1834549&r1=1834548&r2=1834549&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java Wed Jun 27 21:45:08 2018
@@ -72,7 +72,7 @@ public class LocaleConvertUtilsTestCase
 
         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.