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/ComponentCreatorTest.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/ComponentCreatorTest.java')
| -rw-r--r-- | javatests/dagger/internal/codegen/ComponentCreatorTest.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/javatests/dagger/internal/codegen/ComponentCreatorTest.java b/javatests/dagger/internal/codegen/ComponentCreatorTest.java index 3cf05ac9c..0a7e40eb1 100644 --- a/javatests/dagger/internal/codegen/ComponentCreatorTest.java +++ b/javatests/dagger/internal/codegen/ComponentCreatorTest.java @@ -23,6 +23,8 @@ import static dagger.internal.codegen.CompilerMode.FAST_INIT_MODE; import static dagger.internal.codegen.Compilers.compilerWithOptions; import static dagger.internal.codegen.Compilers.daggerCompiler; import static dagger.internal.codegen.ComponentCreatorTest.CompilerType.JAVAC; +import static dagger.internal.codegen.GeneratedLines.GENERATED_CODE_ANNOTATIONS; +import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION; import static dagger.internal.codegen.binding.ComponentCreatorAnnotation.COMPONENT_BUILDER; import static dagger.internal.codegen.binding.ComponentCreatorAnnotation.COMPONENT_FACTORY; import static dagger.internal.codegen.binding.ComponentCreatorKind.BUILDER; @@ -104,7 +106,7 @@ public class ComponentCreatorTest extends ComponentCreatorTestHelper { "test.DaggerSimpleComponent", "package test;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerSimpleComponent implements SimpleComponent {", " private static final class Builder implements SimpleComponent.Builder {", " @Override", @@ -157,9 +159,9 @@ public class ComponentCreatorTest extends ComponentCreatorTestHelper { "test.DaggerTestComponent", "package test;", "", - GeneratedLines.generatedImports(), + IMPORT_GENERATED_ANNOTATION, "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerTestComponent implements TestComponent {", " private final TestModule testModule;", "", @@ -355,9 +357,10 @@ public class ComponentCreatorTest extends ComponentCreatorTestHelper { .addLines( "package test;", "", - GeneratedLines.generatedImports("import dagger.internal.Preconditions;"), + "import dagger.internal.Preconditions;", + IMPORT_GENERATED_ANNOTATION, "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerSimpleComponent implements SimpleComponent {", " private final Object object;", "", @@ -456,9 +459,10 @@ public class ComponentCreatorTest extends ComponentCreatorTestHelper { .addLines( "package test;", "", - GeneratedLines.generatedImports("import dagger.internal.Preconditions;"), + "import dagger.internal.Preconditions;", + IMPORT_GENERATED_ANNOTATION, "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerSimpleComponent implements SimpleComponent {", " private final Integer i;", "", |