Skip to content

Commit b237ad3

Browse files
committed
Add cross-referencing comments r.e. stripping ignores
1 parent 60bf469 commit b237ad3

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

bin/journey-test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ solve_all_exercises() {
236236
"$EXECPATH"/gradlew compileTestJava
237237
# Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
238238
for testfile in `find . -name "*Test.${TRACK_SRC_EXT}"`; do
239+
# Strip @Ignore annotations to ensure we run the tests (as delivered, all but the first is @Ignore'd).
240+
# Note that unit-test.sh also strips @Ignore annotations via the Gradle task copyTestsFilteringIgnores.
241+
# The stripping implementations here and in copyTestsFilteringIgnores should be kept consistent.
239242
sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
240243
done
241244
"$EXECPATH"/gradlew test

exercises/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ subprojects { project ->
2929
}
3030
}
3131

32+
// Note that journey-test.sh also strips @Ignore annotations using sed. The
33+
// stripping implementations here and in journey-test.sh should be kept
34+
// consistent.
3235
task copyTestsFilteringIgnores(type: Copy) {
3336
from "src/test/java"
3437
into "build/gen/test/java"

0 commit comments

Comments
 (0)