Browse Source

Add cross-referencing comments r.e. stripping ignores

Stuart Kent 9 years ago
parent
commit
b237ad32f1
2 changed files with 6 additions and 0 deletions
  1. 3
    0
      bin/journey-test.sh
  2. 3
    0
      exercises/build.gradle

+ 3
- 0
bin/journey-test.sh View File

@@ -236,6 +236,9 @@ solve_all_exercises() {
236 236
     "$EXECPATH"/gradlew compileTestJava
237 237
     # Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
238 238
     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.
239 242
       sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
240 243
     done
241 244
     "$EXECPATH"/gradlew test

+ 3
- 0
exercises/build.gradle View File

@@ -29,6 +29,9 @@ subprojects { project ->
29 29
     }
30 30
   }
31 31
 
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.
32 35
   task copyTestsFilteringIgnores(type: Copy) {
33 36
     from "src/test/java"
34 37
     into "build/gen/test/java"