Skip to content

Commit 2046c97

Browse files
committed
Fix test setup issues
1 parent a98bb8e commit 2046c97

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/GuavaCapabilityConflictResolutionTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,3 @@ class GuavaCapabilityConflictResolutionTest extends Specification {
197197
]
198198
}
199199
}
200-
// ["classes.jar", "robolectric-4.7.2.jar", "junit-4.13.2.jar", "core-ktx-1.7.0-runtime.jar", "material-1.5.0-runtime.jar", "constraintlayout-2.0.1-runtime.jar", "appcompat-1.4.1-runtime.jar", "browser-1.3.0-runtime.jar", "exoplayer-2.13.3-runtime.jar", "shadows-framework-4.7.2.jar", "monitor-1.4.0-runtime.jar", "junit-4.7.2.jar", "resources-4.7.2.jar", "sandbox-4.7.2.jar", "utils-reflector-4.7.2.jar", "plugins-maven-dependency-resolver-4.7.2.jar", "shadowapi-4.7.2.jar", "utils-4.7.2.jar", "pluginapi-4.7.2.jar", "annotations-4.7.2.jar", "javax.inject-1.jar", "javax.annotation-api-1.3.2.jar", "bcprov-jdk15on-1.68.jar", "hamcrest-core-1.3.jar", "kotlin-stdlib-1.5.31.jar", "viewpager2-1.0.0-runtime.jar", "fragment-1.3.6-runtime.jar", "activity-1.2.4-runtime.jar", "appcompat-resources-1.4.1-runtime.jar", "emoji2-views-helper-1.0.0-runtime.jar", "emoji2-1.0.0-runtime.jar", "drawerlayout-1.1.1-runtime.jar", "coordinatorlayout-1.1.0-runtime.jar", "dynamicanimation-1.0.0-runtime.jar", "transition-1.2.0-runtime.jar", "vectordrawable-animated-1.1.0-runtime.jar", "vectordrawable-1.1.0-runtime.jar", "viewpager-1.0.0-runtime.jar", "legacy-support-core-utils-1.0.0-runtime.jar", "loader-1.0.0-runtime.jar", "exoplayer-ui-2.13.3-runtime.jar", "recyclerview-1.1.0-runtime.jar", "customview-1.1.0-runtime.jar", "media-1.2.1-runtime.jar", "core-1.7.0-runtime.jar", "cursoradapter-1.0.0-runtime.jar", "lifecycle-viewmodel-savedstate-2.3.1-runtime.jar", "savedstate-1.1.0-runtime.jar", "lifecycle-viewmodel-2.3.1-runtime.jar", "resourceinspection-annotation-1.0.0.jar", "cardview-1.0.0-runtime.jar", "versionedparcelable-1.1.1-runtime.jar", "collection-1.1.0.jar", "concurrent-futures-1.0.0.jar", "guava-27.1-android.jar", "interpolator-1.0.0-runtime.jar", "exoplayer-dash-2.13.3-runtime.jar", "exoplayer-hls-2.13.3-runtime.jar", "exoplayer-smoothstreaming-2.13.3-runtime.jar", "exoplayer-transformer-2.13.3-runtime.jar", "exoplayer-core-2.13.3-runtime.jar", "lifecycle-process-2.4.0-runtime.jar", "startup-runtime-1.0.0-runtime.jar", "tracing-1.0.0-runtime.jar", "lifecycle-livedata-2.0.0-runtime.jar", "lifecycle-livedata-core-2.3.1-runtime.jar", "lifecycle-runtime-2.4.0-runtime.jar", "core-runtime-2.1.0-runtime.jar", "core-common-2.1.0.jar", "exoplayer-extractor-2.13.3-runtime.jar", "exoplayer-common-2.13.3-runtime.jar", "documentfile-1.0.0-runtime.jar", "localbroadcastmanager-1.0.0-runtime.jar", "print-1.0.0-runtime.jar", "lifecycle-common-2.4.0.jar", "annotation-1.3.0.jar", "annotation-experimental-1.1.0-runtime.jar", "nativeruntime-4.7.2.jar", "asm-commons-9.2.jar", "asm-util-9.2.jar", "asm-analysis-9.2.jar", "asm-tree-9.2.jar", "asm-9.2.jar", "error_prone_annotations-2.9.0.jar", "sqlite4java-1.0.392.jar", "icu4j-53.1.jar", "auto-value-annotations-1.7.4.jar", "annotations-13.0.jar", "kotlin-stdlib-common-1.5.31.jar", "constraintlayout-solver-2.0.1.jar", "failureaccess-1.0.1.jar" ]
201-
//| | | | | |
202-
// | [classes.jar, robolectric-4.7.2.jar, junit-4.13.2.jar, shadows-framework-4.7.2.jar, resources-4.7.2.jar, junit-4.7.2.jar, sandbox-4.7.2.jar, utils-reflector-4.7.2.jar, plugins-maven-dependency-resolver-4.7.2.jar, shadowapi-4.7.2.jar, utils-4.7.2.jar, nativeruntime-4.7.2.jar, exoplayer-2.13.3-runtime.jar, exoplayer-dash-2.13.3-runtime.jar, exoplayer-hls-2.13.3-runtime.jar, exoplayer-smoothstreaming-2.13.3-runtime.jar, exoplayer-transformer-2.13.3-runtime.jar, exoplayer-ui-2.13.3-runtime.jar, exoplayer-core-2.13.3-runtime.jar, exoplayer-extractor-2.13.3-runtime.jar, exoplayer-common-2.13.3-runtime.jar, browser-1.3.0-runtime.jar, core-ktx-1.7.0-runtime.jar, material-1.5.0-runtime.jar, constraintlayout-2.0.1-runtime.jar, appcompat-1.4.1-runtime.jar, viewpager2-1.0.0-runtime.jar, fragment-1.3.6-runtime.jar, activity-1.2.4-runtime.jar, appcompat-resources-1.4.1-runtime.jar, emoji2-views-helper-1.0.0-runtime.jar, emoji2-1.0.0-runtime.jar, drawerlayout-1.1.1-runtime.jar, coordinatorlayout-1.1.0-runtime.jar, dynamicanimation-1.0.0-runtime.jar, transition-1.2.0-runtime.jar, vectordrawable-animated-1.1.0-runtime.jar, vectordrawable-1.1.0-runtime.jar, viewpager-1.0.0-runtime.jar, legacy-support-core-utils-1.0.0-runtime.jar, loader-1.0.0-runtime.jar, recyclerview-1.1.0-runtime.jar, customview-1.1.0-runtime.jar, media-1.2.1-runtime.jar, core-1.7.0-runtime.jar, concurrent-futures-1.0.0.jar, guava-27.1-android.jar, monitor-1.4.0-runtime.jar, pluginapi-4.7.2.jar, annotations-4.7.2.jar, javax.inject-1.jar, javax.annotation-api-1.3.2.jar, bcprov-jdk15on-1.68.jar, hamcrest-core-1.3.jar, failureaccess-1.0.1.jar, kotlin-stdlib-1.5.31.jar, cursoradapter-1.0.0-runtime.jar, lifecycle-viewmodel-savedstate-2.3.1-runtime.jar, savedstate-1.1.0-runtime.jar, lifecycle-viewmodel-2.3.1-runtime.jar, resourceinspection-annotation-1.0.0.jar, cardview-1.0.0-runtime.jar, versionedparcelable-1.1.1-runtime.jar, collection-1.1.0.jar, interpolator-1.0.0-runtime.jar, lifecycle-process-2.4.0-runtime.jar, startup-runtime-1.0.0-runtime.jar, tracing-1.0.0-runtime.jar, lifecycle-livedata-2.0.0-runtime.jar, lifecycle-livedata-core-2.3.1-runtime.jar, lifecycle-runtime-2.4.0-runtime.jar, core-runtime-2.1.0-runtime.jar, core-common-2.1.0.jar, documentfile-1.0.0-runtime.jar, localbroadcastmanager-1.0.0-runtime.jar, print-1.0.0-runtime.jar, lifecycle-common-2.4.0.jar, annotation-1.3.0.jar, annotation-experimental-1.1.0-runtime.jar, asm-commons-9.2.jar, asm-util-9.2.jar, asm-analysis-9.2.jar, asm-tree-9.2.jar, asm-9.2.jar, error_prone_annotations-2.9.0.jar, sqlite4java-1.0.392.jar, icu4j-53.1.jar, auto-value-annotations-1.7.4.jar, annotations-13.0.jar, kotlin-stdlib-common-1.5.31.jar, constraintlayout-solver-2.0.1.jar]
203-
//| | [classes.jar, robolectric-4.7.2.jar, junit-4.13.2.jar, shadows-framework-4.7.2.jar, resources-4.7.2.jar, junit-4.7.2.jar, sandbox-4.7.2.jar, utils-reflector-4.7.2.jar, plugins-maven-dependency-resolver-4.7.2.jar, shadowapi-4.7.2.jar, utils-4.7.2.jar, nativeruntime-4.7.2.jar, exoplayer-2.13.3-runtime.jar, exoplayer-dash-2.13.3-runtime.jar, exoplayer-hls-2.13.3-runtime.jar, exoplayer-smoothstreaming-2.13.3-runtime.jar, exoplayer-transformer-2.13.3-runtime.jar, exoplayer-ui-2.13.3-runtime.jar, exoplayer-core-2.13.3-runtime.jar, exoplayer-extractor-2.13.3-runtime.jar, exoplayer-common-2.13.3-runtime.jar, browser-1.3.0-runtime.jar, core-ktx-1.7.0-runtime.jar, material-1.5.0-runtime.jar, constraintlayout-2.0.1-runtime.jar, appcompat-1.4.1-runtime.jar, viewpager2-1.0.0-runtime.jar, fragment-1.3.6-runtime.jar, activity-1.2.4-runtime.jar, appcompat-resources-1.4.1-runtime.jar, emoji2-views-helper-1.0.0-runtime.jar, emoji2-1.0.0-runtime.jar, drawerlayout-1.1.1-runtime.jar, coordinatorlayout-1.1.0-runtime.jar, dynamicanimation-1.0.0-runtime.jar, transition-1.2.0-runtime.jar, vectordrawable-animated-1.1.0-runtime.jar, vectordrawable-1.1.0-runtime.jar, viewpager-1.0.0-runtime.jar, legacy-support-core-utils-1.0.0-runtime.jar, loader-1.0.0-runtime.jar, recyclerview-1.1.0-runtime.jar, customview-1.1.0-runtime.jar, media-1.2.1-runtime.jar, core-1.7.0-runtime.jar, concurrent-futures-1.0.0.jar, guava-27.1-android.jar, monitor-1.4.0-runtime.jar, pluginapi-4.7.2.jar, annotations-4.7.2.jar, javax.inject-1.jar, javax.annotation-api-1.3.2.jar, bcprov-jdk15on-1.68.jar, hamcrest-core-1.3.jar, failureaccess-1.0.1.jar, kotlin-stdlib-1.5.31.jar, cursoradapter-1.0.0-runtime.jar, lifecycle-viewmodel-savedstate-2.3.1-runtime.jar, savedstate-1.1.0-runtime.jar, lifecycle-viewmodel-2.3.1-runtime.jar, resourceinspection-annotation-1.0.0.jar, cardview-1.0.0-runtime.jar, versionedparcelable-1.1.1-runtime.jar, collection-1.1.0.jar, interpolator-1.0.0-runtime.jar, lifecycle-process-2.4.0-runtime.jar, startup-runtime-1.0.0-runtime.jar, tracing-1.0.0-runtime.jar, lifecycle-livedata-2.0.0-runtime.jar, lifecycle-livedata-core-2.3.1-runtime.jar, lifecycle-runtime-2.4.0-runtime.jar, core-runtime-2.1.0-runtime.jar, core-common-2.1.0.jar, documentfile-1.0.0-runtime.jar, localbroadcastmanager-1.0.0-runtime.jar, print-1.0.0-runtime.jar, lifecycle-common-2.4.0.jar, annotation-1.3.0.jar, annotation-experimental-1.1.0-runtime.jar, asm-commons-9.2.jar, asm-util-9.2.jar, asm-analysis-9.2.jar, asm-tree-9.2.jar, asm-9.2.jar, error_prone_annotations-2.9.0.jar, sqlite4java-1.0.392.jar, icu4j-53.1.jar, auto-value-annotations-1.7.4.jar, annotations-13.0.jar, kotlin-stdlib-common-1.5.31.jar, constraintlayout-solver-2.0.1.jar]
204-
//| | cl

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/JarOverlapTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.gradlex.jvm.dependency.conflict.test
33
import org.gradle.testfixtures.ProjectBuilder
44
import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition
55
import spock.lang.Specification
6+
import spock.lang.Tag
67

78
import java.util.zip.ZipFile
89

@@ -39,6 +40,7 @@ class JarOverlapTest extends Specification {
3940
.collect { it.replace("\")", "") }
4041
}
4142

43+
@Tag("no-cross-version")
4244
def "capability definition is valid"(CapabilityDefinition definition) {
4345
given:
4446
def specificVersions = definitionSpecificVersions(definition)

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/logging/AbstractLoggingCapabilitiesPluginFunctionalTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import java.nio.file.Path
1111

1212
abstract class AbstractLoggingCapabilitiesPluginFunctionalTest extends Specification {
1313

14-
static GradleVersion testGradleVersion = System.getProperty("test.gradle-version")?.with { GradleVersion.version(it) } ?: GradleVersion.current()
14+
static GradleVersion testGradleVersion = System.getProperty("gradleVersionUnderTest")?.with { GradleVersion.version(it) } ?: GradleVersion.current()
1515

1616
@TempDir
1717
Path testFolder

0 commit comments

Comments
 (0)