deps_query Support for java_test Rules

Summary:
Adding `deps_query` argument to all `java_test` rules. This feature already exists on `android_library` rules but was missing from other rule types.

With this feature, unit tests can cleanly import the direct dependencies of the source target they test, making our buck files smaller and allowing devs to write unit tests faster.

Without this, devs go through a loop with each new test target, adding the missing deps they may require from the source target's direct dependencies.

Related Posts:
https://fb.workplace.com/groups/1827686307449366/permalink/6459970044051556/
https://fb.workplace.com/groups/askbuck/permalink/6452151958166698/

Reviewed By: IanChilds

fbshipit-source-id: d291c1d96bcac308c9005623ec9ab1c54c164090

Author: Aaron Bruckner

src/com/facebook/buck/android/RobolectricTestDescription.java

@@ -63,6 +63,7 @@
 import com.facebook.buck.rules.args.Arg;
 import com.facebook.buck.rules.coercer.ManifestEntries;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
+import com.facebook.buck.rules.query.Query;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -528,5 +529,13 @@ default RobolectricTestDescriptionArg withSrcs(Iterable<SourcePath> srcs) {
       }
       return RobolectricTestDescriptionArg.builder().from(this).setSrcs(srcs).build();
     }
+
+    @Override
+    default RobolectricTestDescriptionArg withDepsQuery(Query query) {
+      if (getDepsQuery().equals(Optional.of(query))) {
+        return (RobolectricTestDescriptionArg) this;
+      }
+      return RobolectricTestDescriptionArg.builder().from(this).setDepsQuery(query).build();
+    }
   }
 }

src/com/facebook/buck/core/description/arg/HasDepsQuery.java

@@ -19,6 +19,9 @@
 import com.facebook.buck.rules.query.Query;
 import java.util.Optional;
 
+/**
+ * `deps_query` allows you to add additional dependencies to a target via executing a buck query.
+ */
 public interface HasDepsQuery extends HasDeclaredDeps {
 
   // TODO: Remove this and fix descriptions to work with implicit deps.

src/com/facebook/buck/jvm/groovy/GroovyTestDescription.java

@@ -45,6 +45,7 @@
 import com.facebook.buck.jvm.java.toolchain.JavaOptionsProvider;
 import com.facebook.buck.jvm.java.toolchain.JavacOptionsProvider;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
+import com.facebook.buck.rules.query.Query;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableMap;
@@ -200,5 +201,13 @@ public void findDepsForTargetFromConstructorArgs(
 
   @RuleArg
   interface AbstractGroovyTestDescriptionArg
-      extends GroovyLibraryDescription.CoreArg, JavaTestDescription.CoreArg {}
+      extends GroovyLibraryDescription.CoreArg, JavaTestDescription.CoreArg {
+    @Override
+    default GroovyTestDescriptionArg withDepsQuery(Query query) {
+      if (getDepsQuery().equals(Optional.of(query))) {
+        return (GroovyTestDescriptionArg) this;
+      }
+      return GroovyTestDescriptionArg.builder().from(this).setDepsQuery(query).build();
+    }
+  }
 }

src/com/facebook/buck/jvm/java/JavaTestDescription.java

@@ -18,6 +18,7 @@
 
 import com.facebook.buck.core.cell.CellPathResolver;
 import com.facebook.buck.core.cell.nameresolver.CellNameResolver;
+import com.facebook.buck.core.description.arg.HasDepsQuery;
 import com.facebook.buck.core.description.arg.HasTestTimeout;
 import com.facebook.buck.core.description.attr.ImplicitDepsInferringDescription;
 import com.facebook.buck.core.exceptions.HumanReadableException;
@@ -55,6 +56,7 @@
 import com.facebook.buck.rules.macros.MacroExpander;
 import com.facebook.buck.rules.macros.StringWithMacros;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
+import com.facebook.buck.rules.query.Query;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.facebook.buck.util.stream.RichStream;
 import com.facebook.buck.versions.VersionRoot;
@@ -312,7 +314,7 @@ public void findDepsForTargetFromConstructorArgs(
         targetGraphOnlyDepsBuilder, constructorArg, buildTarget.getTargetConfiguration());
   }
 
