Skip to content

Commit 9a67471

Browse files
wanyingd1996Dagger Team
authored andcommitted
Fix typo in PropertyQualifierTest and add test for property setter annotation
RELNOTES=n/a PiperOrigin-RevId: 629786551
1 parent afd1011 commit 9a67471

File tree

2 files changed

+26
-35
lines changed

2 files changed

+26
-35
lines changed

javatests/dagger/functional/kotlin/PropertyQualifierClasses.kt

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,56 +26,40 @@ import javax.inject.Qualifier
2626
@Component(modules = [TestKotlinModuleWithQualifier::class])
2727
interface TestKotlinComponentWithQualifier {
2828
fun inject(testInjectedClassWithQualifier: TestMemberInjectedClassWithQualifier)
29+
2930
fun inject(fooWithInjectedQualifier: FooWithInjectedQualifier)
3031
}
3132

3233
@Module
3334
class TestKotlinModuleWithQualifier {
34-
@Provides
35-
@JavaTestQualifier
36-
fun provideJavaDataA() = TestDataA("test")
35+
@Provides @JavaTestQualifier fun provideJavaDataA() = TestDataA("test")
3736

38-
@Provides
39-
@JavaTestQualifier
40-
fun provideJavaDataB() = TestDataB("test")
37+
@Provides @JavaTestQualifier fun provideJavaDataB() = TestDataB("test")
4138

42-
@Provides
43-
@JavaTestQualifierWithTarget
44-
fun provideJavaWithTargetDataA() = TestDataA("test")
39+
@Provides @JavaTestQualifierWithTarget fun provideJavaWithTargetDataA() = TestDataA("test")
4540

46-
@Provides
47-
@KotlinTestQualifier
48-
fun provideKotlinDataA() = TestDataA("test")
41+
@Provides @KotlinTestQualifier fun provideKotlinDataA() = TestDataA("test")
4942

50-
@Provides
51-
@JavaTestQualifier
52-
fun provideString() = "qualified string"
43+
@Provides @JavaTestQualifier fun provideString() = "qualified string"
5344
}
5445

55-
class TestConstructionInjectedClassWithQualifier @Inject constructor(
56-
@JavaTestQualifier val data: TestDataA
57-
)
46+
class TestConstructionInjectedClassWithQualifier
47+
@Inject
48+
constructor(@JavaTestQualifier val data: TestDataA)
5849

5950
@TriggerGeneratedTypeProcessor
6051
class TestMemberInjectedClassWithQualifier {
61-
@Inject
62-
@JavaTestQualifier
63-
lateinit var javaDataA: TestDataA
52+
@Inject @JavaTestQualifier lateinit var javaDataA: TestDataA
53+
54+
@Inject @field:JavaTestQualifier lateinit var javaDataB: TestDataB
6455

65-
@Inject
66-
@field:JavaTestQualifier
67-
lateinit var javaDataB: TestDataB
56+
@Inject @JavaTestQualifierWithTarget lateinit var javaWithTargetDataA: TestDataA
6857

69-
@Inject
70-
@JavaTestQualifierWithTarget
71-
lateinit var javaWithTargetDataA: TestDataA
58+
@Inject @KotlinTestQualifier lateinit var kotlinDataA: TestDataA
7259

73-
@Inject
74-
@JavaTestQualifier
75-
lateinit var kotlinDataA: TestDataA
60+
@set:Inject @setparam:KotlinTestQualifier var kotlinDataA2: TestDataA? = null
7661

77-
@Inject
78-
lateinit var dataWithConstructionInjection: TestConstructionInjectedClassWithQualifier
62+
@Inject lateinit var dataWithConstructionInjection: TestConstructionInjectedClassWithQualifier
7963

8064
val noBackingFieldProperty: Int
8165
get() = 0
@@ -88,8 +72,14 @@ class TestMemberInjectedClassWithQualifier {
8872
}
8973

9074
data class TestDataA(val data: String)
75+
9176
data class TestDataB(val data: String)
9277

93-
@Qualifier
94-
@Retention(AnnotationRetention.RUNTIME)
95-
annotation class KotlinTestQualifier
78+
@Target(
79+
AnnotationTarget.FUNCTION,
80+
AnnotationTarget.PROPERTY,
81+
AnnotationTarget.VALUE_PARAMETER,
82+
AnnotationTarget.FIELD,
83+
AnnotationTarget.PROPERTY_SETTER,
84+
)
85+
@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class KotlinTestQualifier

javatests/dagger/functional/kotlin/PropertyQualifierTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public void verifyQualifiedBinding() {
3434
assertThat(injectedClass.javaDataB).isNotNull();
3535
assertThat(injectedClass.javaWithTargetDataA).isNotNull();
3636
assertThat(injectedClass.kotlinDataA).isNotNull();
37+
assertThat(injectedClass.getKotlinDataA2()).isNotNull();
3738
assertThat(injectedClass.dataWithConstructionInjection).isNotNull();
3839
assertThat(injectedClass.dataWithConstructionInjection.getData()).isNotNull();
3940
}

0 commit comments

Comments
 (0)