Filip/bld
1
0
Fork 0
mirror of https://github.com/rife2/bld synced 2025-12-20 16:48:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes

Browse source
This commit is contained in:
Geert Bevin 2025-11-16 11:16:05 -05:00
parent 5efbc8c064
commit 52e8a6ce6a
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/test/java/rife/bld/dependencies/TestDependencyResolver.java
View file

@ -331,15 +331,17 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeDependenciesBitly() { void testGetCompileRuntimeDependenciesBitly() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0)));
var dependencies = resolver.getDirectDependencies(compile, runtime); var dependencies = resolver.getDirectDependencies(compile, runtime);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(4, dependencies.size()); assertEquals(6, dependencies.size());
assertEquals(""" assertEquals("""
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 org.jetbrains.kotlin:kotlin-stdlib:2.1.10
com.squareup.okhttp3:okhttp:4.11.0 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10
com.squareup.okhttp3:logging-interceptor:4.11.0 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10
org.json:json:20230618""", StringUtils.join(dependencies, "\n")); com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okhttp3:logging-interceptor:4.12.0
org.json:json:20250107""", StringUtils.join(dependencies, "\n"));
} }
@Test @Test
@ -702,22 +704,22 @@ public class TestDependencyResolver {
@Test @Test
void testGetCompileRuntimeTransitiveDependenciesBitly() { void testGetCompileRuntimeTransitiveDependenciesBitly() {
var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0)));
var dependencies = resolver.getAllDependencies(compile, runtime); var dependencies = resolver.getAllDependencies(compile, runtime);
assertNotNull(dependencies); assertNotNull(dependencies);
assertEquals(11, dependencies.size()); assertEquals(11, dependencies.size());
assertEquals(""" assertEquals("""
net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT net.thauvin.erik:bitly-shorten:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 org.jetbrains.kotlin:kotlin-stdlib:2.1.10
com.squareup.okhttp3:okhttp:4.11.0 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10
com.squareup.okhttp3:logging-interceptor:4.11.0 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10
org.json:json:20230618 com.squareup.okhttp3:okhttp:4.12.0
org.jetbrains.kotlin:kotlin-stdlib:1.8.22 com.squareup.okhttp3:logging-interceptor:4.12.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 org.json:json:20250107
com.squareup.okio:okio:3.2.0
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
org.jetbrains:annotations:13.0 org.jetbrains:annotations:13.0
com.squareup.okio:okio-jvm:3.2.0""", StringUtils.join(dependencies, "\n")); org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10
com.squareup.okio:okio:3.6.0
com.squareup.okio:okio-jvm:3.6.0""", StringUtils.join(dependencies, "\n"));
} }
@Test @Test

26
src/test/java/rife/bld/dependencies/TestDependencySet.java
View file

@ -359,19 +359,19 @@ public class TestDependencySet {
@Test @Test
void testGenerateDependencyTreeCompileRuntime() { void testGenerateDependencyTreeCompileRuntime() {
var dependencies = new DependencySet() var dependencies = new DependencySet()
.include(new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); .include(new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0)));
assertEquals(StringUtils.convertLineSeparator(""" assertEquals(StringUtils.convertLineSeparator("""
└─ net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT └─ net.thauvin.erik:bitly-shorten:2.0.0
├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 ├─ org.jetbrains.kotlin:kotlin-stdlib:2.1.10
│ ├─ org.jetbrains.kotlin:kotlin-stdlib:1.8.22 │ └─ org.jetbrains:annotations:13.0
│ │ ├─ org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 ├─ org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10
│ │ └─ org.jetbrains:annotations:13.0 ├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10
│ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 │ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10
├─ com.squareup.okhttp3:okhttp:4.11.0 ├─ com.squareup.okhttp3:okhttp:4.12.0
│ └─ com.squareup.okio:okio:3.2.0 │ └─ com.squareup.okio:okio:3.6.0
│ └─ com.squareup.okio:okio-jvm:3.2.0 │ └─ com.squareup.okio:okio-jvm:3.6.0
├─ com.squareup.okhttp3:logging-interceptor:4.11.0 ├─ com.squareup.okhttp3:logging-interceptor:4.12.0
└─ org.json:json:20230618 └─ org.json:json:20250107
"""), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), compile, runtime)); """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), compile, runtime));
} }
} }