diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 22:53:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 22:53:00 +0000 |
| commit | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (patch) | |
| tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java | |
| parent | 0cd6a8551365e02a1687415356215ba2061739cd (diff) | |
| parent | 5480a6c05f0c4727b3dd154709f40fdae8d8b4a2 (diff) | |
| download | dagger2-8630738d0a775a2f8e5bc09c437556bd75d8b620.tar.gz | |
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
Diffstat (limited to 'javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java')
| -rw-r--r-- | javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java | 62 |
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", |