Skip to content

Commit ca4035c

Browse files
StefanGraeberhankem
StefanGraeber
authored and
hankem
committed
replace DataProviders.$ with Arguments.arguments
Signed-off-by: Stefan Gräber <stefan.graeber@tngtech.com>
1 parent 7d8c067 commit ca4035c

35 files changed

Lines changed: 1134 additions & 1201 deletions

‎archunit/src/jdk16test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldNewerJavaVersionTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static com.tngtech.archunit.lang.syntax.elements.ClassesShouldTest.locationPattern;
1616
import static com.tngtech.archunit.lang.syntax.elements.ClassesShouldTest.singleLineFailureReportOf;
1717
import static com.tngtech.archunit.testutil.Assertions.assertThat;
18-
import static com.tngtech.archunit.testutil.DataProviders.$;
1918
import static java.util.regex.Pattern.quote;
19+
import static org.junit.jupiter.params.provider.Arguments.arguments;
2020

2121
public class ClassesShouldNewerJavaVersionTest {
2222

2323
static Stream<Arguments> be_records() {
2424
return Stream.of(
25-
$(classes().should().beRecords(), SomeRecord.class, String.class),
26-
$(classes().should(ArchConditions.beRecords()), SomeRecord.class, String.class));
25+
arguments(classes().should().beRecords(), SomeRecord.class, String.class),
26+
arguments(classes().should(ArchConditions.beRecords()), SomeRecord.class, String.class));
2727
}
2828

2929
@ParameterizedTest
@@ -41,8 +41,8 @@ void be_records(ArchRule rule, Class<?> satisfied, Class<?> violated) {
4141

4242
static Stream<Arguments> not_be_records() {
4343
return Stream.of(
44-
$(classes().should().notBeRecords(), String.class, SomeRecord.class),
45-
$(classes().should(ArchConditions.notBeRecords()), String.class, SomeRecord.class));
44+
arguments(classes().should().notBeRecords(), String.class, SomeRecord.class),
45+
arguments(classes().should(ArchConditions.notBeRecords()), String.class, SomeRecord.class));
4646
}
4747

4848
@ParameterizedTest

‎archunit/src/test/java/com/tngtech/archunit/core/domain/DependencyTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import static com.tngtech.archunit.testutil.Assertions.assertThatConversionOf;
4242
import static com.tngtech.archunit.testutil.Assertions.assertThatDependencies;
4343
import static com.tngtech.archunit.testutil.Assertions.assertThatType;
44-
import static com.tngtech.archunit.testutil.DataProviders.$;
4544
import static com.tngtech.archunit.testutil.assertion.DependenciesAssertion.from;
45+
import static org.junit.jupiter.params.provider.Arguments.arguments;
4646

4747
public class DependencyTest {
4848

@@ -131,8 +131,8 @@ void dependency_from_access(JavaAccess<?> access) {
131131

132132
static Stream<Arguments> method_calls_to_array_types() {
133133
return Stream.of(
134-
$(ClassWithArrayDependencies.class, "oneDimArray", String[].class, 6),
135-
$(ClassWithArrayDependencies.class, "multiDimArray", String[][].class, 10)
134+
arguments(ClassWithArrayDependencies.class, "oneDimArray", String[].class, 6),
135+
arguments(ClassWithArrayDependencies.class, "multiDimArray", String[][].class, 10)
136136
);
137137
}
138138

@@ -199,9 +199,9 @@ static Stream<Arguments> with_instanceof_check_members() {
199199
.get(ClassWithDependencyOnInstanceofCheck.class);
200200

201201
return Stream.of(
202-
$(javaClass.getStaticInitializer().get(), 6),
203-
$(javaClass.getConstructor(Object.class), 9),
204-
$(javaClass.getMethod("method", Object.class), 13));
202+
arguments(javaClass.getStaticInitializer().get(), 6),
203+
arguments(javaClass.getConstructor(Object.class), 9),
204+
arguments(javaClass.getMethod("method", Object.class), 13));
205205
}
206206

207207
@ParameterizedTest
@@ -494,8 +494,8 @@ void genericTypeOnMethod(SomeGenericType<String> param) {
494494
.get(GenericTypeOnMethod.class).getMethod("genericTypeOnMethod", SomeGenericType.class);
495495
String expectedGenericParameterTypeName = SomeGenericType.class.getName() + "<" + String.class.getName() + ">";
496496
return Stream.of(
497-
$(constructor, expectedGenericParameterTypeName),
498-
$(method, expectedGenericParameterTypeName));
497+
arguments(constructor, expectedGenericParameterTypeName),
498+
arguments(method, expectedGenericParameterTypeName));
499499
}
500500

