Skip to content

Commit c9e86ee

Browse files
mp911demp911de
committed
Adopt to JUnit 5.9 changes.
Avoid duplicate parameter factory names. Closes #2702
1 parent bce56a5 commit c9e86ee

File tree

2 files changed

+46
-44
lines changed

2 files changed

+46
-44
lines changed

‎src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java

+36-35
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* @author Mark Paluch
4242
* @author Oliver Gierke
4343
*/
44+
@SuppressWarnings("WeakerAccess") // public required for class generation due to visibility rules
4445
public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
4546

4647
private final ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory();
@@ -52,45 +53,45 @@ static List<Object[]> parameters() throws Exception {
5253
List<Class<?>> types = Arrays.asList(FieldAccess.class, PropertyAccess.class, PrivateFinalFieldAccess.class,
5354
PrivateFinalPropertyAccess.class);
5455

55-
parameters.addAll(parameters(types, "primitiveInteger", Integer.valueOf(1)));
56-
parameters.addAll(parameters(types, "primitiveIntegerArray", new int[] { 1, 2, 3 }));
57-
parameters.addAll(parameters(types, "boxedInteger", Integer.valueOf(1)));
58-
parameters.addAll(parameters(types, "boxedIntegerArray", new Integer[] { Integer.valueOf(1) }));
59-
parameters.addAll(parameters(types, "primitiveShort", Short.valueOf("1")));
60-
parameters.addAll(parameters(types, "primitiveShortArray", new short[] { 1, 2, 3 }));
61-
parameters.addAll(parameters(types, "boxedShort", Short.valueOf("1")));
62-
parameters.addAll(parameters(types, "boxedShortArray", new Short[] { Short.valueOf("1") }));
63-
parameters.addAll(parameters(types, "primitiveByte", Byte.valueOf("1")));
64-
parameters.addAll(parameters(types, "primitiveByteArray", new byte[] { 1, 2, 3 }));
65-
parameters.addAll(parameters(types, "boxedByte", Byte.valueOf("1")));
66-
parameters.addAll(parameters(types, "boxedByteArray", new Byte[] { Byte.valueOf("1") }));
67-
parameters.addAll(parameters(types, "primitiveChar", Character.valueOf('c')));
68-
parameters.addAll(parameters(types, "primitiveCharArray", new char[] { 'a', 'b', 'c' }));
69-
parameters.addAll(parameters(types, "boxedChar", Character.valueOf('c')));
70-
parameters.addAll(parameters(types, "boxedCharArray", new Character[] { Character.valueOf('c') }));
71-
parameters.addAll(parameters(types, "primitiveBoolean", Boolean.valueOf(true)));
72-
parameters.addAll(parameters(types, "primitiveBooleanArray", new boolean[] { true, false }));
73-
parameters.addAll(parameters(types, "boxedBoolean", Boolean.valueOf(true)));
74-
parameters.addAll(parameters(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) }));
75-
parameters.addAll(parameters(types, "primitiveFloat", Float.valueOf(1f)));
76-
parameters.addAll(parameters(types, "primitiveFloatArray", new float[] { 1f, 2f }));
77-
parameters.addAll(parameters(types, "boxedFloat", Float.valueOf(1f)));
78-
parameters.addAll(parameters(types, "boxedFloatArray", new Float[] { Float.valueOf(1f) }));
79-
parameters.addAll(parameters(types, "primitiveDouble", Double.valueOf(1d)));
80-
parameters.addAll(parameters(types, "primitiveDoubleArray", new double[] { 1d, 2d }));
81-
parameters.addAll(parameters(types, "boxedDouble", Double.valueOf(1d)));
82-
parameters.addAll(parameters(types, "boxedDoubleArray", new Double[] { Double.valueOf(1d) }));
83-
parameters.addAll(parameters(types, "primitiveLong", Long.valueOf(1L)));
84-
parameters.addAll(parameters(types, "primitiveLongArray", new long[] { 1L, 2L }));
85-
parameters.addAll(parameters(types, "boxedLong", Long.valueOf(1L)));
86-
parameters.addAll(parameters(types, "boxedLongArray", new Long[] { Long.valueOf(1L) }));
87-
parameters.addAll(parameters(types, "string", "hello"));
88-
parameters.addAll(parameters(types, "stringArray", new String[] { "hello", "world" }));
56+
parameters.addAll(create(types, "primitiveInteger", Integer.valueOf(1)));
57+
parameters.addAll(create(types, "primitiveIntegerArray", new int[] { 1, 2, 3 }));
58+
parameters.addAll(create(types, "boxedInteger", Integer.valueOf(1)));
59+
parameters.addAll(create(types, "boxedIntegerArray", new Integer[] { Integer.valueOf(1) }));
60+
parameters.addAll(create(types, "primitiveShort", Short.valueOf("1")));
61+
parameters.addAll(create(types, "primitiveShortArray", new short[] { 1, 2, 3 }));
62+
parameters.addAll(create(types, "boxedShort", Short.valueOf("1")));
63+
parameters.addAll(create(types, "boxedShortArray", new Short[] { Short.valueOf("1") }));
64+
parameters.addAll(create(types, "primitiveByte", Byte.valueOf("1")));
65+
parameters.addAll(create(types, "primitiveByteArray", new byte[] { 1, 2, 3 }));
66+
parameters.addAll(create(types, "boxedByte", Byte.valueOf("1")));
67+
parameters.addAll(create(types, "boxedByteArray", new Byte[] { Byte.valueOf("1") }));
68+
parameters.addAll(create(types, "primitiveChar", Character.valueOf('c')));
69+
parameters.addAll(create(types, "primitiveCharArray", new char[] { 'a', 'b', 'c' }));
70+
parameters.addAll(create(types, "boxedChar", Character.valueOf('c')));
71+
parameters.addAll(create(types, "boxedCharArray", new Character[] { Character.valueOf('c') }));
72+
parameters.addAll(create(types, "primitiveBoolean", Boolean.valueOf(true)));
73+
parameters.addAll(create(types, "primitiveBooleanArray", new boolean[] { true, false }));
74+
parameters.addAll(create(types, "boxedBoolean", Boolean.valueOf(true)));
75+
parameters.addAll(create(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) }));
76+
parameters.addAll(create(types, "primitiveFloat", Float.valueOf(1f)));
77+
parameters.addAll(create(types, "primitiveFloatArray", new float[] { 1f, 2f }));
78+
parameters.addAll(create(types, "boxedFloat", Float.valueOf(1f)));
79+
parameters.addAll(create(types, "boxedFloatArray", new Float[] { Float.valueOf(1f) }));
80+
parameters.addAll(create(types, "primitiveDouble", Double.valueOf(1d)));
81+
parameters.addAll(create(types, "primitiveDoubleArray", new double[] { 1d, 2d }));
82+
parameters.addAll(create(types, "boxedDouble", Double.valueOf(1d)));
83+
parameters.addAll(create(types, "boxedDoubleArray", new Double[] { Double.valueOf(1d) }));
84+
parameters.addAll(create(types, "primitiveLong", Long.valueOf(1L)));
85+
parameters.addAll(create(types, "primitiveLongArray", new long[] { 1L, 2L }));
86+
parameters.addAll(create(types, "boxedLong", Long.valueOf(1L)));
87+
parameters.addAll(create(types, "boxedLongArray", new Long[] { Long.valueOf(1L) }));
88+
parameters.addAll(create(types, "string", "hello"));
89+
parameters.addAll(create(types, "stringArray", new String[] { "hello", "world" }));
8990