-  public interface CoreArg extends HasTestTimeout, JavaLibraryDescription.CoreArg {
+  public interface CoreArg extends HasTestTimeout, HasDepsQuery, JavaLibraryDescription.CoreArg {
     ImmutableList<StringWithMacros> getVmArgs();
 
     Optional<TestType> getTestType();
@@ -345,7 +347,15 @@ default ForkMode getForkMode() {
   }
 
   @RuleArg
-  interface AbstractJavaTestDescriptionArg extends CoreArg, HasTestRunner {}
+  interface AbstractJavaTestDescriptionArg extends CoreArg, HasTestRunner {
+    @Override
+    default JavaTestDescriptionArg withDepsQuery(Query query) {
+      if (getDepsQuery().equals(Optional.of(query))) {
+        return (JavaTestDescriptionArg) this;
+      }
+      return JavaTestDescriptionArg.builder().from(this).setDepsQuery(query).build();
+    }
+  }
 
   public static class CxxLibraryEnhancement {
     public final BuildRuleParams updatedParams;

src/com/facebook/buck/jvm/kotlin/KotlinTestDescription.java

@@ -44,6 +44,7 @@
 import com.facebook.buck.jvm.java.toolchain.JavaOptionsProvider;
 import com.facebook.buck.jvm.java.toolchain.JavacOptionsProvider;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
+import com.facebook.buck.rules.query.Query;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -214,5 +215,13 @@ public void findDepsForTargetFromConstructorArgs(
 
   @RuleArg
   interface AbstractKotlinTestDescriptionArg
-      extends KotlinLibraryDescription.CoreArg, JavaTestDescription.CoreArg {}
+      extends KotlinLibraryDescription.CoreArg, JavaTestDescription.CoreArg {
+    @Override
+    default KotlinTestDescriptionArg withDepsQuery(Query query) {
+      if (getDepsQuery().equals(Optional.of(query))) {
+        return (KotlinTestDescriptionArg) this;
+      }
+      return KotlinTestDescriptionArg.builder().from(this).setDepsQuery(query).build();
+    }
+  }
 }

src/com/facebook/buck/jvm/scala/ScalaTestDescription.java

@@ -48,6 +48,7 @@
 import com.facebook.buck.jvm.java.toolchain.JavaOptionsProvider;
 import com.facebook.buck.jvm.java.toolchain.JavacOptionsProvider;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
+import com.facebook.buck.rules.query.Query;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableMap;
@@ -227,5 +228,13 @@ public void findDepsForTargetFromConstructorArgs(
 
   @RuleArg
   interface AbstractScalaTestDescriptionArg
-      extends ScalaLibraryDescription.CoreArg, JavaTestDescription.CoreArg {}
+      extends ScalaLibraryDescription.CoreArg, JavaTestDescription.CoreArg {
+    @Override
+    default ScalaTestDescriptionArg withDepsQuery(Query query) {
+      if (getDepsQuery().equals(Optional.of(query))) {
+        return (ScalaTestDescriptionArg) this;
+      }
+      return ScalaTestDescriptionArg.builder().from(this).setDepsQuery(query).build();
+    }
+  }
 }

test/com/facebook/buck/jvm/java/JavaTestIntegrationTest.java

@@ -636,6 +636,14 @@ public void testSimpleWorkingJunitTest() throws IOException {
     workspace.runBuckCommand("test", "//:java_test_working").assertSuccess();
   }
 
+  @Test
+  public void testSimpleWorkingJunitTestWithDepsQuery() throws IOException {
+    ProjectWorkspace workspace =
+        TestDataHelper.createProjectWorkspaceForScenario(this, "java_test_deps_query", temp);
+    workspace.setUp();
+    workspace.runBuckCommand("test", "//:java_test_deps_query").assertSuccess();
+  }
+
   @Test
   public void testSimpleWorkingJunitTestWithDependencyOrderClasspath() throws IOException {
     ProjectWorkspace workspace =

test/com/facebook/buck/jvm/java/testdata/java_test_deps_query/BUCK.fixture

@@ -0,0 +1,28 @@
+java_test(
+    name = "java_test_deps_query",
+    srcs = [
+        "SimpleTest.java",
+    ],
+    deps_query = "deps(':class_a', 1)",
+    deps = [
+        ":class_a",
+        "buck//third-party/java/junit:junit",
+    ],
+)
+
+java_library(
+    name = "class_a",
+    srcs = [
+        "ClassA.java",
+    ],
+    deps = [
+        ":class_b",
+    ],
+)
+
+java_library(
+    name = "class_b",
+    srcs = [
+        "ClassB.java",
+    ],
+)

test/com/facebook/buck/jvm/java/testdata/java_test_deps_query/ClassA.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014-present Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class ClassA {
+  public void example() {
+    // No Op
+  }
+}

test/com/facebook/buck/jvm/java/testdata/java_test_deps_query/ClassB.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014-present Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class ClassB {
+  public void example() {
+    // No Op
+  }
+}