Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751

Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef

1 files changed, 60 insertions, 55 deletions

diff --git a/javatests/dagger/internal/codegen/InjectConstructorFactoryGeneratorTest.java b/javatests/dagger/internal/codegen/InjectConstructorFactoryGeneratorTest.java
index 3e78d6b5d..579e87a4a 100644
--- a/javatests/dagger/internal/codegen/InjectConstructorFactoryGeneratorTest.java
+++ b/javatests/dagger/internal/codegen/InjectConstructorFactoryGeneratorTest.java
@@ -22,6 +22,8 @@ import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;
 import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources;
 import static dagger.internal.codegen.Compilers.compilerWithOptions;
 import static dagger.internal.codegen.Compilers.daggerCompiler;
+import static dagger.internal.codegen.GeneratedLines.GENERATED_CODE_ANNOTATIONS;
+import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION;
 
 import com.google.common.collect.ImmutableList;
 import com.google.testing.compile.Compilation;
@@ -132,11 +134,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<T> implements Factory<GenericClass<T>> {",
             "  private final Provider<T> tProvider;",
             "",
@@ -181,11 +183,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<A, B> implements",
             "    Factory<GenericClass<A, B>> {",
             "  private final Provider<A> aProvider;",
@@ -234,9 +236,10 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports("import dagger.internal.Factory;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<T> implements Factory<GenericClass<T>> {",
             "  @Override",
             "  public GenericClass<T> get() {",
@@ -277,11 +280,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<A, B>",
             "    implements Factory<GenericClass<A, B>> {",
             "  private final Provider<A> aProvider;",
@@ -329,12 +332,12 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import java.util.List;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            "import java.util.List;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<A extends Number & Comparable<A>,",
             "        B extends List<? extends String>,",
             "        C extends List<? super String>>",
@@ -396,13 +399,13 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.GenericClass_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.Lazy;",
-                "import dagger.internal.DoubleCheck;",
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.Lazy;",
+            "import dagger.internal.DoubleCheck;",
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class GenericClass_Factory<A, B>",
             "    implements Factory<GenericClass<A, B>> {",
             "  private final Provider<A> aProvider;",
@@ -1065,11 +1068,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.InjectConstructor_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class InjectConstructor_Factory ",
             "    implements Factory<InjectConstructor> {",
             "",
@@ -1112,11 +1115,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.AllInjections_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class AllInjections_Factory implements Factory<AllInjections> {",
             "  private final Provider<String> sProvider;",
             "  private final Provider<String> sProvider2;",
@@ -1172,12 +1175,12 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.InjectConstructor_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import java.util.List;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            "import java.util.List;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class InjectConstructor_Factory ",
             "    implements Factory<InjectConstructor> {",
             "",
@@ -1225,11 +1228,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.InjectConstructor_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class InjectConstructor_Factory ",
             "    implements Factory<InjectConstructor> {",
             "",
@@ -1281,12 +1284,12 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.InjectConstructor_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;",
-                "import other.pkg.Outer;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
+            "import other.pkg.Outer;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class InjectConstructor_Factory ",
             "    implements Factory<InjectConstructor> {",
             "",
@@ -1340,11 +1343,11 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.InjectConstructor_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports(
-                "import dagger.internal.Factory;",
-                "import javax.inject.Provider;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
+            "import javax.inject.Provider;",
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class InjectConstructor_Factory ",
             "    implements Factory<InjectConstructor> {",
             "",
@@ -1395,9 +1398,10 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.SimpleType_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports("import dagger.internal.Factory;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class SimpleType_Factory implements Factory<SimpleType> {",
             "  @Override public SimpleType get() {",
             "    return newInstance();",
@@ -1442,9 +1446,10 @@ public final class InjectConstructorFactoryGeneratorTest {
             "test.OuterType_A_Factory",
             "package test;",
             "",
-            GeneratedLines.generatedImports("import dagger.internal.Factory;"),
+            "import dagger.internal.Factory;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
-            GeneratedLines.generatedAnnotations(),
+            GENERATED_CODE_ANNOTATIONS,
             "public final class OuterType_A_Factory implements Factory<OuterType.A> {",
             "  @Override public OuterType.A get() {",
             "    return newInstance();",