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/SubcomponentValidationTest.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/SubcomponentValidationTest.java')
| -rw-r--r-- | javatests/dagger/internal/codegen/SubcomponentValidationTest.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/javatests/dagger/internal/codegen/SubcomponentValidationTest.java b/javatests/dagger/internal/codegen/SubcomponentValidationTest.java index c63522e88..19a27ff85 100644 --- a/javatests/dagger/internal/codegen/SubcomponentValidationTest.java +++ b/javatests/dagger/internal/codegen/SubcomponentValidationTest.java @@ -21,6 +21,8 @@ import static dagger.internal.codegen.CompilerMode.DEFAULT_MODE; 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.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; @@ -455,7 +457,7 @@ public class SubcomponentValidationTest { .addLines( "package test;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerParentComponent implements ParentComponent {") .addLinesIn( DEFAULT_MODE, @@ -654,7 +656,7 @@ public class SubcomponentValidationTest { "", "import test.subpackage.Sub;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerParentComponent implements ParentComponent {", " @Override", " public Foo.Sub newInstanceSubcomponent() {", @@ -681,10 +683,10 @@ public class SubcomponentValidationTest { " private final class B_SubImpl implements Bar.Sub {", " @Override", " public Sub newSubcomponentInSubpackage() {", - " return new ts_SubI();", + " return new ts_SubImpl();", " }", "", - " private final class ts_SubI implements Sub {}", + " private final class ts_SubImpl implements Sub {}", " }", " }", "", @@ -736,7 +738,7 @@ public class SubcomponentValidationTest { "test.DaggerParentComponent", "package test;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerParentComponent implements ParentComponent {", " @Override", " public Sub newSubcomponent() {", @@ -801,7 +803,7 @@ public class SubcomponentValidationTest { JavaFileObjects.forSourceLines( "DaggerParentComponent", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerParentComponent implements ParentComponent {", " @Override", " public Sub newSubcomponent() {", @@ -878,7 +880,7 @@ public class SubcomponentValidationTest { "", "import top1.a.b.c.d.E;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerParentComponent implements ParentComponent {", " @Override", " public E.F.Sub top1() {", @@ -935,7 +937,7 @@ public class SubcomponentValidationTest { "test.DaggerC", "package test;", "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerC implements C {", " @Override", " public Foo.C newInstanceC() {", @@ -994,9 +996,9 @@ public class SubcomponentValidationTest { "test.DaggerC", "package test;", "", - GeneratedLines.generatedImports(), + IMPORT_GENERATED_ANNOTATION, "", - GeneratedLines.generatedAnnotations(), + GENERATED_CODE_ANNOTATIONS, "final class DaggerC implements C {", " @Override", " public C.Foo.Sub.Builder fooBuilder() {", |