Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump assertj-core from 3.16.1 to 3.17.2 in /devtools/gradle #19

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump assertj-core from 3.16.1 to 3.17.2 in /devtools/gradle #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d857957
Support for additional test-to-main directory mappings
roguexz Aug 1, 2020
61d3eee
Bump assertj-core from 3.16.1 to 3.17.2 in /devtools/gradle
dependabot[bot] Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devtools/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation "io.quarkus:quarkus-core-deployment:${version}"

testImplementation 'org.mockito:mockito-core:3.4.6'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'org.assertj:assertj-core:3.17.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
testImplementation 'org.awaitility:awaitility:4.0.3'
testImplementation 'org.jprocesses:jProcesses:1.6.5'
Expand Down
16 changes: 16 additions & 0 deletions test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;

import io.quarkus.runtime.util.ClassPathUtils;

Expand All @@ -17,6 +18,7 @@
*/
public final class PathTestHelper {
private static final Map<String, String> TEST_TO_MAIN_DIR_FRAGMENTS = new HashMap<>();

static {
// eclipse
TEST_TO_MAIN_DIR_FRAGMENTS.put(
Expand Down Expand Up @@ -46,6 +48,20 @@ public final class PathTestHelper {
"classes" + File.separator + "scala" + File.separator + "test",
"classes" + File.separator + "scala" + File.separator + "main");

String mappings = System.getenv("ADDITIONAL_TEST_TO_MAIN_MAPPINGS");
if (mappings != null) {
Stream.of(mappings.split(","))
.filter(s -> !s.isEmpty())
.forEach(s -> {
String[] entry = s.split(":");
if (entry.length == 2) {
TEST_TO_MAIN_DIR_FRAGMENTS.put(entry[0], entry[1]);
} else {
System.err.println("Unable to parse additional test-to-main mapping: " + s);
}
});
}

// maven
TEST_TO_MAIN_DIR_FRAGMENTS.put(
File.separator + "test-classes",
Expand Down