Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish functional tests migration #1117

Merged
merged 21 commits into from
Jan 10, 2025
Merged

Finish functional tests migration #1117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
110a87e
Move funcTest sources back
Goooler Jan 9, 2025
fb221e3
Reduce extra doc package in intiTest
Goooler Jan 9, 2025
2339155
Seems we don't need an explicit ConfigurationCacheTest anymore
Goooler Jan 9, 2025
8f92d7d
Close things in tests
Goooler Jan 9, 2025
735d8c4
Simplify task outcome checks
Goooler Jan 9, 2025
2bbe80b
Cleanups
Goooler Jan 9, 2025
c9933c5
Simplify assertions for JarPath
Goooler Jan 9, 2025
0caf5ac
Remove the workaround for projectRoot
Goooler Jan 9, 2025
bac0d88
Tweak lint configs
Goooler Jan 9, 2025
6c89a12
Remove TODO for excludeProjectFromMinimizeShallNotExcludeTransitiveDe…
Goooler Jan 9, 2025
8d672ef
Simplify checks for jarPath
Goooler Jan 9, 2025
2d35d75
Create jars in temp dir
Goooler Jan 9, 2025
abb3b50
Merge remote-tracking branch 'origin/main' into g/20241225/migrate-fu…
Goooler Jan 10, 2025
17d7df6
Fix deprecations
Goooler Jan 10, 2025
d97862f
Unify classLoader resource usages
Goooler Jan 10, 2025
e6b8a04
Simplify requireResourceAsText and requireResourceAsStream
Goooler Jan 10, 2025
ed848e0
Optimize closable using
Goooler Jan 10, 2025
52f50ed
Fix org.junit.jupiter.api.extension.Extension path
Goooler Jan 10, 2025
eae6a5f
Assert the bat file in integrationWithApplicationPluginAndJavaToolchains
Goooler Jan 10, 2025
dfe9062
Enable --build-cache for all func tests
Goooler Jan 10, 2025
9861bfd
Optimize assertions in BaseCachingTest and remove alternateDir logic
Goooler Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Close things in tests
  • Loading branch information
@Goooler
Goooler committed Jan 9, 2025
commit 8f92d7d6d501b8c5bf2b9111e602afa1500b6b8f
40 changes: 23 additions & 17 deletions src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.github.jengelman.gradle.plugins.shadow

