Skip to content

Commit 726bb31

Browse files
committed
fixup! migrate junit-dataprovider tests involving TemporaryFolderRule to junit-jupiter-params
1 parent cd5eecb commit 726bb31

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
import java.io.IOException;
44
import java.net.URI;
55
import java.nio.file.Path;
6-
import java.util.HashSet;
6+
import java.util.ArrayList;
77
import java.util.List;
8-
import java.util.Set;
98
import java.util.stream.Collectors;
109
import java.util.stream.Stream;
1110

1211
import com.google.common.collect.ImmutableList;
13-
import com.google.common.collect.Sets;
12+
import com.google.common.collect.Lists;
1413
import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeArchives;
1514
import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeGradleTestFixtures;
1615
import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeJars;
@@ -93,8 +92,8 @@ private static List<FolderPattern> getFolderPatterns() {
9392
}
9493

9594
static Stream<Arguments> test_location_predicates_and_expected_folder_patterns() {
96-
Set<Arguments> includeMainFolderInput = new HashSet<>();
97-
Set<Arguments> includeTestFolderInput = new HashSet<>();
95+
List<Arguments> includeMainFolderInput = new ArrayList<>();
96+
List<Arguments> includeTestFolderInput = new ArrayList<>();
9897
for (FolderPattern folderPattern : getFolderPatterns()) {
9998
includeMainFolderInput.add(arguments(folderPattern.folders, folderPattern.isMainFolder));
10099
includeTestFolderInput.add(arguments(folderPattern.folders, !folderPattern.isMainFolder));
@@ -106,9 +105,9 @@ static Stream<Arguments> test_location_predicates_and_expected_folder_patterns()
106105
return Stream.concat(doNotIncludeTestsDataPoints, onlyIncludeTestsDataPoints);
107106
}
108107

109-
private static Stream<Arguments> crossProduct(Stream<ImportOption> importOptionStream, Set<Arguments> includeMainFolderInput) {
110-
Set<Arguments> importOptions = importOptionStream.map(Arguments::of).collect(Collectors.toSet());
111-
return Sets.cartesianProduct(importOptions, includeMainFolderInput).stream()
108+
private static Stream<Arguments> crossProduct(Stream<ImportOption> importOptionStream, List<Arguments> includeMainFolderInput) {
109+
List<Arguments> importOptions = importOptionStream.map(Arguments::of).collect(Collectors.toList());
110+
return Lists.cartesianProduct(importOptions, includeMainFolderInput).stream()
112111
.map(args -> Arguments.of(Stream.concat(stream(args.get(0).get()), stream(args.get(1).get())).toArray()));
113112
}
114113

0 commit comments

Comments
 (0)