diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD index ec2aea4ed3f905..28aa4639d4200c 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD +++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD @@ -28,9 +28,8 @@ java_test( srcs = ["ThrowableExtensionTest.java"], jvm_flags = [ "-Dfortest.simulated.android.sdk_int=18", - "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$MimicDesugaringStrategy'", + "-Dexpected.strategy='com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$MimicDesugaringStrategy'", ], - tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", @@ -50,9 +49,8 @@ java_test( jvm_flags = [ "-Dfortest.simulated.android.sdk_int=18", "-Dcom.google.devtools.build.android.desugar.runtime.twr_disable_mimic=true", - "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$NullDesugaringStrategy'", + "-Dexpected.strategy='com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$NullDesugaringStrategy'", ], - tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", @@ -71,9 +69,8 @@ java_test( srcs = ["ThrowableExtensionTest.java"], jvm_flags = [ "-Dfortest.simulated.android.sdk_int=19", - "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$ReuseDesugaringStrategy'", + "-Dexpected.strategy='com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$ReuseDesugaringStrategy'", ], - tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java b/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java index b65b8bdd90f7f3..dc8141cabf4a08 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java +++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java @@ -28,6 +28,10 @@ public class ThrowableExtensionTestUtility { public static String getTwrStrategyClassNameSpecifiedInSystemProperty() { String className = System.getProperty(SYSTEM_PROPERTY_EXPECTED_STRATEGY); + if (className.startsWith("'") || className.startsWith("\"")) { + assertThat(className).endsWith(className.substring(0, 1)); + className = className.substring(1, className.length() - 1); + } assertThat(className).isNotEmpty(); return className; }