import assertk.all
import assertk.assertThat
import assertk.assertions.contains
import assertk.assertions.containsAtLeast
import assertk.assertions.exists
import assertk.assertions.isEqualTo
import assertk.assertions.isNotEmpty
import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
import com.github.jengelman.gradle.plugins.shadow.util.isRegular
import com.github.jengelman.gradle.plugins.shadow.util.useAll
import kotlin.io.path.appendText
import kotlin.io.path.readText
import kotlin.io.path.writeText
Expand Down Expand Up @@ -36,23 +38,27 @@ class ApplicationTest : BasePluginTest() {

val result = run(runShadowTask)

assertThat(result.output).contains("Running application with JDK 17")
assertThat(result.output).contains("TestApp: Hello World! (foo)")

val installedJar = jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar")
assertThat(installedJar).containsEntries(
"a.properties",
"a2.properties",
"myapp/Main.class",
assertThat(result.output).contains(
"Running application with JDK 17",
"TestApp: Hello World! (foo)",
)
assertThat(installedJar.manifest.mainAttributes.getValue("Main-Class"))
.isEqualTo("myapp.Main")

path("build/install/myapp-shadow/bin/myapp").let { startScript ->
assertThat(startScript).exists()
assertThat(startScript.readText()).contains("CLASSPATH=\$APP_HOME/lib/myapp-1.0-all.jar")
assertThat(startScript.readText()).contains("-jar \"\\\"\$CLASSPATH\\\"\" \"\$APP_ARGS\"")
assertThat(startScript.readText()).contains("exec \"\$JAVACMD\" \"\$@\"")
assertThat(jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar")).useAll {
containsEntries(
"a.properties",
"a2.properties",
"myapp/Main.class",
)
transform { it.manifest.mainAttributes.getValue("Main-Class") }.isEqualTo("myapp.Main")
}

assertThat(path("build/install/myapp-shadow/bin/myapp")).all {
exists()
transform { it.readText() }.contains(
"CLASSPATH=\$APP_HOME/lib/myapp-1.0-all.jar",
"-jar \"\\\"\$CLASSPATH\\\"\" \"\$APP_ARGS\"",
"exec \"\$JAVACMD\" \"\$@\"",
)
}
}

Expand Down Expand Up @@ -84,7 +90,7 @@ class ApplicationTest : BasePluginTest() {

run(ShadowApplicationPlugin.SHADOW_INSTALL_TASK_NAME)

assertThat(jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar").entries().toList()).isNotEmpty()
assertThat(jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar")).isRegular()
}

private fun prepare(
Expand Down
159 changes: 89 additions & 70 deletions src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import assertk.assertions.isEqualTo
import assertk.assertions.isNotNull
import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
import com.github.jengelman.gradle.plugins.shadow.util.doesNotContainEntries
import com.github.jengelman.gradle.plugins.shadow.util.useAll
import kotlin.io.path.appendText
import kotlin.io.path.readText
import kotlin.io.path.writeText
Expand Down Expand Up @@ -36,11 +37,13 @@ class FilteringTest : BasePluginTest() {
@Test
fun includeAllDependencies() {
run(shadowJarTask)
assertThat(outputShadowJar).containsEntries(
"a.properties",
"a2.properties",
"b.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a.properties",
"a2.properties",
"b.properties",
)
}
}

@Test
Expand All @@ -55,13 +58,15 @@ class FilteringTest : BasePluginTest() {

run(shadowJarTask)

assertThat(outputShadowJar).containsEntries(
"a.properties",
"b.properties",
)
assertThat(outputShadowJar).doesNotContainEntries(
"a2.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a.properties",
"b.properties",
)
doesNotContainEntries(
"a2.properties",
)
}
}

@Test
Expand Down Expand Up @@ -108,15 +113,17 @@ class FilteringTest : BasePluginTest() {

assertThat(result.task(shadowJarTask)).isNotNull()
.transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
assertThat(outputShadowJar).containsEntries(
"a.properties",
"a2.properties",
"b.properties",
"d.properties",
)
assertThat(outputShadowJar).doesNotContainEntries(
"c.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a.properties",
"a2.properties",
"b.properties",
"d.properties",
)
doesNotContainEntries(
"c.properties",
)
}
}

@Test
Expand All @@ -135,15 +142,17 @@ class FilteringTest : BasePluginTest() {

assertThat(result.task(shadowJarTask)).isNotNull()
.transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
assertThat(outputShadowJar).containsEntries(
"a2.properties",
"b.properties",
"c.properties",
"d.properties",
)
assertThat(outputShadowJar).doesNotContainEntries(
"a.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a2.properties",
"b.properties",
"c.properties",
"d.properties",
)
doesNotContainEntries(
"a.properties",
)
}
}

@Test
Expand All @@ -169,16 +178,18 @@ class FilteringTest : BasePluginTest() {

run(shadowJarTask)

assertThat(outputShadowJar).containsEntries(
"d.properties",
"shadow/Passed.class",
)
assertThat(outputShadowJar).doesNotContainEntries(
"a.properties",
"a2.properties",
"b.properties",
"c.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"d.properties",
"shadow/Passed.class",
)
doesNotContainEntries(
"a.properties",
"a2.properties",
"b.properties",
"c.properties",
)
}
}

@Test
Expand All @@ -193,13 +204,15 @@ class FilteringTest : BasePluginTest() {

run(serverShadowJarTask)

assertThat(outputServerShadowJar).doesNotContainEntries(
"client/Client.class",
)
assertThat(outputServerShadowJar).containsEntries(
"server/Server.class",
"junit/framework/Test.class",
)
assertThat(outputServerShadowJar).useAll {
doesNotContainEntries(
"client/Client.class",
)
containsEntries(
"server/Server.class",
"junit/framework/Test.class",
)
}
}

@Test
Expand All @@ -214,13 +227,15 @@ class FilteringTest : BasePluginTest() {

run(serverShadowJarTask)

assertThat(outputServerShadowJar).doesNotContainEntries(
"junit/framework/Test.class",
)
assertThat(outputServerShadowJar).containsEntries(
"client/Client.class",
"server/Server.class",
)
assertThat(outputServerShadowJar).useAll {
doesNotContainEntries(
"junit/framework/Test.class",
)
containsEntries(
"client/Client.class",
"server/Server.class",
)
}
}

@Test
Expand All @@ -237,13 +252,15 @@ class FilteringTest : BasePluginTest() {

run(shadowJarTask)

assertThat(outputShadowJar).containsEntries(
"a.properties",
"b.properties",
)
assertThat(outputShadowJar).doesNotContainEntries(
"a2.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a.properties",
"b.properties",
)
doesNotContainEntries(
"a2.properties",
)
}
}

