Skip to content

Tweak PublishingTest #1162

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

Merged
Goooler merged 3 commits into from
Jan 17, 2025
Merged

Tweak PublishingTest #1162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6dfff4
Clean up PublishingTest
Goooler Jan 14, 2025
3552a35
Merge remote-tracking branch 'origin/main' into g/20250117/group
Goooler Jan 17, 2025
318d459
Reuse assertShadowJarCommon
Goooler Jan 17, 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
17 changes: 5 additions & 12 deletions src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,19 @@ import org.gradle.api.plugins.JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME
import org.gradle.testkit.runner.BuildResult
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.io.TempDir

class PublishingTest : BasePluginTest() {
private val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
private val gmmAdapter = moshi.adapter(GradleModuleMetadata::class.java)
private val pomReader = MavenXpp3Reader()

private lateinit var remoteRepoPath: Path
@TempDir
lateinit var remoteRepoPath: Path

@BeforeEach
override fun setup() {
super.setup()
remoteRepoPath = projectRoot.resolve("remote-maven-repo")
settingsScriptPath.appendText("rootProject.name = 'maven'" + System.lineSeparator())
}

Expand Down Expand Up @@ -84,16 +85,7 @@ class PublishingTest : BasePluginTest() {

publish()

assertThat(repoJarPath("shadow/maven/1.0/maven-1.0.jar")).useAll {
containsEntries(
"a.properties",
"a2.properties",
)
doesNotContainEntries(
"b.properties",
)
getMainAttr("Class-Path").isEqualTo("b-1.0.jar")
}
assertShadowJarCommon(repoJarPath("shadow/maven/1.0/maven-1.0.jar"))
assertPomCommon(repoPath("shadow/maven/1.0/maven-1.0.pom"))
assertShadowVariantCommon(gmmAdapter.fromJson(repoPath("shadow/maven/1.0/maven-1.0.module")))
}
Expand Down Expand Up @@ -339,6 +331,7 @@ class PublishingTest : BasePluginTest() {
doesNotContainEntries(
"b.properties",
)
getMainAttr("Class-Path").isEqualTo("b-1.0.jar")
}
}

Expand Down
Loading