From 1e0488f19c6af1dd07fe25ba9d47da66e8b6e055 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Thu, 31 Dec 2020 15:49:03 +0100 Subject: [PATCH 1/4] fixed SpotBugs VA_FORMAT_STRING_USES_NEWLINE --- core/src/test/java/hudson/util/ConsistentHashTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/hudson/util/ConsistentHashTest.java b/core/src/test/java/hudson/util/ConsistentHashTest.java index 0b7d77f6de..474c206ae5 100644 --- a/core/src/test/java/hudson/util/ConsistentHashTest.java +++ b/core/src/test/java/hudson/util/ConsistentHashTest.java @@ -96,7 +96,7 @@ public class ConsistentHashTest { } } - System.out.printf("%d/%d\n", even, odd); + System.out.printf("%d/%d%n", even, odd); assertTrue(even * 8 < odd); } From 71e689c698cd4ae8e9501af2541ff24d839f6d0e Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Thu, 31 Dec 2020 16:01:19 +0100 Subject: [PATCH 2/4] fixed SpotBugs JUA_DONT_ASSERT_INSTANCEOF_IN_TESTS --- core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java index 1774b803e0..0217e895b3 100644 --- a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java +++ b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java @@ -25,11 +25,13 @@ package jenkins.util.xstream; import hudson.util.XStream2; import org.apache.commons.io.IOUtils; +import org.hamcrest.core.IsInstanceOf; import org.junit.Before; import org.junit.Test; import org.xmlunit.diff.DefaultNodeMatcher; import org.xmlunit.diff.ElementSelectors; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; @@ -141,7 +143,7 @@ public class XStreamDOMTest { v.values.put("foo",createSomeFoo().bar); String xml = xs.toXML(v); Object v2 = xs.fromXML(xml); - assertTrue(v2 instanceof DomInMap); + assertThat(v2, instanceOf(DomInMap.class)); assertXStreamDOMEquals(v.values.get("foo"), ((DomInMap)v2).values.get("foo")); } From 63c0ae46dbb048e5b157cb4b1f48293a2051f176 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Thu, 31 Dec 2020 16:05:26 +0100 Subject: [PATCH 3/4] fixed SpotBugs DMI_RANDOM_USED_ONLY_ONCE --- core/src/test/java/hudson/util/SecretTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/hudson/util/SecretTest.java b/core/src/test/java/hudson/util/SecretTest.java index efe2c043ae..2092b8a9a4 100644 --- a/core/src/test/java/hudson/util/SecretTest.java +++ b/core/src/test/java/hudson/util/SecretTest.java @@ -67,8 +67,9 @@ public class SecretTest { @Test public void encryptedValuePattern() { + final Random random = new Random(); for (int i = 1; i < 100; i++) { - String plaintext = RandomStringUtils.random(new Random().nextInt(i)); + String plaintext = RandomStringUtils.random(random.nextInt(i)); String ciphertext = Secret.fromString(plaintext).getEncryptedValue(); //println "${plaintext} → ${ciphertext}" assert ENCRYPTED_VALUE_PATTERN.matcher(ciphertext).matches(); From 5fb8f1278d5e90893c95d966a7e6e007a8d0e742 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Thu, 31 Dec 2020 16:08:31 +0100 Subject: [PATCH 4/4] removed superflous import --- core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java index 0217e895b3..752dc82394 100644 --- a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java +++ b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java @@ -25,7 +25,6 @@ package jenkins.util.xstream; import hudson.util.XStream2; import org.apache.commons.io.IOUtils; -import org.hamcrest.core.IsInstanceOf; import org.junit.Before; import org.junit.Test; import org.xmlunit.diff.DefaultNodeMatcher;