501501
@ParameterizedTest

‎archunit/src/test/java/com/tngtech/archunit/core/domain/FormattersTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import static com.google.common.primitives.Primitives.allPrimitiveTypes;
2222
import static com.tngtech.archunit.core.domain.Formatters.joinSingleQuoted;
2323
import static com.tngtech.archunit.testutil.Assertions.assertThat;
24-
import static com.tngtech.archunit.testutil.DataProviders.$;
2524
import static java.util.Arrays.stream;
2625
import static java.util.Collections.emptyList;
2726
import static java.util.Collections.singleton;
2827
import static java.util.stream.Collectors.toList;
2928
import static org.assertj.core.api.Assertions.assertThatThrownBy;
29+
import static org.junit.jupiter.params.provider.Arguments.arguments;
3030

3131
public class FormattersTest {
3232

@@ -81,10 +81,10 @@ class SomeClass {
8181
}
8282

8383
return ImmutableList.<Arguments>builder()
84-
.add($("", ""))
85-
.add($(SomeClass.class.getSimpleName(), SomeClass.class.getSimpleName()))
84+
.add(arguments("", ""))
85+
.add(arguments(SomeClass.class.getSimpleName(), SomeClass.class.getSimpleName()))
8686
.addAll(generateCanonicalNameTestCases(union(ImmutableSet.of(String.class, SomeClass.class), allRelevantPrimitiveTypes())))
87-
.add($("[[Lorg.example.Some$Inner;", "org.example.Some$Inner[][]"))
87+
.add(arguments("[[Lorg.example.Some$Inner;", "org.example.Some$Inner[][]"))
8888
.build();
8989
}
9090