@Test
Expand Down Expand Up @@ -272,15 +289,17 @@ class FilteringTest : BasePluginTest() {
}

private fun commonAssertions() {
assertThat(outputShadowJar).containsEntries(
"a.properties",
"a2.properties",
"b.properties",
"c.properties",
)
assertThat(outputShadowJar).doesNotContainEntries(
"d.properties",
)
assertThat(outputShadowJar).useAll {
containsEntries(
"a.properties",
"a2.properties",
"b.properties",
"c.properties",
)
doesNotContainEntries(
"d.properties",
)
}
}

private fun publishArtifactCD(circular: Boolean = false) {
Expand Down
38 changes: 21 additions & 17 deletions src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.jengelman.gradle.plugins.shadow

import assertk.all
import assertk.assertThat
import assertk.assertions.containsOnly
import assertk.assertions.isEmpty
Expand All @@ -10,6 +9,7 @@ import com.github.jengelman.gradle.plugins.shadow.util.Issue
import com.github.jengelman.gradle.plugins.shadow.util.JarPath
import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
import com.github.jengelman.gradle.plugins.shadow.util.doesNotContainEntries
import com.github.jengelman.gradle.plugins.shadow.util.useAll
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
Expand Down Expand Up @@ -122,18 +122,18 @@ class PublishingTest : BasePluginTest() {

publish()

val publishedJar = repoJarPath("shadow/maven-all/1.0/maven-all-1.0.jar")
assertThat(publishedJar).containsEntries(
"aa.properties",
"aa2.properties",
)
assertThat(publishedJar).doesNotContainEntries(
"a.properties",
"a2.properties",
"b.properties",
"bb.properties",
)

assertThat(repoJarPath("shadow/maven-all/1.0/maven-all-1.0.jar")).useAll {
containsEntries(
"aa.properties",
"aa2.properties",
)
doesNotContainEntries(
"a.properties",
"a2.properties",
"b.properties",
"bb.properties",
)
}
assertPomCommon(repoPath("shadow/maven-all/1.0/maven-all-1.0.pom"))
}

Expand Down Expand Up @@ -165,8 +165,12 @@ class PublishingTest : BasePluginTest() {
publish()

val entries = arrayOf("a.properties", "a2.properties", "b.properties")
assertThat(repoJarPath("com/acme/maven/1.0/maven-1.0.jar")).doesNotContainEntries(*entries)
assertThat(repoJarPath("com/acme/maven/1.0/maven-1.0-all.jar")).containsEntries(*entries)
assertThat(repoJarPath("com/acme/maven/1.0/maven-1.0.jar")).useAll {
doesNotContainEntries(*entries)
}
assertThat(repoJarPath("com/acme/maven/1.0/maven-1.0-all.jar")).useAll {
containsEntries(*entries)
}

pomReader.read(repoPath("com/acme/maven/1.0/maven-1.0.pom")).let { pomContents ->
assertThat(pomContents.dependencies.size).isEqualTo(2)
Expand Down Expand Up @@ -278,7 +282,7 @@ class PublishingTest : BasePluginTest() {
}

private fun assertShadowJarCommon(jarPath: JarPath) {
assertThat(jarPath).all {
assertThat(jarPath).useAll {
containsEntries(
"a.properties",
"a2.properties",
Expand All @@ -290,7 +294,7 @@ class PublishingTest : BasePluginTest() {
}

private companion object {
fun MavenXpp3Reader.read(path: Path): Model = read(path.inputStream())
fun MavenXpp3Reader.read(path: Path): Model = path.inputStream().use { read(it) }

fun <T : Any> JsonAdapter<T>.fromJson(path: Path): T = requireNotNull(fromJson(path.readText()))
}
Expand Down
Loading
Loading