diff options
Diffstat (limited to 'src/test/shell/bazel')
| -rw-r--r-- | src/test/shell/bazel/BUILD | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_example_test.sh | 7 | ||||
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/testenv.sh | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index b6f2dba217..8d0be17ac0 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -52,6 +52,7 @@ filegroup( "//src:bazel", "//src/java_tools/buildjar:JavaBuilder_deploy.jar", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", + "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/main/tools:namespace-sandbox", "//src/main/tools:process-wrapper", diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index 1596431479..d20139b408 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -70,6 +70,13 @@ function test_java_test() { assert_test_fails "${java_native_tests}:resource-fail" } +function test_java_test_with_junitrunner() { + # Test with junitrunner. + setup_javatest_support + local java_native_tests=//examples/java-native/src/test/java/com/example/myproject + assert_test_ok "${java_native_tests}:custom_with_test_class" +} + function test_java_test_with_workspace_name() { local java_pkg=examples/java-native/src/main/java/com/example/myproject # Use named workspace and test if we can still execute hello-world diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index 4130740399..b9cc243ee7 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -370,6 +370,7 @@ function create_new_workspace() { ln -s "${javabuilder_path}" tools/jdk/JavaBuilder_deploy.jar ln -s "${singlejar_path}" tools/jdk/SingleJar_deploy.jar ln -s "${genclass_path}" tools/jdk/GenClass_deploy.jar + ln -s "${junitrunner_path}" tools/jdk/TestRunner_deploy.jar ln -s "${ijar_path}" tools/jdk/ijar touch WORKSPACE diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh index b2f76ae7aa..c03fc99fbc 100755 --- a/src/test/shell/bazel/testenv.sh +++ b/src/test/shell/bazel/testenv.sh @@ -42,6 +42,7 @@ javabuilder_path="${TEST_SRCDIR}/src/java_tools/buildjar/JavaBuilder_deploy.jar" langtools_path="${TEST_SRCDIR}/third_party/java/jdk/langtools/javac.jar" singlejar_path="${TEST_SRCDIR}/src/java_tools/singlejar/SingleJar_deploy.jar" genclass_path="${TEST_SRCDIR}/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/GenClass_deploy.jar" +junitrunner_path="${TEST_SRCDIR}/src/java_tools/junitrunner/java/com/google/testing/junit/runner/Runner_deploy.jar" ijar_path="${TEST_SRCDIR}/third_party/ijar/ijar" # Sandbox tools |