@@ -95,13 +95,13 @@ private static Set<Class<?>> allRelevantPrimitiveTypes() {
9595
private static List<Arguments> generateCanonicalNameTestCases(Iterable<Class<?>> classes) {
9696
List<Arguments> result = new ArrayList<>();
9797
for (Class<?> componentType : classes) {
98-
result.add($(componentType.getName(), componentType.getName()));
98+
result.add(arguments(componentType.getName(), componentType.getName()));
9999

100100
Class<?> oneDim = Array.newInstance(componentType, 0).getClass();
101-
result.add($(oneDim.getName(), componentType.getName() + "[]"));
101+
result.add(arguments(oneDim.getName(), componentType.getName() + "[]"));
102102

103103
Class<?> twoDim = Array.newInstance(oneDim, 0).getClass();
104-
result.add($(twoDim.getName(), componentType.getName() + "[][]"));
104+
result.add(arguments(twoDim.getName(), componentType.getName() + "[][]"));
105105
}
106106
return result;
107107
}
@@ -114,11 +114,11 @@ void ensureCanonicalArrayTypeName(String input, String expected) {
114114

115115
static Stream<Arguments> test_joinSingleQuoted() {
116116
return Stream.of(
117-
$(new String[0], ""),
118-
$(new String[]{"one"}, "'one'"),
119-
$(new String[]{"one", "two"}, "'one', 'two'"),
120-
$(new String[]{"one", "two", "three"}, "'one', 'two', 'three'"),
121-
$(new String[]{"", ""}, "'', ''")
117+
arguments(new String[0], ""),
118+
arguments(new String[]{"one"}, "'one'"),
119+
arguments(new String[]{"one", "two"}, "'one', 'two'"),
120+
arguments(new String[]{"one", "two", "three"}, "'one', 'two', 'three'"),
121+
arguments(new String[]{"", ""}, "'', ''")
122122
);
123123
}
124124

‎archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassDescriptorTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.objectweb.asm.Type;
1313

1414
import static com.tngtech.archunit.testutil.Assertions.assertThat;
15-
import static com.tngtech.archunit.testutil.DataProviders.$;
1615
import static org.assertj.core.api.Assertions.assertThatThrownBy;
16+
import static org.junit.jupiter.params.provider.Arguments.arguments;
1717

1818
public class JavaClassDescriptorTest {
1919

@@ -156,8 +156,8 @@ public void converts_descriptor_repeatedly_multi_dim_array_descriptor() {
156156

157157
private static List<Arguments> namesToPrimitive(Class<?> primitiveType) {
158158
return ImmutableList.of(
159-
$(primitiveType.getName(), primitiveType),
160-
$(Type.getType(primitiveType).getDescriptor(), primitiveType));
159+
arguments(primitiveType.getName(), primitiveType),
160+
arguments(Type.getType(primitiveType).getDescriptor(), primitiveType));
161161
}
162162

163163
static List<Arguments> arrays() {
@@ -185,7 +185,7 @@ static List<Arguments> arrays() {
185185

186186
private static List<Arguments> namesToArray(Class<?> arrayType) {
187187
return ImmutableList.of(
188-
$(arrayType.getName(), arrayType),
189-
$(arrayType.getCanonicalName(), arrayType));
188+
arguments(arrayType.getName(), arrayType),
189+
arguments(arrayType.getCanonicalName(), arrayType));
190190
}
191191
}

‎archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
import static com.tngtech.archunit.testutil.Assertions.assertThatTypes;
9898
import static com.tngtech.archunit.testutil.Conditions.codeUnitWithSignature;
9999
import static com.tngtech.archunit.testutil.Conditions.containing;
100-
import static com.tngtech.archunit.testutil.DataProviders.$;
101100
import static com.tngtech.archunit.testutil.ReflectionTestUtils.getHierarchy;
102101
import static com.tngtech.archunit.testutil.assertion.DependenciesAssertion.from;
103102
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -106,6 +105,7 @@
106105
import static java.util.stream.Collectors.toSet;
107106
import static org.assertj.core.api.Assertions.assertThatThrownBy;
108107
import static org.junit.jupiter.api.Assertions.fail;
108+
import static org.junit.jupiter.params.provider.Arguments.arguments;
109109

110110
@SuppressWarnings("SameParameterValue")
111111
public class JavaClassTest {
@@ -193,13 +193,13 @@ class InnerPackagePrivateClassArray {
193193
SomePackagePrivateClass[] array;
194194
}
195195
return Stream.of(
196-
$(PublicClassArray.class, String[].class),
197-
$(PublicClassMultiDimArray.class, String[][].class),
198-
$(PrimitiveClassArray.class, int[].class),
199-
$(LocalClassArray.class, LocalClass[].class),
200-
$(PrivateClassArray.class, SomePrivateClass[].class),
201-
$(ProtectedClassArray.class, SomeProtectedClass[].class),
202-
$(InnerPackagePrivateClassArray.class, SomePackagePrivateClass[].class)
196+
arguments(PublicClassArray.class, String[].class),
197+
arguments(PublicClassMultiDimArray.class, String[][].class),
198+
arguments(PrimitiveClassArray.class, int[].class),
199+
arguments(LocalClassArray.class, LocalClass[].class),
200+
arguments(PrivateClassArray.class, SomePrivateClass[].class),
201+
arguments(ProtectedClassArray.class, SomeProtectedClass[].class),
202+
arguments(InnerPackagePrivateClassArray.class, SomePackagePrivateClass[].class)
203203
);
204204
}
205205

@@ -1503,12 +1503,12 @@ > void secondDependingOnOtherThroughMethodTypeParameter() {
15031503
SecondDependingOnOtherThroughMethodTypeParameter.class
15041504
);
15051505
return Stream.of(
1506-
$(
1506+
arguments(
15071507
dependenciesThroughConstructorTypeParameters.get(FirstDependingOnOtherThroughConstructorTypeParameter.class),
15081508
dependenciesThroughConstructorTypeParameters.get(SecondDependingOnOtherThroughConstructorTypeParameter.class),
15091509
dependenciesThroughConstructorTypeParameters.get(ClassOtherConstructorTypeSignaturesDependOn.class)
15101510
),
1511-
$(
1511+
arguments(
15121512
dependenciesThroughMethodTypeParameters.get(FirstDependingOnOtherThroughMethodTypeParameter.class),
15131513
dependenciesThroughMethodTypeParameters.get(SecondDependingOnOtherThroughMethodTypeParameter.class),
15141514
dependenciesThroughMethodTypeParameters.get(ClassOtherMethodTypeSignaturesDependOn.class)

‎archunit/src/test/java/com/tngtech/archunit/core/domain/JavaParameterizedTypeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.junit.jupiter.params.provider.Arguments;
1313
import org.junit.jupiter.params.provider.MethodSource;
1414

15-
import static com.tngtech.archunit.testutil.DataProviders.$;
1615
import static org.assertj.core.api.Assertions.assertThat;
16+
import static org.junit.jupiter.params.provider.Arguments.arguments;
1717

1818
public class JavaParameterizedTypeTest {
1919

@@ -52,7 +52,7 @@ private static Arguments createTestInput(Class<?> testClass) {
5252
.map(v -> v.getBounds().get(0))
5353
.findFirst().get();
5454

55-
return $(javaType, reflectionType);
55+
return arguments(javaType, reflectionType);
5656
}
5757

5858
@ParameterizedTest

‎archunit/src/test/java/com/tngtech/archunit/core/domain/SourceTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727

2828
import static com.tngtech.archunit.testutil.Assertions.assertThat;
29-
import static com.tngtech.archunit.testutil.DataProviders.$;
3029
import static com.tngtech.archunit.testutil.TestUtils.uriOf;
3130
import static com.tngtech.archunit.testutil.TestUtils.urlOf;
3231
import static java.nio.charset.StandardCharsets.UTF_8;
3332
import static java.util.stream.Collectors.toList;
33+
import static org.junit.jupiter.params.provider.Arguments.arguments;
3434

3535
public class SourceTest {
3636
@AfterEach
@@ -49,13 +49,13 @@ public void source_file_name() {
4949

5050
static Stream<Arguments> expectedHexCodes() {
5151
return Stream.of(
52-
$(new byte[]{0}, "00"),
53-
$(new byte[]{15}, "0f"),
54-
$(new byte[]{16}, "10"),
55-
$(new byte[]{31}, "1f"),
56-
$(new byte[]{32}, "20"),
57-
$(new byte[]{(byte) 255}, "ff"),
58-
$(new byte[]{(byte) 128, 37, 45, 22, 99}, "80252d1663")
52+
arguments(new byte[]{0}, "00"),
53+
arguments(new byte[]{15}, "0f"),
54+
arguments(new byte[]{16}, "10"),
55+
arguments(new byte[]{31}, "1f"),
56+
arguments(new byte[]{32}, "20"),
57+
arguments(new byte[]{(byte) 255}, "ff"),
58+
arguments(new byte[]{(byte) 128, 37, 45, 22, 99}, "80252d1663")
5959
);
6060
}
6161

@@ -93,9 +93,9 @@ void equals_hashcode_and_toString(URL url) throws Exception {
9393

9494
static Stream<Arguments> equalMd5Sums() {
9595
return Stream.of(
96-
$(Md5sum.UNDETERMINED, Md5sum.UNDETERMINED),
97-
$(Md5sum.NOT_SUPPORTED, Md5sum.NOT_SUPPORTED),
98-
$(md5sumOf("anything"), md5sumOf("anything")));
96+
arguments(Md5sum.UNDETERMINED, Md5sum.UNDETERMINED),
97+
arguments(Md5sum.NOT_SUPPORTED, Md5sum.NOT_SUPPORTED),
98+
arguments(md5sumOf("anything"), md5sumOf("anything")));
9999
}
100100

101101
@ParameterizedTest
@@ -126,7 +126,7 @@ private static List<Arguments> createUnequalTestCasesFor(Md5sum... md5sums) {
126126

127127
private static List<Arguments> zip(List<?> first, List<?> second) {
128128
return IntStream.range(0, first.size())
129-
.mapToObj(i -> $(first.get(i), second.get(i)))
129+
.mapToObj(i -> arguments(first.get(i), second.get(i)))
130130
.collect(toList());
131131
}
132132

0 commit comments

Comments
 (0)