From d95a26e8d68b4b97a42a7981233e90572699c83f Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Fri, 11 Aug 2023 00:26:01 -0400 Subject: [PATCH] Test fixes --- .../dependencies/TestDependencyResolver.java | 29 ++++++++++--------- .../bld/dependencies/TestDependencySet.java | 17 ++++++----- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java index 93061c4..3ac86c4 100644 --- a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java +++ b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java @@ -257,10 +257,10 @@ public class TestDependencyResolver { assertNotNull(dependencies); assertEquals(4, dependencies.size()); assertEquals(""" - org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 - com.squareup.okhttp3:okhttp:4.10.0 - com.squareup.okhttp3:logging-interceptor:4.10.0 - org.json:json:20230227""", StringUtils.join(dependencies, "\n")); + org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 + com.squareup.okhttp3:okhttp:4.11.0 + com.squareup.okhttp3:logging-interceptor:4.11.0 + org.json:json:20230618""", StringUtils.join(dependencies, "\n")); } @Test @@ -626,18 +626,19 @@ public class TestDependencyResolver { var resolver = new DependencyResolver(ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); var dependencies = resolver.getAllDependencies(compile, runtime); assertNotNull(dependencies); - assertEquals(10, dependencies.size()); + assertEquals(11, dependencies.size()); assertEquals(""" net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT - org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 - com.squareup.okhttp3:okhttp:4.10.0 - com.squareup.okhttp3:logging-interceptor:4.10.0 - org.json:json:20230227 - org.jetbrains.kotlin:kotlin-stdlib:1.8.20 - org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 - com.squareup.okio:okio-jvm:3.0.0 - org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 - org.jetbrains:annotations:13.0""", StringUtils.join(dependencies, "\n")); + org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 + com.squareup.okhttp3:okhttp:4.11.0 + com.squareup.okhttp3:logging-interceptor:4.11.0 + org.json:json:20230618 + org.jetbrains.kotlin:kotlin-stdlib:1.8.22 + org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 + com.squareup.okio:okio:3.2.0 + org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 + org.jetbrains:annotations:13.0 + com.squareup.okio:okio-jvm:3.2.0""", StringUtils.join(dependencies, "\n")); } @Test diff --git a/src/test/java/rife/bld/dependencies/TestDependencySet.java b/src/test/java/rife/bld/dependencies/TestDependencySet.java index aac6e6c..5c0cbca 100644 --- a/src/test/java/rife/bld/dependencies/TestDependencySet.java +++ b/src/test/java/rife/bld/dependencies/TestDependencySet.java @@ -361,15 +361,16 @@ public class TestDependencySet { .include(new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); assertEquals(""" └─ net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT - ├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 - │ ├─ org.jetbrains.kotlin:kotlin-stdlib:1.8.20 - │ │ ├─ org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 + ├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 + │ ├─ org.jetbrains.kotlin:kotlin-stdlib:1.8.22 + │ │ ├─ org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 │ │ └─ org.jetbrains:annotations:13.0 - │ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 - ├─ com.squareup.okhttp3:okhttp:4.10.0 - │ └─ com.squareup.okio:okio-jvm:3.0.0 - ├─ com.squareup.okhttp3:logging-interceptor:4.10.0 - └─ org.json:json:20230227 + │ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 + ├─ com.squareup.okhttp3:okhttp:4.11.0 + │ └─ com.squareup.okio:okio:3.2.0 + │ └─ com.squareup.okio:okio-jvm:3.2.0 + ├─ com.squareup.okhttp3:logging-interceptor:4.11.0 + └─ org.json:json:20230618 """, dependencies.generateTransitiveDependencyTree(ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), compile, runtime)); } }