This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 257c5dab7a32a3d0d9bfd4ef8468842ef9e2c0eb Author: Gary Gregory <[email protected]> AuthorDate: Wed Feb 15 15:22:52 2023 -0500 Generics --- .../commons/beanutils2/bugs/Jira347TestCase.java | 47 +++++++++++----------- .../commons/beanutils2/bugs/Jira465TestCase.java | 3 +- .../converters/BigDecimalConverterTestCase.java | 2 + .../converters/BigIntegerConverterTestCase.java | 2 +- .../converters/BooleanConverterTestCase.java | 12 +++--- .../converters/ByteConverterTestCase.java | 4 +- .../converters/ClassConverterTestCase.java | 6 +-- 7 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java index 9f598ffa..7067e659 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java @@ -47,32 +47,33 @@ public class Jira347TestCase extends TestCase { */ public void testMappedPropertyDescriptor_AnyArgsProperty() throws Exception { final String className = "org.apache.commons.beanutils2.MappedPropertyTestBean"; - final ClassLoader loader = newClassLoader(); - final Class<?> beanClass = loader.loadClass(className); - beanClass.newInstance(); + try (final URLClassLoader loader = newClassLoader()) { + final Class<?> beanClass = loader.loadClass(className); + beanClass.newInstance(); - // Sanity checks only - assertNotNull("ClassLoader is null", loader); - assertNotNull("BeanClass is null", beanClass); - assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader()); - assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader); + // Sanity checks only + assertNotNull("ClassLoader is null", loader); + assertNotNull("BeanClass is null", beanClass); + assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader()); + assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader); - // now start the test - MappedPropertyDescriptor descriptor = null; - try { - descriptor = new MappedPropertyDescriptor("anyMapped", beanClass); - } catch (final IntrospectionException e) { - // this would be fine as well - } - - if (descriptor != null) { - final String m1 = getMappedWriteMethod(descriptor); - forceGarbageCollection(); + // now start the test + MappedPropertyDescriptor descriptor = null; try { - final String m2 = getMappedWriteMethod(descriptor); - assertEquals("Method returned post garbage collection differs from Method returned prior to gc", m1, m2); - } catch (final RuntimeException e) { - fail("getMappedWriteMethod threw an exception after garbage collection " + e); + descriptor = new MappedPropertyDescriptor("anyMapped", beanClass); + } catch (final IntrospectionException e) { + // this would be fine as well + } + + if (descriptor != null) { + final String m1 = getMappedWriteMethod(descriptor); + forceGarbageCollection(); + try { + final String m2 = getMappedWriteMethod(descriptor); + assertEquals("Method returned post garbage collection differs from Method returned prior to gc", m1, m2); + } catch (final RuntimeException e) { + fail("getMappedWriteMethod threw an exception after garbage collection " + e); + } } } } diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java index d3425c23..f24ca0d3 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java @@ -16,7 +16,6 @@ */ package org.apache.commons.beanutils2.bugs; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -107,7 +106,7 @@ public class Jira465TestCase extends TestCase { assertEquals("Wrong value", NEW_VALUE, bean.getFoo(0)); } - public void testArrayProperty() throws InvocationTargetException, IllegalAccessException { + public void testArrayProperty() { final ArrayProp bean = new ArrayProp(); changeValue(bean); assertEquals("Wrong value", NEW_VALUE, bean.getFoo()[0]); diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java index a6d9b2a9..63542f2f 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java @@ -32,6 +32,8 @@ public class BigDecimalConverterTestCase extends NumberConverterTestBase<BigDeci * A class derived from {@code BigDecimal} used for testing whether derived number classes are handled correctly. */ private static class ExtendingBigDecimal extends BigDecimal { + private static final long serialVersionUID = 1L; + private ExtendingBigDecimal(final String val) { super(val); } diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java index 1d24c26a..bcb26856 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java @@ -32,7 +32,7 @@ public class BigIntegerConverterTestCase extends NumberConverterTestBase<BigInte return new TestSuite(BigIntegerConverterTestCase.class); } - private Converter converter = null; + private Converter<BigInteger> converter = null; public BigIntegerConverterTestCase(final String name) { super(name); diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java index 3949256e..8d466c9a 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java @@ -36,7 +36,7 @@ public class BooleanConverterTestCase extends TestCase { public void testAdditionalStrings() { final String[] trueStrings = { "sure" }; final String[] falseStrings = { "nope" }; - final AbstractConverter converter = new BooleanConverter(trueStrings, falseStrings); + final AbstractConverter<Boolean> converter = new BooleanConverter(trueStrings, falseStrings); testConversionValues(converter, new String[] { "sure", "Sure" }, new String[] { "nope", "nOpE" }); try { @@ -54,7 +54,7 @@ public class BooleanConverterTestCase extends TestCase { } public void testCaseInsensitivity() { - final AbstractConverter converter = new BooleanConverter(); + final AbstractConverter<Boolean> converter = new BooleanConverter(); testConversionValues(converter, new String[] { "Yes", "TRUE" }, new String[] { "NO", "fAlSe" }); } @@ -71,7 +71,7 @@ public class BooleanConverterTestCase extends TestCase { } } - protected void testConversionValues(final AbstractConverter converter, final String[] trueValues, final String[] falseValues) { + protected void testConversionValues(final AbstractConverter<Boolean> converter, final String[] trueValues, final String[] falseValues) { for (final String trueValue : trueValues) { assertEquals(Boolean.TRUE, converter.convert(Boolean.class, trueValue)); @@ -83,14 +83,14 @@ public class BooleanConverterTestCase extends TestCase { public void testDefaultValue() { final Boolean defaultValue = Boolean.TRUE; - final AbstractConverter converter = new BooleanConverter(defaultValue); + final AbstractConverter<Boolean> converter = new BooleanConverter(defaultValue); assertSame(defaultValue, converter.convert(Boolean.class, "bogus")); testConversionValues(converter, STANDARD_TRUES, STANDARD_FALSES); } public void testInvalidString() { - final AbstractConverter converter = new BooleanConverter(); + final AbstractConverter<Boolean> converter = new BooleanConverter(); try { converter.convert(Boolean.class, "bogus"); fail("Converting invalid string should have generated an exception"); @@ -108,7 +108,7 @@ public class BooleanConverterTestCase extends TestCase { } public void testStandardValues() { - final AbstractConverter converter = new BooleanConverter(); + final AbstractConverter<Boolean> converter = new BooleanConverter(); testConversionValues(converter, STANDARD_TRUES, STANDARD_FALSES); } diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java index 22820814..21fe3fa7 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java @@ -69,8 +69,8 @@ public class ByteConverterTestCase extends NumberConverterTestBase<Byte> { * Test Invalid Amounts (too big/small) */ public void testInvalidAmount() { - final Converter converter = makeConverter(); - final Class<?> clazz = Byte.class; + final Converter<Byte> converter = makeConverter(); + final Class<Byte> clazz = Byte.class; final Long min = Long.valueOf(Byte.MIN_VALUE); final Long max = Long.valueOf(Byte.MAX_VALUE); diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java index a9df28d9..b13e4106 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java @@ -73,7 +73,7 @@ public class ClassConverterTestCase extends TestCase { * Test Conversion to Class */ public void testConvertToClass() { - final Converter converter = new ClassConverter(); + final Converter<Class> converter = new ClassConverter(); assertEquals("Class Test", Integer.class, converter.convert(Class.class, Integer.class)); assertEquals("String Test", Integer.class, converter.convert(Class.class, "java.lang.Integer")); @@ -101,7 +101,7 @@ public class ClassConverterTestCase extends TestCase { */ public void testConvertToClassDefault() { - final Converter converter = new ClassConverter(Object.class); + final Converter<Class> converter = new ClassConverter(Object.class); assertEquals("Invalid Test", Object.class, converter.convert(Class.class, Integer.valueOf(6))); assertEquals("Null Test", Object.class, converter.convert(Class.class, null)); @@ -112,7 +112,7 @@ public class ClassConverterTestCase extends TestCase { */ public void testConvertToClassDefaultNull() { - final Converter converter = new ClassConverter(null); + final Converter<Class> converter = new ClassConverter(null); assertEquals("Invalid Test", null, converter.convert(Class.class, Integer.valueOf(6))); assertEquals("Null Test", null, converter.convert(Class.class, null));