9091
return parameters;
9192
}
9293

93-
private static List<Object[]> parameters(List<Class<?>> types, String propertyName, Object value) throws Exception {
94+
private static List<Object[]> create(List<Class<?>> types, String propertyName, Object value) throws Exception {
9495

9596
List<Object[]> parameters = new ArrayList<>();
9697

‎src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
*
4242
* @author Mark Paluch
4343
*/
44+
@SuppressWarnings("WeakerAccess") // public required for class generation due to visibility rules
4445
public class ClassGeneratingPropertyAccessorFactoryTests {
4546

4647
private final static ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory();
@@ -55,17 +56,17 @@ public static List<Object[]> parameters() throws ReflectiveOperationException {
5556
"privateProperty", "packageDefaultProperty", "protectedProperty", "publicProperty", "syntheticProperty",
5657
"immutable", "wither");
5758

58-
parameters.addAll(parameters(new InnerPrivateType(), propertyNames, Object.class));
59+
parameters.addAll(create(new InnerPrivateType(), propertyNames, Object.class));
5960
parameters
60-
.addAll(parameters(new InnerTypeWithPrivateAncestor(), propertyNames, InnerTypeWithPrivateAncestor.class));
61-
parameters.addAll(parameters(new InnerPackageDefaultType(), propertyNames, InnerPackageDefaultType.class));
62-
parameters.addAll(parameters(new InnerProtectedType(), propertyNames, InnerProtectedType.class));
63-
parameters.addAll(parameters(new InnerPublicType(), propertyNames, InnerPublicType.class));
64-
parameters.addAll(parameters(new ClassGeneratingPropertyAccessorPackageDefaultType(), propertyNames,
61+
.addAll(create(new InnerTypeWithPrivateAncestor(), propertyNames, InnerTypeWithPrivateAncestor.class));
62+
parameters.addAll(create(new InnerPackageDefaultType(), propertyNames, InnerPackageDefaultType.class));
63+
parameters.addAll(create(new InnerProtectedType(), propertyNames, InnerProtectedType.class));
64+
parameters.addAll(create(new InnerPublicType(), propertyNames, InnerPublicType.class));
65+
parameters.addAll(create(new ClassGeneratingPropertyAccessorPackageDefaultType(), propertyNames,
6566
ClassGeneratingPropertyAccessorPackageDefaultType.class));
66-
parameters.addAll(parameters(new ClassGeneratingPropertyAccessorPublicType(), propertyNames,
67+
parameters.addAll(create(new ClassGeneratingPropertyAccessorPublicType(), propertyNames,
6768
ClassGeneratingPropertyAccessorPublicType.class));
68-
parameters.addAll(parameters(new SubtypeOfTypeInOtherPackage(), propertyNames, SubtypeOfTypeInOtherPackage.class));
69+
parameters.addAll(create(new SubtypeOfTypeInOtherPackage(), propertyNames, SubtypeOfTypeInOtherPackage.class));
6970

7071
Class<Object> defaultPackageClass = (Class) Class.forName("TypeInDefaultPackage");
7172

@@ -75,7 +76,7 @@ public static List<Object[]> parameters() throws ReflectiveOperationException {
7576
return parameters;
7677
}
7778

78-
private static List<Object[]> parameters(Object bean, List<String> propertyNames, Class<?> expectedConstructorType) {
79+
private static List<Object[]> create(Object bean, List<String> propertyNames, Class<?> expectedConstructorType) {
7980

8081
List<Object[]> parameters = new ArrayList<>();
8182

0 commit comments

Comments
 (0)