From 5486fcefcec813fe29952619157d4290ad2f71ba Mon Sep 17 00:00:00 2001 From: Dagger Team Date: Fri, 19 Nov 2021 14:07:45 -0800 Subject: [PATCH] Internal change RELNOTES=n/a PiperOrigin-RevId: 411140446 --- .../viewmodel/ViewModelGeneratorTest.kt | 102 ++---------------- .../DefineComponentProcessorTest.java | 11 +- 2 files changed, 8 insertions(+), 105 deletions(-) diff --git a/javatests/dagger/hilt/android/processor/internal/viewmodel/ViewModelGeneratorTest.kt b/javatests/dagger/hilt/android/processor/internal/viewmodel/ViewModelGeneratorTest.kt index df020ffa959..c2378e030d3 100644 --- a/javatests/dagger/hilt/android/processor/internal/viewmodel/ViewModelGeneratorTest.kt +++ b/javatests/dagger/hilt/android/processor/internal/viewmodel/ViewModelGeneratorTest.kt @@ -46,21 +46,6 @@ class ViewModelGeneratorTest { val expected = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = MyViewModel.class @@ -102,7 +87,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules") - .hasSourceEquivalentTo(expected) + .containsElementsIn(expected) } } @@ -126,21 +111,6 @@ class ViewModelGeneratorTest { val expected = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = MyViewModel.class @@ -182,7 +152,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules") - .hasSourceEquivalentTo(expected) + .containsElementsIn(expected) } } @@ -213,21 +183,6 @@ class ViewModelGeneratorTest { val expected = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = MyViewModel.class @@ -269,7 +224,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules") - .hasSourceEquivalentTo(expected) + .containsElementsIn(expected) } } @@ -301,21 +256,6 @@ class ViewModelGeneratorTest { val expected = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE; - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = MyViewModel.class @@ -357,7 +297,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules") - .hasSourceEquivalentTo(expected) + .containsElementsIn(expected) } } @@ -396,21 +336,6 @@ class ViewModelGeneratorTest { val expected = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE; - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = MyViewModel.class @@ -452,7 +377,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules") - .hasSourceEquivalentTo(expected) + .containsElementsIn(expected) } } @@ -477,21 +402,6 @@ class ViewModelGeneratorTest { val expectedModule = """ package dagger.hilt.android.test; - import androidx.lifecycle.ViewModel; - import dagger.Binds; - import dagger.Module; - import dagger.Provides; - import dagger.hilt.InstallIn; - import dagger.hilt.android.components.ActivityRetainedComponent; - import dagger.hilt.android.components.ViewModelComponent; - import dagger.hilt.android.internal.lifecycle.HiltViewModelMap; - import dagger.hilt.codegen.OriginatingElement; - import dagger.multibindings.IntoMap; - import dagger.multibindings.IntoSet; - import dagger.multibindings.StringKey; - import java.lang.String; - import $GENERATED_TYPE - $GENERATED_ANNOTATION @OriginatingElement( topLevelClass = Outer.class @@ -533,7 +443,7 @@ class ViewModelGeneratorTest { assertThat(compilation).apply { succeeded() generatedSourceFile("dagger.hilt.android.test.Outer_InnerViewModel_HiltModules") - .hasSourceEquivalentTo(expectedModule) + .containsElementsIn(expectedModule) } } } diff --git a/javatests/dagger/hilt/processor/internal/definecomponent/DefineComponentProcessorTest.java b/javatests/dagger/hilt/processor/internal/definecomponent/DefineComponentProcessorTest.java index a8c5fbe9caf..373061c5f8a 100644 --- a/javatests/dagger/hilt/processor/internal/definecomponent/DefineComponentProcessorTest.java +++ b/javatests/dagger/hilt/processor/internal/definecomponent/DefineComponentProcessorTest.java @@ -22,7 +22,6 @@ import com.google.testing.compile.Compilation; import com.google.testing.compile.Compiler; import com.google.testing.compile.JavaFileObjects; -import dagger.hilt.processor.internal.GeneratedImport; import javax.tools.JavaFileObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,9 +66,6 @@ public void testDefineComponentOutput() { "dagger.hilt.processor.internal.definecomponent.codegen._test_FooComponent", "package dagger.hilt.processor.internal.definecomponent.codegen;", "", - "import dagger.hilt.internal.definecomponent.DefineComponentClasses;", - GeneratedImport.IMPORT_GENERATED_ANNOTATION, - "", "@DefineComponentClasses(component = \"test.FooComponent\")", "@Generated(\"" + DefineComponentProcessor.class.getName() + "\")", "public class _test_FooComponent {}"); @@ -79,9 +75,6 @@ public void testDefineComponentOutput() { "dagger.hilt.processor.internal.definecomponent.codegen._test_FooComponentBuilder", "package dagger.hilt.processor.internal.definecomponent.codegen;", "", - "import dagger.hilt.internal.definecomponent.DefineComponentClasses;", - GeneratedImport.IMPORT_GENERATED_ANNOTATION, - "", "@DefineComponentClasses(builder = \"test.FooComponentBuilder\")", "@Generated(\"" + DefineComponentProcessor.class.getName() + "\")", "public class _test_FooComponentBuilder {}"); @@ -90,10 +83,10 @@ public void testDefineComponentOutput() { assertThat(compilation).succeeded(); assertThat(compilation) .generatedSourceFile(sourceName(componentOutput)) - .hasSourceEquivalentTo(componentOutput); + .containsElementsIn(componentOutput); assertThat(compilation) .generatedSourceFile(sourceName(builderOutput)) - .hasSourceEquivalentTo(builderOutput); + .containsElementsIn(builderOutput); } private static String sourceName(JavaFileObject fileObject) {