Skip to content

Commit

Permalink
Internal change
Browse files Browse the repository at this point in the history 
RELNOTES=n/a
PiperOrigin-RevId: 411140446
  • Loading branch information
@java-team-github-bot
java-team-github-bot authored and Dagger Team committed Nov 19, 2021
1 parent 8184387 commit 5486fce
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 105 deletions.
102 changes: 6 additions & 96 deletions javatests/dagger/hilt/android/processor/internal/viewmodel/ViewModelGeneratorTest.kt
View file
Expand Up @@ -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
Expand Down Expand Up @@ -102,7 +87,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules")
.hasSourceEquivalentTo(expected)
.containsElementsIn(expected)
}
}

Expand All @@ -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
Expand Down Expand Up @@ -182,7 +152,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules")
.hasSourceEquivalentTo(expected)
.containsElementsIn(expected)
}
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -269,7 +224,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules")
.hasSourceEquivalentTo(expected)
.containsElementsIn(expected)
}
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -357,7 +297,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules")
.hasSourceEquivalentTo(expected)
.containsElementsIn(expected)
}
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -452,7 +377,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.MyViewModel_HiltModules")
.hasSourceEquivalentTo(expected)
.containsElementsIn(expected)
}
}

Expand All @@ -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
Expand Down Expand Up @@ -533,7 +443,7 @@ class ViewModelGeneratorTest {
assertThat(compilation).apply {
succeeded()
generatedSourceFile("dagger.hilt.android.test.Outer_InnerViewModel_HiltModules")
.hasSourceEquivalentTo(expectedModule)
.containsElementsIn(expectedModule)
}
}
}
11 changes: 2 additions & 9 deletions javatests/dagger/hilt/processor/internal/definecomponent/DefineComponentProcessorTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}");
Expand All @@ -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 {}");
Expand All @@ -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) {
Expand Down

0 comments on commit 5486fce

Please sign in to comment.