Blaze now passes an extra flag to JavaBuilder, --testonly, to

mark compilations of test code.

We plan to use this for Error Prone checks that need to distinguish
between test and production code, such as enforcing
@VisibleForTesting.

PiperOrigin-RevId: 155231021

2 files changed, 72 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 3715c0c45c..4948c8bfa5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -2777,4 +2777,43 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
         .containsAllOf("--nocompress_suffixes", ".apk", ".so")
         .inOrder();
   }
+  
+  @Test
+  public void testAndroidBinaryWithTestOnlySetsTestOnly() throws Exception {
+    scratch.file(
+        "java/com/google/android/foo/BUILD",
+        "android_binary(",
+        "  name = 'foo',",
+        "  srcs = ['Foo.java'],",
+        "  testonly = 1,",
+        "  manifest = 'AndroidManifest.xml',",
+        "  resource_files = ['res/raw/foo.apk'],",
+        "  nocompress_extensions = ['.apk', '.so'],",
+        ")");
+    JavaCompileAction javacAction =
+        (JavaCompileAction)
+            getGeneratingAction(
+                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
+
+    assertThat(javacAction.buildCommandLine()).contains("--testonly");
+  }
+
+  @Test
+  public void testAndroidBinaryWithoutTestOnlyDoesntSetTestOnly() throws Exception {
+    scratch.file(
+        "java/com/google/android/foo/BUILD",
+        "android_binary(",
+        "  name = 'foo',",
+        "  srcs = ['Foo.java'],",
+        "  manifest = 'AndroidManifest.xml',",
+        "  resource_files = ['res/raw/foo.apk'],",
+        "  nocompress_extensions = ['.apk', '.so'],",
+        ")");
+    JavaCompileAction javacAction =
+        (JavaCompileAction)
+            getGeneratingAction(
+                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
+
+    assertThat(javacAction.buildCommandLine()).doesNotContain("--testonly");
+  }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index ea30deb73f..706c08c748 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -1467,4 +1467,37 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     assertThat(provider).isNotNull();
     assertThat(provider.getTransitiveAars()).hasSize(1);
   }
+  
+  @Test
+  public void testAndroidLibraryWithTestOnlySetsTestOnly() throws Exception {
+    scratch.file(
+        "java/com/google/android/foo/BUILD",
+        "android_library(",
+        "  name = 'foo',",
+        "  srcs = ['Foo.java'],",
+        "  testonly = 1,",
+        ")");
+    JavaCompileAction javacAction =
+        (JavaCompileAction)
+            getGeneratingAction(
+                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
+
+    assertThat(javacAction.buildCommandLine()).contains("--testonly");
+  }
+
+  @Test
+  public void testAndroidLibraryWithoutTestOnlyDoesntSetTestOnly() throws Exception {
+    scratch.file(
+        "java/com/google/android/foo/BUILD",
+        "android_library(",
+        "  name = 'foo',",
+        "  srcs = ['Foo.java'],",
+        ")");
+    JavaCompileAction javacAction =
+        (JavaCompileAction)
+            getGeneratingAction(
+                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
+
+    assertThat(javacAction.buildCommandLine()).doesNotContain("--testonly");
+  }
 }