Refactor javatests/dagger/functional/builder/ tests.

This CL does 3 main things:

  * Moves all dependencies for a test inside the test itself so that
    the test fully encapsulated and isolated from other tests in the package.
  * Creates separate test target for each test. This makes it easier to modify
    individual tests without affecting other tests in the same package.
  * Create actual tests for classes that we were previously just treating as
    "build" tests (`BuildMethodCovariantReturnInheritedTest`, `BuildMethodCovariantReturnTest`, and `PrivateConstructorsTest`).

RELNOTES=N/A
PiperOrigin-RevId: 466481296

javatests/dagger/functional/builder/BUILD

@@ -0,0 +1,101 @@
+# Copyright (C) 2022 The Dagger Authors.
+#
+# 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.
+
+# Description:
+#   Functional tests for Dagger builders
+
+load("//:build_defs.bzl", "DOCLINT_HTML_AND_SYNTAX", "SOURCE_7_TARGET_7")
+load("//:test_defs.bzl", "GenJavaTests")
+
+package(default_visibility = ["//:src"])
+
+GenJavaTests(
+    name = "BuilderBindsInstanceParameterTest",
+    srcs = ["BuilderBindsInstanceParameterTest.java"],
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
+    lib_javacopts = SOURCE_7_TARGET_7,
+    test_only_deps = [
+        "//third_party/java/guava/base",
+        "//third_party/java/guava/collect",
+        "//third_party/java/guava:testlib",
+        "//third_party/java/truth",
+        "//third_party/java/junit",
+        "//:dagger_with_compiler",
+    ],
+    deps = [],
+)
+
+GenJavaTests(
+    name = "BuilderTest",
+    srcs = ["BuilderTest.java"],
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
+    lib_javacopts = SOURCE_7_TARGET_7,
+    test_only_deps = [
+        "//third_party/java/guava/base",
+        "//third_party/java/guava/collect",
+        "//third_party/java/guava:testlib",
+        "//third_party/java/truth",
+        "//third_party/java/junit",
+        "//:dagger_with_compiler",
+    ],
+    deps = [],
+)
+
+GenJavaTests(
+    name = "PrivateConstructorsTest",
+    srcs = ["PrivateConstructorsTest.java"],
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
+    lib_javacopts = SOURCE_7_TARGET_7,
+    test_only_deps = [
+        "//third_party/java/guava/base",
+        "//third_party/java/guava/collect",
+        "//third_party/java/guava:testlib",
+        "//third_party/java/truth",
+        "//third_party/java/junit",
+        "//:dagger_with_compiler",
+    ],
+    deps = [],
+)
+
+GenJavaTests(
+    name = "BuildMethodCovariantReturnTest",
+    srcs = ["BuildMethodCovariantReturnTest.java"],
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
+    lib_javacopts = SOURCE_7_TARGET_7,
+    test_only_deps = [
+        "//third_party/java/guava/base",
+        "//third_party/java/guava/collect",
+        "//third_party/java/guava:testlib",
+        "//third_party/java/truth",
+        "//third_party/java/junit",
+        "//:dagger_with_compiler",
+    ],
+    deps = [],
+)
+
+GenJavaTests(
+    name = "BuildMethodCovariantReturnInheritedTest",
+    srcs = ["BuildMethodCovariantReturnInheritedTest.java"],
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
+    lib_javacopts = SOURCE_7_TARGET_7,
+    test_only_deps = [
+        "//third_party/java/guava/base",
+        "//third_party/java/guava/collect",
+        "//third_party/java/guava:testlib",
+        "//third_party/java/truth",
+        "//third_party/java/junit",
+        "//:dagger_with_compiler",
+    ],
+    deps = [],
+)

javatests/dagger/functional/builder/BuildMethodCovariantReturnInherited.java → javatests/dagger/functional/builder/BuildMethodCovariantReturnInheritedTest.java

@@ -16,10 +16,15 @@
 
 package dagger.functional.builder;
 
-import dagger.Component;
+import static com.google.common.truth.Truth.assertThat;
 
+import dagger.Component;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
-interface BuildMethodCovariantReturnInherited {
+@RunWith(JUnit4.class)
+public class BuildMethodCovariantReturnInheritedTest {
   @Component
   interface Simple {
     interface BuilderSupertype {
@@ -55,4 +60,26 @@ interface GenericBuilderSupertype<T> {
     @Component.Builder
     interface Builder extends GenericBuilderSupertype<Object> {}
   }
+
+  @Test
+  public void simpleComponentTest() {
+    Object component = DaggerBuildMethodCovariantReturnInheritedTest_Simple.builder().build();
+    assertThat(component).isInstanceOf(Simple.class);
+  }
+
+  @Test
+  public void genericBuilderTypeTest() {
+    ComponentSupertype component =
+        DaggerBuildMethodCovariantReturnInheritedTest_GenericBuilderType.builder().build();
+    assertThat(component).isInstanceOf(GenericBuilderType.class);
+  }
+
+  @Test
+  public void genericComponentSupertypeAndBuilderSupertypeTest() {
+    ParameterizedComponentSupertype<Object> component =
+        DaggerBuildMethodCovariantReturnInheritedTest_GenericComponentSupertypeAndBuilderSupertype
+            .builder()
+            .build();
+    assertThat(component).isInstanceOf(GenericComponentSupertypeAndBuilderSupertype.class);
+  }
 }

javatests/dagger/functional/builder/BuildMethodCovariantReturn.java → javatests/dagger/functional/builder/BuildMethodCovariantReturnTest.java

@@ -16,13 +16,26 @@
 
 package dagger.functional.builder;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import dagger.Component;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
-@Component
-interface BuildMethodCovariantReturn {
+@RunWith(JUnit4.class)
+public final class BuildMethodCovariantReturnTest {
+  @Component
+  interface C {
+    @Component.Builder
+    interface Builder {
+      Object build();
+    }
+  }
 
-  @Component.Builder
-  interface Builder {
-    Object build();
+  @Test
+  public void componentTest() {
+    Object component = DaggerBuildMethodCovariantReturnTest_C.builder().build();
+    assertThat(component).isInstanceOf(C.class);
   }
 }