From c9e86ee440dedd569f1534d0761c6d51e9d23715 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 6 Oct 2022 15:55:18 +0200 Subject: [PATCH] Adopt to JUnit 5.9 changes. Avoid duplicate parameter factory names. Closes #2702 --- ...gPropertyAccessorFactoryDatatypeTests.java | 71 ++++++++++--------- ...eneratingPropertyAccessorFactoryTests.java | 19 ++--- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java index 77f230df1..533f67fb5 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java @@ -41,6 +41,7 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Mark Paluch * @author Oliver Gierke */ +@SuppressWarnings("WeakerAccess") // public required for class generation due to visibility rules public class ClassGeneratingPropertyAccessorFactoryDatatypeTests { private final ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory(); @@ -52,45 +53,45 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests { List> types = Arrays.asList(FieldAccess.class, PropertyAccess.class, PrivateFinalFieldAccess.class, PrivateFinalPropertyAccess.class); - parameters.addAll(parameters(types, "primitiveInteger", Integer.valueOf(1))); - parameters.addAll(parameters(types, "primitiveIntegerArray", new int[] { 1, 2, 3 })); - parameters.addAll(parameters(types, "boxedInteger", Integer.valueOf(1))); - parameters.addAll(parameters(types, "boxedIntegerArray", new Integer[] { Integer.valueOf(1) })); - parameters.addAll(parameters(types, "primitiveShort", Short.valueOf("1"))); - parameters.addAll(parameters(types, "primitiveShortArray", new short[] { 1, 2, 3 })); - parameters.addAll(parameters(types, "boxedShort", Short.valueOf("1"))); - parameters.addAll(parameters(types, "boxedShortArray", new Short[] { Short.valueOf("1") })); - parameters.addAll(parameters(types, "primitiveByte", Byte.valueOf("1"))); - parameters.addAll(parameters(types, "primitiveByteArray", new byte[] { 1, 2, 3 })); - parameters.addAll(parameters(types, "boxedByte", Byte.valueOf("1"))); - parameters.addAll(parameters(types, "boxedByteArray", new Byte[] { Byte.valueOf("1") })); - parameters.addAll(parameters(types, "primitiveChar", Character.valueOf('c'))); - parameters.addAll(parameters(types, "primitiveCharArray", new char[] { 'a', 'b', 'c' })); - parameters.addAll(parameters(types, "boxedChar", Character.valueOf('c'))); - parameters.addAll(parameters(types, "boxedCharArray", new Character[] { Character.valueOf('c') })); - parameters.addAll(parameters(types, "primitiveBoolean", Boolean.valueOf(true))); - parameters.addAll(parameters(types, "primitiveBooleanArray", new boolean[] { true, false })); - parameters.addAll(parameters(types, "boxedBoolean", Boolean.valueOf(true))); - parameters.addAll(parameters(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) })); - parameters.addAll(parameters(types, "primitiveFloat", Float.valueOf(1f))); - parameters.addAll(parameters(types, "primitiveFloatArray", new float[] { 1f, 2f })); - parameters.addAll(parameters(types, "boxedFloat", Float.valueOf(1f))); - parameters.addAll(parameters(types, "boxedFloatArray", new Float[] { Float.valueOf(1f) })); - parameters.addAll(parameters(types, "primitiveDouble", Double.valueOf(1d))); - parameters.addAll(parameters(types, "primitiveDoubleArray", new double[] { 1d, 2d })); - parameters.addAll(parameters(types, "boxedDouble", Double.valueOf(1d))); - parameters.addAll(parameters(types, "boxedDoubleArray", new Double[] { Double.valueOf(1d) })); - parameters.addAll(parameters(types, "primitiveLong", Long.valueOf(1L))); - parameters.addAll(parameters(types, "primitiveLongArray", new long[] { 1L, 2L })); - parameters.addAll(parameters(types, "boxedLong", Long.valueOf(1L))); - parameters.addAll(parameters(types, "boxedLongArray", new Long[] { Long.valueOf(1L) })); - parameters.addAll(parameters(types, "string", "hello")); - parameters.addAll(parameters(types, "stringArray", new String[] { "hello", "world" })); + parameters.addAll(create(types, "primitiveInteger", Integer.valueOf(1))); + parameters.addAll(create(types, "primitiveIntegerArray", new int[] { 1, 2, 3 })); + parameters.addAll(create(types, "boxedInteger", Integer.valueOf(1))); + parameters.addAll(create(types, "boxedIntegerArray", new Integer[] { Integer.valueOf(1) })); + parameters.addAll(create(types, "primitiveShort", Short.valueOf("1"))); + parameters.addAll(create(types, "primitiveShortArray", new short[] { 1, 2, 3 })); + parameters.addAll(create(types, "boxedShort", Short.valueOf("1"))); + parameters.addAll(create(types, "boxedShortArray", new Short[] { Short.valueOf("1") })); + parameters.addAll(create(types, "primitiveByte", Byte.valueOf("1"))); + parameters.addAll(create(types, "primitiveByteArray", new byte[] { 1, 2, 3 })); + parameters.addAll(create(types, "boxedByte", Byte.valueOf("1"))); + parameters.addAll(create(types, "boxedByteArray", new Byte[] { Byte.valueOf("1") })); + parameters.addAll(create(types, "primitiveChar", Character.valueOf('c'))); + parameters.addAll(create(types, "primitiveCharArray", new char[] { 'a', 'b', 'c' })); + parameters.addAll(create(types, "boxedChar", Character.valueOf('c'))); + parameters.addAll(create(types, "boxedCharArray", new Character[] { Character.valueOf('c') })); + parameters.addAll(create(types, "primitiveBoolean", Boolean.valueOf(true))); + parameters.addAll(create(types, "primitiveBooleanArray", new boolean[] { true, false })); + parameters.addAll(create(types, "boxedBoolean", Boolean.valueOf(true))); + parameters.addAll(create(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) })); + parameters.addAll(create(types, "primitiveFloat", Float.valueOf(1f))); + parameters.addAll(create(types, "primitiveFloatArray", new float[] { 1f, 2f })); + parameters.addAll(create(types, "boxedFloat", Float.valueOf(1f))); + parameters.addAll(create(types, "boxedFloatArray", new Float[] { Float.valueOf(1f) })); + parameters.addAll(create(types, "primitiveDouble", Double.valueOf(1d))); + parameters.addAll(create(types, "primitiveDoubleArray", new double[] { 1d, 2d })); + parameters.addAll(create(types, "boxedDouble", Double.valueOf(1d))); + parameters.addAll(create(types, "boxedDoubleArray", new Double[] { Double.valueOf(1d) })); + parameters.addAll(create(types, "primitiveLong", Long.valueOf(1L))); + parameters.addAll(create(types, "primitiveLongArray", new long[] { 1L, 2L })); + parameters.addAll(create(types, "boxedLong", Long.valueOf(1L))); + parameters.addAll(create(types, "boxedLongArray", new Long[] { Long.valueOf(1L) })); + parameters.addAll(create(types, "string", "hello")); + parameters.addAll(create(types, "stringArray", new String[] { "hello", "world" })); return parameters; } - private static List parameters(List> types, String propertyName, Object value) throws Exception { + private static List create(List> types, String propertyName, Object value) throws Exception { List parameters = new ArrayList<>(); diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java index 698ba38d4..97023bfc6 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java @@ -41,6 +41,7 @@ import org.springframework.test.util.ReflectionTestUtils; * * @author Mark Paluch */ +@SuppressWarnings("WeakerAccess") // public required for class generation due to visibility rules public class ClassGeneratingPropertyAccessorFactoryTests { private final static ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory(); @@ -55,17 +56,17 @@ public class ClassGeneratingPropertyAccessorFactoryTests { "privateProperty", "packageDefaultProperty", "protectedProperty", "publicProperty", "syntheticProperty", "immutable", "wither"); - parameters.addAll(parameters(new InnerPrivateType(), propertyNames, Object.class)); + parameters.addAll(create(new InnerPrivateType(), propertyNames, Object.class)); parameters - .addAll(parameters(new InnerTypeWithPrivateAncestor(), propertyNames, InnerTypeWithPrivateAncestor.class)); - parameters.addAll(parameters(new InnerPackageDefaultType(), propertyNames, InnerPackageDefaultType.class)); - parameters.addAll(parameters(new InnerProtectedType(), propertyNames, InnerProtectedType.class)); - parameters.addAll(parameters(new InnerPublicType(), propertyNames, InnerPublicType.class)); - parameters.addAll(parameters(new ClassGeneratingPropertyAccessorPackageDefaultType(), propertyNames, + .addAll(create(new InnerTypeWithPrivateAncestor(), propertyNames, InnerTypeWithPrivateAncestor.class)); + parameters.addAll(create(new InnerPackageDefaultType(), propertyNames, InnerPackageDefaultType.class)); + parameters.addAll(create(new InnerProtectedType(), propertyNames, InnerProtectedType.class)); + parameters.addAll(create(new InnerPublicType(), propertyNames, InnerPublicType.class)); + parameters.addAll(create(new ClassGeneratingPropertyAccessorPackageDefaultType(), propertyNames, ClassGeneratingPropertyAccessorPackageDefaultType.class)); - parameters.addAll(parameters(new ClassGeneratingPropertyAccessorPublicType(), propertyNames, + parameters.addAll(create(new ClassGeneratingPropertyAccessorPublicType(), propertyNames, ClassGeneratingPropertyAccessorPublicType.class)); - parameters.addAll(parameters(new SubtypeOfTypeInOtherPackage(), propertyNames, SubtypeOfTypeInOtherPackage.class)); + parameters.addAll(create(new SubtypeOfTypeInOtherPackage(), propertyNames, SubtypeOfTypeInOtherPackage.class)); Class defaultPackageClass = (Class) Class.forName("TypeInDefaultPackage"); @@ -75,7 +76,7 @@ public class ClassGeneratingPropertyAccessorFactoryTests { return parameters; } - private static List parameters(Object bean, List propertyNames, Class expectedConstructorType) { + private static List create(Object bean, List propertyNames, Class expectedConstructorType) { List parameters = new ArrayList<>();