1 files changed, 32 insertions, 30 deletions
diff --git a/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java b/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java
index 4043e768f..797fe2ecb 100644
--- a/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java
+++ b/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java
@@ -21,6 +21,8 @@ import static com.google.testing.compile.CompilationSubject.assertThat;
 import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;
 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.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
@@ -232,21 +234,21 @@ public class ProductionComponentProcessorTest {
                 "test.DaggerTestClass_SimpleComponent",
                 "package test;",
                 "",
-                GeneratedLines.generatedImports(
-                    "import com.google.common.util.concurrent.ListenableFuture;",
-                    "import dagger.internal.DoubleCheck;",
-                    "import dagger.internal.InstanceFactory;",
-                    "import dagger.internal.MemoizedSentinel;",
-                    "import dagger.internal.Preconditions;",
-                    "import dagger.internal.SetFactory;",
-                    "import dagger.producers.Producer;",
-                    "import dagger.producers.internal.CancellationListener;",
-                    "import dagger.producers.internal.Producers;",
-                    "import dagger.producers.monitoring.ProductionComponentMonitor;",
-                    "import java.util.concurrent.Executor;",
-                    "import javax.inject.Provider;"),
-                "",
-                GeneratedLines.generatedAnnotations(),
+                "import com.google.common.util.concurrent.ListenableFuture;",
+                "import dagger.internal.DoubleCheck;",
+                "import dagger.internal.InstanceFactory;",
+                "import dagger.internal.MemoizedSentinel;",
+                "import dagger.internal.Preconditions;",
+                "import dagger.internal.SetFactory;",
+                "import dagger.producers.Producer;",
+                "import dagger.producers.internal.CancellationListener;",
+                "import dagger.producers.internal.Producers;",
+                "import dagger.producers.monitoring.ProductionComponentMonitor;",
+                "import java.util.concurrent.Executor;",
+                IMPORT_GENERATED_ANNOTATION,
+                "import javax.inject.Provider;",
+                "",
+                GENERATED_CODE_ANNOTATIONS,
                 "final class DaggerTestClass_SimpleComponent",
                 "    implements TestClass.SimpleComponent, CancellationListener {",
                 "  private final TestClass.BModule bModule;",
@@ -428,20 +430,20 @@ public class ProductionComponentProcessorTest {
                 "test.DaggerTestClass_SimpleComponent",
                 "package test;",
                 "",
-                GeneratedLines.generatedImports(
-                    "import com.google.common.util.concurrent.ListenableFuture;",
-                    "import dagger.internal.DoubleCheck;",
-                    "import dagger.internal.InstanceFactory;",
-                    "import dagger.internal.Preconditions;",
-                    "import dagger.internal.SetFactory;",
-                    "import dagger.producers.Producer;",
-                    "import dagger.producers.internal.CancellationListener;",
-                    "import dagger.producers.internal.Producers;",
-                    "import dagger.producers.monitoring.ProductionComponentMonitor;",
-                    "import java.util.concurrent.Executor;",
-                    "import javax.inject.Provider;"),
-                "",
-                GeneratedLines.generatedAnnotations(),
+                "import com.google.common.util.concurrent.ListenableFuture;",
+                "import dagger.internal.DoubleCheck;",
+                "import dagger.internal.InstanceFactory;",
+                "import dagger.internal.Preconditions;",
+                "import dagger.internal.SetFactory;",
+                "import dagger.producers.Producer;",
+                "import dagger.producers.internal.CancellationListener;",
+                "import dagger.producers.internal.Producers;",
+                "import dagger.producers.monitoring.ProductionComponentMonitor;",
+                "import java.util.concurrent.Executor;",
+                IMPORT_GENERATED_ANNOTATION,
+                "import javax.inject.Provider;",
+                "",
+                GENERATED_CODE_ANNOTATIONS,
                 "final class DaggerTestClass_SimpleComponent",
                 "    implements TestClass.SimpleComponent, CancellationListener {",
                 "  private Producer<TestClass.A> aEntryPoint;",
@@ -648,7 +650,7 @@ public class ProductionComponentProcessorTest {
             new JavaFileBuilder(compilerMode, "test.DaggerRoot")
                 .addLines(
                     "package test;",
-                    GeneratedLines.generatedAnnotations(),
+                    GENERATED_CODE_ANNOTATIONS,
                     "final class DaggerParent implements Parent, CancellationListener {",
                     "  private final class ChildImpl implements Child, CancellationListener {",
                     "    @Override",