Skip to content

Commit fd91434

Browse files
chore: delete unused functionalTest code.
1 parent d8e1b02 commit fd91434

10 files changed

Lines changed: 7 additions & 221 deletions

File tree

src/functionalTest/kotlin/com/autonomousapps/advice/truth/BuildHealthSubject.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@ class BuildHealthSubject private constructor(
7070
.containsExactlyEntriesIn(expected.associate { it.projectPath to it.dependencyAdvice })
7171
}
7272

73-
fun containsExactlyDependencyAdviceIn(expected: Map<String, Set<Advice>>): Ordered {
74-
if (actual == null) failWithActual(simpleFact("build health was null"))
75-
return assertThat(actual)
76-
.comparingElementsUsing(DEPENDENCY_EQUIVALENCE)
77-
.containsExactlyElementsIn(pairs(expected))
78-
}
79-
8073
fun isEquivalentIgnoringModuleAdviceAndWarnings(expected: Iterable<ProjectAdvice>) {
8174
if (actual == null) failWithActual(simpleFact("build health was null"))
8275
assertThat(actual)
@@ -90,16 +83,6 @@ class BuildHealthSubject private constructor(
9083
.containsExactlyElementsIn(expected.map { it.projectPath to it.shouldFail })
9184
}
9285

93-
fun containsExactlyModuleAdviceIn(expected: Iterable<ProjectAdvice>): Ordered {
94-
if (actual == null) failWithActual(simpleFact("build health was null"))
95-
assertThat(actual)
96-
.comparingElementsUsing(SHOULD_FAIL_EQUIVALENCE)
97-
.containsExactlyElementsIn(expected.map { it.projectPath to it.shouldFail })
98-
return assertThat(actual)
99-
.comparingElementsUsing(MODULE_EQUIVALENCE)
100-
.containsExactlyElementsIn(pairs(expected) { it.moduleAdvice })
101-
}
102-
10386
fun containsExactlyModuleAdviceIn(expected: Map<String, Set<ModuleAdvice>>): Ordered {
10487
if (actual == null) failWithActual(simpleFact("build health was null"))
10588
return assertThat(actual)

src/functionalTest/kotlin/com/autonomousapps/fixtures/AndroidProject.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ class AppModule(
230230
override val variant = "debug"
231231

232232
init {
233-
val agpVersion = "\${com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION}"
234-
235233
withBuildFile("""
236234
|${plugins()}
237235
|

src/functionalTest/kotlin/com/autonomousapps/fixtures/JavaLibraryProject.kt

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/functionalTest/kotlin/com/autonomousapps/fixtures/ProjectDirProvider.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@ interface ProjectDirProvider {
2727
.dependencyAdvice
2828
}
2929

30-
fun removeAdviceFor(spec: ModuleSpec): Set<String> {
31-
return removeAdviceFor(spec.name)
32-
}
33-
34-
fun removeAdviceFor(moduleName: String): Set<String> {
35-
return adviceFor(moduleName).asSequence()
36-
.filter { it.isRemove() }
37-
.map { it.coordinates.identifier }
38-
.toSortedSet()
39-
}
40-
41-
fun buildHealthFor(spec: ModuleSpec): Set<ProjectAdvice> = buildHealthFor(spec.name)
42-
4330
fun buildHealthFor(moduleName: String): Set<ProjectAdvice> {
4431
return buildHealthForV2(moduleName)
4532
}

src/functionalTest/kotlin/com/autonomousapps/fixtures/RootProject.kt

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package com.autonomousapps.fixtures
55
import com.autonomousapps.kit.AbstractGradleProject
66
import com.autonomousapps.kit.gradle.dependencies.Plugins
77
import java.io.File
8-
import java.util.UUID
8+
import java.util.*
99

1010
// Very similar to what is in AbstractProject
1111
private fun newSlug() = buildString {
@@ -43,18 +43,17 @@ class RootSpec @JvmOverloads constructor(
4343
override val name: String = ":"
4444

4545
companion object {
46-
// For use from Groovy
47-
@JvmStatic @JvmOverloads fun defaultRootSpec(librarySpecs: List<LibrarySpec>? = null) = RootSpec(librarySpecs)
48-
49-
@JvmStatic fun defaultGradleProperties() = """
46+
@JvmStatic
47+
fun defaultGradleProperties() = """
5048
# Necessary for AGP 3.6+
5149
android.useAndroidX=true
5250
5351
# Try to prevent OOMs (Metaspace) in test daemons spawned by testkit tests
5452
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1024m
5553
""".trimIndent()
5654

57-
@JvmStatic fun defaultSettingsScript(agpVersion: String?, librarySpecs: List<LibrarySpec>?) = """
55+
@JvmStatic
56+
fun defaultSettingsScript(agpVersion: String?, librarySpecs: List<LibrarySpec>?) = """
5857
pluginManagement {
5958
repositories {
6059
maven { url = '${System.getProperty("com.autonomousapps.plugin-under-test.repo")}' }
@@ -69,7 +68,8 @@ class RootSpec @JvmOverloads constructor(
6968
${librarySpecs?.map { it.name }?.joinToString("\n") { "include(':$it')" } ?: ""}
7069
""".trimIndent()
7170

72-
@JvmStatic fun defaultBuildScript(
71+
@JvmStatic
72+
fun defaultBuildScript(
7373
agpVersion: String?,
7474
extensionSpec: String,
7575
) = """
@@ -95,18 +95,5 @@ class RootSpec @JvmOverloads constructor(
9595
}
9696
$extensionSpec
9797
""".trimIndent()
98-
99-
@JvmStatic
100-
fun kotlinGradlePlugin(librarySpecs: List<LibrarySpec>?): String {
101-
val anyKotlin = librarySpecs?.any {
102-
it.type == LibraryType.KOTLIN_ANDROID_LIB || it.type == LibraryType.KOTLIN_JVM_LIB
103-
} ?: false
104-
105-
return if (anyKotlin) {
106-
"""classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Plugins.KOTLIN_VERSION}""""
107-
} else {
108-
""
109-
}
110-
}
11198
}
11299
}

src/functionalTest/kotlin/com/autonomousapps/fixtures/dependencies.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,11 @@ package com.autonomousapps.fixtures
66

77
import com.autonomousapps.kit.gradle.dependencies.Plugins.KOTLIN_VERSION
88

9-
const val KOTLIN_STDLIB_ID = "org.jetbrains.kotlin:kotlin-stdlib"
10-
val KOTLIN_STDLIB = "$KOTLIN_STDLIB_ID:${KOTLIN_VERSION}"
119
const val KOTLIN_STDLIB_JDK7_ID = "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
1210
val KOTLIN_STDLIB_JDK7 = "$KOTLIN_STDLIB_JDK7_ID:${KOTLIN_VERSION}"
13-
const val COMMONS_IO_ID = "commons-io:commons-io"
14-
const val COMMONS_IO = "$COMMONS_IO_ID:2.6"
15-
const val COMMONS_TEXT_ID = "org.apache.commons:commons-text"
16-
const val COMMONS_TEXT = "$COMMONS_TEXT_ID:1.8"
17-
const val COMMONS_COLLECTIONS_ID = "org.apache.commons:commons-collections4"
18-
const val COMMONS_COLLECTIONS = "$COMMONS_COLLECTIONS_ID:4.4"
19-
const val COMMONS_LANG3_ID = "org.apache.commons:commons-lang3"
20-
const val COMMONS_LANG3 = "$COMMONS_LANG3_ID:3.9"
21-
const val JETBRAINS_ANNOTATIONS_ID = "org.jetbrains:annotations"
22-
const val JETBRAINS_ANNOTATIONS = "$JETBRAINS_ANNOTATIONS_ID:13.0"
2311

2412
const val APPCOMPAT_ID = "androidx.appcompat:appcompat"
2513
const val APPCOMPAT = "$APPCOMPAT_ID:1.1.0"
26-
27-
// This is also brought in transitively by APPCOMPAT
28-
const val ANDROIDX_ANNOTATIONS_ID = "androidx.annotation:annotation"
29-
const val ANDROIDX_ANNOTATIONS = "$ANDROIDX_ANNOTATIONS_ID:1.1.0"
30-
const val CORE_ID = "androidx.core:core"
31-
const val CORE = "$CORE_ID:1.1.0"
3214
const val CORE_KTX_ID = "androidx.core:core-ktx"
3315
const val CORE_KTX = "$CORE_KTX_ID:1.1.0"
3416
const val CONSTRAINT_LAYOUT_ID = "androidx.constraintlayout:constraintlayout"
@@ -39,14 +21,7 @@ const val NAV_FRAGMENT_KTX_ID = "androidx.navigation:navigation-fragment-ktx"
3921
const val NAV_FRAGMENT_KTX = "$NAV_FRAGMENT_KTX_ID:2.9.7"
4022
const val NAV_UI_KTX_ID = "androidx.navigation:navigation-ui-ktx"
4123
const val NAV_UI_KTX = "$NAV_UI_KTX_ID:2.9.7"
42-
43-
// Annotation Processors
44-
const val TP_COMPILER_ID = "com.github.stephanenicolas.toothpick:toothpick-compiler"
45-
const val TP_COMPILER = "$TP_COMPILER_ID:3.1.0"
46-
4724
private val DEPENDENCIES_KOTLIN_STDLIB_JDK7 = listOf("implementation" to KOTLIN_STDLIB_JDK7)
48-
val DEPENDENCIES_KOTLIN_STDLIB = listOf("implementation" to KOTLIN_STDLIB)
49-
5025
val DEFAULT_APP_DEPENDENCIES = DEPENDENCIES_KOTLIN_STDLIB_JDK7 + listOf(
5126
"implementation" to APPCOMPAT,
5227
"implementation" to CORE_KTX,

src/functionalTest/kotlin/com/autonomousapps/fixtures/kotlinSource.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/functionalTest/kotlin/com/autonomousapps/kit/gradle/dependencies/Dependencies.kt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ object Dependencies {
3131
return provider.kotlinStdLib(configuration)
3232
}
3333

34-
@JvmStatic
35-
fun kotlinStdlibJdk8(configuration: String): Dependency {
36-
return provider.kotlinStdlibJdk8(configuration)
37-
}
38-
39-
@JvmStatic
40-
fun kotlinStdlibJdk7(configuration: String): Dependency {
41-
return provider.kotlinStdlibJdk7(configuration)
42-
}
43-
4434
@JvmStatic
4535
fun kotlinTestJunit(configuration: String): Dependency {
4636
return provider.kotlinTestJunit(configuration)
@@ -91,21 +81,6 @@ object Dependencies {
9181
return provider.kotestAssertions(configuration)
9282
}
9383

94-
@JvmStatic
95-
fun moshi(configuration: String): Dependency {
96-
return provider.moshi(configuration)
97-
}
98-
99-
@JvmStatic
100-
fun moshiKotlin(configuration: String): Dependency {
101-
return provider.moshiKotlin(configuration)
102-
}
103-
104-
@JvmStatic
105-
fun moshiAdapters(configuration: String): Dependency {
106-
return provider.moshiAdapters(configuration)
107-
}
108-
10984
@JvmStatic
11085
fun okio(configuration: String): Dependency {
11186
return provider.okio(configuration)
@@ -136,11 +111,6 @@ object Dependencies {
136111
return provider.androidxAnnotations(configuration)
137112
}
138113

139-
@JvmStatic
140-
fun composeMultiplatformRuntime(configuration: String): Dependency {
141-
return provider.composeMultiplatformRuntime(configuration)
142-
}
143-
144114
@JvmStatic
145115
fun composeMultiplatformFoundation(configuration: String): Dependency {
146116
return provider.composeMultiplatformFoundation(configuration)

src/functionalTest/kotlin/com/autonomousapps/kit/gradle/dependencies/DependencyProvider.kt

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ class DependencyProvider(
1111

1212
private val pluginUnderTestVersion = AbstractGradleProject.PLUGIN_UNDER_TEST_VERSION
1313

14-
/*
15-
* Common configurations. TODO(tsr): add later.
16-
*/
17-
18-
/*
19-
* Frequently-used dependencies.
20-
*/
21-
2214
fun dagp(configurationName: String): Dependency {
2315
return Dependency(
2416
configurationName,
@@ -38,14 +30,6 @@ class DependencyProvider(
3830
return Dependency(configuration, "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
3931
}
4032

41-
fun kotlinStdlibJdk8(configuration: String): Dependency {
42-
return Dependency(configuration, "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
43-
}
44-
45-
fun kotlinStdlibJdk7(configuration: String): Dependency {
46-
return Dependency(configuration, "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
47-
}
48-
4933
fun kotlinTestJunit(configuration: String): Dependency {
5034
return Dependency(configuration, "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
5135
}
@@ -86,18 +70,6 @@ class DependencyProvider(
8670
return Dependency(configuration, "io.kotest:kotest-assertions-core:4.6.0")
8771
}
8872

89-
fun moshi(configuration: String): Dependency {
90-
return Dependency(configuration, "com.squareup.moshi:moshi:1.14.0")
91-
}
92-
93-
fun moshiKotlin(configuration: String): Dependency {
94-
return Dependency(configuration, "com.squareup.moshi:moshi-kotlin:1.14.0")
95-
}
96-
97-
fun moshiAdapters(configuration: String): Dependency {
98-
return Dependency(configuration, "com.squareup.moshi:moshi-adapters:1.14.0")
99-
}
100-
10173
fun okio(configuration: String): Dependency {
10274
return Dependency(configuration, "com.squareup.okio:okio:2.6.0")
10375
}
@@ -122,10 +94,6 @@ class DependencyProvider(
12294
return Dependency(configuration, "androidx.annotation:annotation:1.9.1")
12395
}
12496

125-
fun composeMultiplatformRuntime(configuration: String): Dependency {
126-
return Dependency(configuration, "org.jetbrains.compose.runtime:runtime:1.0.1")
127-
}
128-
12997
fun composeMultiplatformFoundation(configuration: String): Dependency {
13098
return Dependency(configuration, "org.jetbrains.compose.foundation:foundation:1.0.1")
13199
}

src/functionalTest/kotlin/com/autonomousapps/kit/gradle/dependencies/Plugins.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ object Plugins {
1313
kotlinVersion = KOTLIN_VERSION
1414
)
1515

16-
@JvmStatic val buildHealthId: String = provider.buildHealthId
1716
@JvmStatic val buildHealth: Plugin = provider.buildHealth
1817

1918
@JvmStatic val dagpId: String = provider.dagpId
2019
@JvmStatic val dependencyAnalysis: Plugin = provider.dependencyAnalysis
2120
@JvmStatic val dependencyAnalysisNoVersion: Plugin = provider.dependencyAnalysisNoVersion
2221

23-
@JvmStatic val androidAppId: String = provider.androidAppId
2422
@JvmStatic val legacyKaptId: String = provider.androidLegacyKaptId
2523
@JvmStatic val androidApp: Plugin = provider.androidAppNoVersion
2624
@JvmStatic val androidLib: Plugin = provider.androidLibNoVersion
@@ -32,10 +30,8 @@ object Plugins {
3230

3331
@JvmStatic val kotlinJvm: Plugin = provider.kotlinJvm
3432
@JvmStatic val kotlinJvmNoApply: Plugin = provider.kotlinJvmNoApply
35-
@JvmStatic val kotlinAndroid: Plugin = provider.kotlinAndroid
3633
@JvmStatic val kotlinAndroidNoVersion: Plugin = provider.kotlinAndroidNoVersion
3734
@JvmStatic val kotlinJvmNoVersion: Plugin = provider.kotlinJvmNoVersion
38-
@JvmStatic val kotlinMultiplatformNoApply: Plugin = provider.kotlinMultiplatformNoApply
3935
@JvmStatic val kotlinMultiplatformNoVersion: Plugin = provider.kotlinMultiplatformNoVersion
4036
@JvmStatic val kotlinKaptNoVersion: Plugin = provider.kotlinKaptNoVersion
4137

0 commit comments

Comments
 (0)