Skip to content

Commit 7974ea8

Browse files
ychescale9ychescale9
committed
Move to kotlin.test.
1 parent 425e251 commit 7974ea8

File tree

8 files changed

+509
-961
lines changed

8 files changed

+509
-961
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ val fixtureAgpVersion: Provider<String> = providers
8989

9090
dependencies {
9191
compileOnly(libs.agp.build.api)
92-
testImplementation(libs.junit)
93-
testImplementation(libs.truth)
92+
testImplementation(kotlin("test"))
9493
testImplementation(libs.testParameterInjector)
9594
fixtureClasspath(libs.agp.build.gradle.flatMap { dependency ->
9695
fixtureAgpVersion.map { version ->

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ binaryCompabilityValidator = "0.18.0"
44
agp = "8.13.0"
55
detekt = "1.23.7"
66
mavenPublish = "0.34.0"
7-
junit = "4.13.2"
8-
truth = "1.1.3"
97
testParameterInjector = "1.18"
108
toolchainsResolver = "0.10.0"
119

@@ -14,8 +12,6 @@ plugin-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatt
1412

1513
agp-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
1614
agp-build-api = { module = "com.android.tools.build:gradle-api", version.ref = "agp" }
17-
junit = { module = "junit:junit", version.ref = "junit" }
18-
truth = { module = "com.google.truth:truth", version.ref = "truth" }
1915
testParameterInjector = { group = "com.google.testparameterinjector", name = "test-parameter-injector", version.ref = "testParameterInjector" }
2016

2117
[plugins]

‎src/functionalTest/kotlin/io/github/reactivecircus/appversioning/AppVersioningPluginIntegrationTest.kt‎

Lines changed: 104 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
package io.github.reactivecircus.appversioning
44

5-
import com.google.common.truth.Truth.assertThat
65
import com.google.testing.junit.testparameterinjector.TestParameter
76
import com.google.testing.junit.testparameterinjector.TestParameterInjector
87
import io.github.reactivecircus.appversioning.fixtures.AppProjectTemplate
@@ -17,6 +16,10 @@ import org.junit.Test
1716
import org.junit.rules.TemporaryFolder
1817
import org.junit.runner.RunWith
1918
import java.io.File
19+
import kotlin.test.assertEquals
20+
import kotlin.test.assertFalse
21+
import kotlin.test.assertNull
22+
import kotlin.test.assertTrue
2023

2124
@RunWith(TestParameterInjector::class)
2225
class AppVersioningPluginIntegrationTest {
@@ -34,9 +37,11 @@ class AppVersioningPluginIntegrationTest {
3437
).runAndExpectFailure(
3538
"help"
3639
) {
37-
assertThat(task("help")?.outcome).isNull()
38-
assertThat(output).contains(
39-
"Android App Versioning plugin should only be applied to an Android Application project but project ':library' doesn't have the 'com.android.application' plugin applied."
40+
assertNull(task("help")?.outcome)
41+
assertTrue(
42+
output.contains(
43+
"Android App Versioning plugin should only be applied to an Android Application project but project ':library' doesn't have the 'com.android.application' plugin applied."
44+
)
4045
)
4146
}
4247
}
@@ -52,18 +57,26 @@ class AppVersioningPluginIntegrationTest {
5257
"tasks",
5358
"--group=versioning"
5459
) {
55-
assertThat(output).contains("Versioning tasks")
56-
assertThat(output).contains(
57-
"generateAppVersionInfoForDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
60+
assertTrue(output.contains("Versioning tasks"))
61+
assertTrue(
62+
output.contains(
63+
"generateAppVersionInfoForDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
64+
)
5865
)
59-
assertThat(output).contains(
60-
"generateAppVersionInfoForRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
66+
assertTrue(
67+
output.contains(
68+
"generateAppVersionInfoForRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
69+
)
6170
)
62-
assertThat(output).contains(
63-
"printAppVersionInfoForDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
71+
assertTrue(
72+
output.contains(
73+
"printAppVersionInfoForDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
74+
)
6475
)
65-
assertThat(output).contains(
66-
"printAppVersionInfoForRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
76+
assertTrue(
77+
output.contains(
78+
"printAppVersionInfoForRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
79+
)
6780
)
6881
}
6982
}
@@ -82,30 +95,46 @@ class AppVersioningPluginIntegrationTest {
8295
"tasks",
8396
"--group=versioning"
8497
) {
85-
assertThat(output).contains("Versioning tasks")
86-
assertThat(output).contains(
87-
"generateAppVersionInfoForMockDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockDebug variant."
98+
assertTrue(output.contains("Versioning tasks"))
99+
assertTrue(
100+
output.contains(
101+
"generateAppVersionInfoForMockDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockDebug variant."
102+
)
88103
)
89-
assertThat(output).contains(
90-
"generateAppVersionInfoForProdDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodDebug variant."
104+
assertTrue(
105+
output.contains(
106+
"generateAppVersionInfoForProdDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodDebug variant."
107+
)
91108
)
92-
assertThat(output).contains(
93-
"generateAppVersionInfoForMockRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockRelease variant."
109+
assertTrue(
110+
output.contains(
111+
"generateAppVersionInfoForMockRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockRelease variant."
112+
)
94113
)
95-
assertThat(output).contains(
96-
"generateAppVersionInfoForProdRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodRelease variant."
114+
assertTrue(
115+
output.contains(
116+
"generateAppVersionInfoForProdRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodRelease variant."
117+
)
97118
)
98-
assertThat(output).contains(
99-
"printAppVersionInfoForMockDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockDebug variant."
119+
assertTrue(
120+
output.contains(
121+
"printAppVersionInfoForMockDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockDebug variant."
122+
)
100123
)
101-
assertThat(output).contains(
102-
"printAppVersionInfoForProdDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodDebug variant."
124+
assertTrue(
125+
output.contains(
126+
"printAppVersionInfoForProdDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodDebug variant."
127+
)
103128
)
104-
assertThat(output).contains(
105-
"printAppVersionInfoForMockRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockRelease variant."
129+
assertTrue(
130+
output.contains(
131+
"printAppVersionInfoForMockRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the mockRelease variant."
132+
)
106133
)
107-
assertThat(output).contains(
108-
"printAppVersionInfoForProdRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodRelease variant."
134+
assertTrue(
135+
output.contains(
136+
"printAppVersionInfoForProdRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the prodRelease variant."
137+
)
109138
)
110139
}
111140
}
@@ -126,8 +155,8 @@ class AppVersioningPluginIntegrationTest {
126155
"tasks",
127156
"--group=versioning"
128157
) {
129-
assertThat(output).doesNotContain("generateAppVersionInfoForDebug")
130-
assertThat(output).doesNotContain("printAppVersionInfoForDebug")
158+
assertFalse(output.contains("generateAppVersionInfoForDebug"))
159+
assertFalse(output.contains("printAppVersionInfoForDebug"))
131160
}
132161
}
133162

@@ -147,11 +176,15 @@ class AppVersioningPluginIntegrationTest {
147176
"tasks",
148177
"--group=versioning"
149178
) {
150-
assertThat(output).contains(
151-
"generateAppVersionInfoForDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
179+
assertTrue(
180+
output.contains(
181+
"generateAppVersionInfoForDebug - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
182+
)
152183
)
153-
assertThat(output).contains(
154-
"printAppVersionInfoForDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
184+
assertTrue(
185+
output.contains(
186+
"printAppVersionInfoForDebug - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the debug variant."
187+
)
155188
)
156189
}
157190
}
@@ -172,12 +205,16 @@ class AppVersioningPluginIntegrationTest {
172205
"tasks",
173206
"--group=versioning"
174207
) {
175-
assertThat(output).contains("Versioning tasks")
176-
assertThat(output).contains(
177-
"generateAppVersionInfoForRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
208+
assertTrue(output.contains("Versioning tasks"))
209+
assertTrue(
210+
output.contains(
211+
"generateAppVersionInfoForRelease - ${GenerateAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
212+
)
178213
)
179-
assertThat(output).contains(
180-
"printAppVersionInfoForRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
214+
assertTrue(
215+
output.contains(
216+
"printAppVersionInfoForRelease - ${PrintAppVersionInfo.TASK_DESCRIPTION_PREFIX} for the release variant."
217+
)
181218
)
182219
}
183220
}
@@ -198,9 +235,9 @@ class AppVersioningPluginIntegrationTest {
198235
"tasks",
199236
"--group=versioning"
200237
) {
201-
assertThat(output).doesNotContain("Versioning tasks")
202-
assertThat(output).contains("No tasks")
203-
assertThat(output).contains("Android App Versioning plugin is disabled.")
238+
assertFalse(output.contains("Versioning tasks"))
239+
assertTrue(output.contains("No tasks"))
240+
assertTrue(output.contains("Android App Versioning plugin is disabled."))
204241
}
205242
}
206243

@@ -228,14 +265,14 @@ class AppVersioningPluginIntegrationTest {
228265
"app/build/outputs/app_versioning/release/version_name.txt"
229266
).readText()
230267

231-
assertThat(task(":app:generateAppVersionInfoForRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
232-
assertThat(task(":app:assembleRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
268+
assertEquals(TaskOutcome.SUCCESS, task(":app:generateAppVersionInfoForRelease")?.outcome)
269+
assertEquals(TaskOutcome.SUCCESS, task(":app:assembleRelease")?.outcome)
233270

234-
assertThat(output).contains("Generated app version code: 10203.")
235-
assertThat(output).contains("Generated app version name: \"1.2.3\".")
271+
assertTrue(output.contains("Generated app version code: 10203."))
272+
assertTrue(output.contains("Generated app version name: \"1.2.3\"."))
236273

237-
assertThat(versionCodeFileContent).isEqualTo("10203")
238-
assertThat(versionNameFileContent).isEqualTo("1.2.3")
274+
assertEquals("10203", versionCodeFileContent)
275+
assertEquals("1.2.3", versionNameFileContent)
239276
}
240277
}
241278

@@ -263,14 +300,14 @@ class AppVersioningPluginIntegrationTest {
263300
"app/build/outputs/app_versioning/release/version_name.txt"
264301
).readText()
265302

266-
assertThat(task(":app:generateAppVersionInfoForRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
267-
assertThat(task(":app:assembleRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
303+
assertEquals(TaskOutcome.SUCCESS, task(":app:generateAppVersionInfoForRelease")?.outcome)
304+
assertEquals(TaskOutcome.SUCCESS, task(":app:assembleRelease")?.outcome)
268305

269-
assertThat(output).contains("Generated app version code: 10203.")
270-
assertThat(output).contains("Generated app version name: \"1.2.3\".")
306+
assertTrue(output.contains("Generated app version code: 10203."))
307+
assertTrue(output.contains("Generated app version name: \"1.2.3\"."))
271308

272-
assertThat(versionCodeFileContent).isEqualTo("10203")
273-
assertThat(versionNameFileContent).isEqualTo("1.2.3")
309+
assertEquals("10203", versionCodeFileContent)
310+
assertEquals("1.2.3", versionNameFileContent)
274311
}
275312
}
276313

@@ -298,14 +335,14 @@ class AppVersioningPluginIntegrationTest {
298335
"app/build/outputs/app_versioning/release/version_name.txt"
299336
).readText()
300337

301-
assertThat(task(":app:generateAppVersionInfoForRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
302-
assertThat(task(":app:assembleRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
338+
assertEquals(TaskOutcome.SUCCESS, task(":app:generateAppVersionInfoForRelease")?.outcome)
339+
assertEquals(TaskOutcome.SUCCESS, task(":app:assembleRelease")?.outcome)
303340

304-
assertThat(output).contains("Generated app version code: 10203.")
305-
assertThat(output).contains("Generated app version name: \"1.2.3\".")
341+
assertTrue(output.contains("Generated app version code: 10203."))
342+
assertTrue(output.contains("Generated app version name: \"1.2.3\"."))
306343

307-
assertThat(versionCodeFileContent).isEqualTo("10203")
308-
assertThat(versionNameFileContent).isEqualTo("1.2.3")
344+
assertEquals("10203", versionCodeFileContent)
345+
assertEquals("1.2.3", versionNameFileContent)
309346
}
310347
}
311348

@@ -336,13 +373,13 @@ class AppVersioningPluginIntegrationTest {
336373
"app/build/outputs/app_versioning/release/version_name.txt"
337374
)
338375

339-
assertThat(task(":app:assembleRelease")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
376+
assertEquals(TaskOutcome.SUCCESS, task(":app:assembleRelease")?.outcome)
340377

341-
assertThat(output).doesNotContain("Generated app version code")
342-
assertThat(output).doesNotContain("Generated app version name")
378+
assertFalse(output.contains("Generated app version code"))
379+
assertFalse(output.contains("Generated app version name"))
343380

344-
assertThat(versionCodeFile.exists()).isFalse()
345-
assertThat(versionNameFile.exists()).isFalse()
381+
assertFalse(versionCodeFile.exists())
382+
assertFalse(versionNameFile.exists())
346383
}
347384
}
348385
}

0 commit comments

Comments
 (0)