From b6d2e14786dc0a47541575e0032df59fe7f59db6 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Tue, 9 Nov 2021 19:22:03 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version (#1466) --- build.gradle | 2 +- .../java/com/palantir/dialogue/hc5/CleanerSupportTest.java | 2 +- .../src/test/java/com/palantir/dialogue/AttachmentsTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index cd2da398d..49cc682da 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.5.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.5.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.6.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.38.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.40.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.8.0' diff --git a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/CleanerSupportTest.java b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/CleanerSupportTest.java index f70137ad8..7396182b2 100644 --- a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/CleanerSupportTest.java +++ b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/CleanerSupportTest.java @@ -40,7 +40,7 @@ void testCleaner() { private static void attemptToGarbageCollect() { // Create some garbage to entice the collector ByteArrayOutputStream baos = new ByteArrayOutputStream(); - while (baos.toString().length() < 4096) { + while (baos.toString(StandardCharsets.UTF_8).length() < 4096) { byte[] buf = "Hello, World!".getBytes(StandardCharsets.UTF_8); baos.write(buf, 0, buf.length); } diff --git a/dialogue-target/src/test/java/com/palantir/dialogue/AttachmentsTest.java b/dialogue-target/src/test/java/com/palantir/dialogue/AttachmentsTest.java index 5226701ad..02431d6bb 100644 --- a/dialogue-target/src/test/java/com/palantir/dialogue/AttachmentsTest.java +++ b/dialogue-target/src/test/java/com/palantir/dialogue/AttachmentsTest.java @@ -64,7 +64,7 @@ public void testCannotPutNullKey() { AttachmentKey key = null; assertThatLoggableExceptionThrownBy(() -> attachments.put(key, 1L)) .isExactlyInstanceOf(SafeNullPointerException.class) - .hasExactlyArgs() + .hasNoArgs() .hasMessage("key"); } @@ -72,7 +72,7 @@ public void testCannotPutNullKey() { public void testCannotPutNullValue() { assertThatLoggableExceptionThrownBy(() -> attachments.put(KEY1, null)) .isExactlyInstanceOf(SafeNullPointerException.class) - .hasExactlyArgs() + .hasNoArgs() .hasMessage("value"); }