diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java index 5b436b02b0..6897870c15 100644 --- a/cli/src/main/java/hudson/cli/CLI.java +++ b/cli/src/main/java/hudson/cli/CLI.java @@ -264,7 +264,7 @@ public class CLI { if (userInfo != null) { factory = factory.basicAuth(userInfo); } else if (auth != null) { - factory = factory.basicAuth(auth.startsWith("@") ? FileUtils.readFileToString(new File(auth.substring(1))).trim() : auth); + factory = factory.basicAuth(auth.startsWith("@") ? FileUtils.readFileToString(new File(auth.substring(1)), Charset.defaultCharset()).trim() : auth); } if (mode == Mode.HTTP) { diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 4324dbff17..c470e16a8b 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -208,8 +208,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas private enum PMConstructor { JENKINS { @Override - @Nonnull PluginManager doCreate(@Nonnull Class klass, - @Nonnull Jenkins jenkins) throws ReflectiveOperationException { + @Nonnull + PluginManager doCreate(@Nonnull Class klass, + @Nonnull Jenkins jenkins) throws ReflectiveOperationException { return klass.getConstructor(Jenkins.class).newInstance(jenkins); } }, diff --git a/core/src/main/java/hudson/util/DoubleLaunchChecker.java b/core/src/main/java/hudson/util/DoubleLaunchChecker.java index 08d1b66ab6..74c4c59933 100644 --- a/core/src/main/java/hudson/util/DoubleLaunchChecker.java +++ b/core/src/main/java/hudson/util/DoubleLaunchChecker.java @@ -39,6 +39,7 @@ import static hudson.init.InitMilestone.JOB_LOADED; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; @@ -100,7 +101,7 @@ public class DoubleLaunchChecker { long t = timestampFile.lastModified(); if(t!=0 && lastWriteTime!=0 && t!=lastWriteTime && !ignore) { try { - collidingId = FileUtils.readFileToString(timestampFile); + collidingId = FileUtils.readFileToString(timestampFile, Charset.defaultCharset()); } catch (IOException e) { LOGGER.log(Level.SEVERE, "Failed to read collision file", e); } @@ -112,7 +113,7 @@ public class DoubleLaunchChecker { } try { - FileUtils.writeStringToFile(timestampFile, getId()); + FileUtils.writeStringToFile(timestampFile, getId(), Charset.defaultCharset()); lastWriteTime = timestampFile.lastModified(); } catch (IOException e) { // if failed to write, err on the safe side and assume things are OK. diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java index 949db9a42e..be9688e894 100644 --- a/core/src/main/java/jenkins/install/InstallUtil.java +++ b/core/src/main/java/jenkins/install/InstallUtil.java @@ -28,6 +28,7 @@ import static java.util.logging.Level.WARNING; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -224,7 +225,7 @@ public class InstallUtil { File lastExecVersionFile = getLastExecVersionFile(); if (lastExecVersionFile.exists()) { try { - String version = FileUtils.readFileToString(lastExecVersionFile); + String version = FileUtils.readFileToString(lastExecVersionFile, Charset.defaultCharset()); // JENKINS-37438 blank will force the setup // wizard regardless of current state of the system if (StringUtils.isBlank(version)) { @@ -267,7 +268,7 @@ public class InstallUtil { static void saveLastExecVersion(@Nonnull String version) { File lastExecVersionFile = getLastExecVersionFile(); try { - FileUtils.write(lastExecVersionFile, version); + FileUtils.write(lastExecVersionFile, version, Charset.defaultCharset()); } catch (IOException e) { LOGGER.log(SEVERE, "Failed to save " + lastExecVersionFile.getAbsolutePath(), e); } diff --git a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java index e16f3aa5fa..347857b32f 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java +++ b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; +import java.nio.charset.Charset; import java.util.Collection; import java.util.Enumeration; import java.util.logging.Logger; @@ -96,7 +97,7 @@ public class AdminWhitelistRule implements StaplerProxy { private boolean loadMasterKillSwitchFile(@Nonnull File f) { try { if (!f.exists()) return true; - return Boolean.parseBoolean(FileUtils.readFileToString(f).trim()); + return Boolean.parseBoolean(FileUtils.readFileToString(f, Charset.defaultCharset()).trim()); } catch (IOException e) { LOGGER.log(WARNING, "Failed to read "+f, e); return false; @@ -213,7 +214,7 @@ public class AdminWhitelistRule implements StaplerProxy { try { jenkins.checkPermission(Jenkins.RUN_SCRIPTS); File f = getMasterKillSwitchFile(jenkins); - FileUtils.writeStringToFile(f, Boolean.toString(state)); + FileUtils.writeStringToFile(f, Boolean.toString(state), Charset.defaultCharset()); // treat the file as the canonical source of information in case write fails masterKillSwitch = loadMasterKillSwitchFile(f); } catch (IOException e) { diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java index 28b5292ac1..4c7f9f6fbc 100644 --- a/core/src/test/java/hudson/LauncherTest.java +++ b/core/src/test/java/hudson/LauncherTest.java @@ -30,6 +30,7 @@ import hudson.util.ProcessTree; import hudson.util.StreamTaskListener; import java.io.ByteArrayOutputStream; import java.io.File; +import java.nio.charset.Charset; import jenkins.security.MasterToSlaveCallable; import org.apache.commons.io.FileUtils; @@ -65,7 +66,7 @@ public class LauncherTest { assertTrue("Join did not finish promptly. The completion time (" + terminationTime + "ms) is longer than expected 15s", terminationTime < 15000); channels.french.call(new NoopCallable()); // this only returns after the other side of the channel has finished executing cancellation Thread.sleep(2000); // more delay to make sure it's gone - assertNull("process should be gone",ProcessTree.get().get(Integer.parseInt(FileUtils.readFileToString(tmp).trim()))); + assertNull("process should be gone",ProcessTree.get().get(Integer.parseInt(FileUtils.readFileToString(tmp, Charset.defaultCharset()).trim()))); // Manual version of test: set up instance w/ one slave. Now in script console // new hudson.FilePath(new java.io.File("/tmp")).createLauncher(new hudson.util.StreamTaskListener(System.err)). @@ -101,10 +102,10 @@ public class LauncherTest { TaskListener listener = new StreamBuildListener(output); Launcher remoteLauncher = new Launcher.RemoteLauncher(listener, FilePath.localChannel, false); Launcher decorated = remoteLauncher.decorateByEnv(new EnvVars()); - assertEquals(false, decorated.isUnix()); + assertFalse(decorated.isUnix()); remoteLauncher = new Launcher.RemoteLauncher(listener, FilePath.localChannel, true); decorated = remoteLauncher.decorateByEnv(new EnvVars()); - assertEquals(true, decorated.isUnix()); + assertTrue(decorated.isUnix()); } @Issue("JENKINS-18368") @@ -113,10 +114,10 @@ public class LauncherTest { TaskListener listener = new StreamBuildListener(output); Launcher remoteLauncher = new Launcher.RemoteLauncher(listener, FilePath.localChannel, false); Launcher decorated = remoteLauncher.decorateByPrefix("test"); - assertEquals(false, decorated.isUnix()); + assertFalse(decorated.isUnix()); remoteLauncher = new Launcher.RemoteLauncher(listener, FilePath.localChannel, true); decorated = remoteLauncher.decorateByPrefix("test"); - assertEquals(true, decorated.isUnix()); + assertTrue(decorated.isUnix()); } } diff --git a/core/src/test/java/hudson/PluginWrapperTest.java b/core/src/test/java/hudson/PluginWrapperTest.java index bc93164ff9..2bc8f754bb 100644 --- a/core/src/test/java/hudson/PluginWrapperTest.java +++ b/core/src/test/java/hudson/PluginWrapperTest.java @@ -17,7 +17,7 @@ import org.mockito.stubbing.Answer; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.*; import org.jvnet.hudson.test.Issue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -34,7 +34,7 @@ public class PluginWrapperTest { PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version); assertEquals("plugin", dependency.shortName); assertEquals("0.0.2", dependency.version); - assertEquals(false, dependency.optional); + assertFalse(dependency.optional); } @Test @@ -43,7 +43,7 @@ public class PluginWrapperTest { PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version); assertEquals("plugin", dependency.shortName); assertEquals("0.0.2", dependency.version); - assertEquals(true, dependency.optional); + assertTrue(dependency.optional); } @Test diff --git a/core/src/test/java/hudson/model/ListViewTest.java b/core/src/test/java/hudson/model/ListViewTest.java index aa77c1ddfe..d5bb71b80a 100644 --- a/core/src/test/java/hudson/model/ListViewTest.java +++ b/core/src/test/java/hudson/model/ListViewTest.java @@ -1,8 +1,8 @@ package hudson.model; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; @@ -40,7 +40,7 @@ public class ListViewTest { when(owner.getItemGroup()).thenReturn(itemGroupOwner); ListView lv = new ListView("test", owner); ItemGroupOfNonTopLevelItem ig = Mockito.mock(ItemGroupOfNonTopLevelItem.class); - when(Items.getAllItems(eq(itemGroupOwner), eq(TopLevelItem.class))).thenReturn(Arrays.asList((TopLevelItem) ig)); + when(Items.getAllItems(eq(itemGroupOwner), eq(TopLevelItem.class))).thenReturn(Arrays.asList(ig)); when(ig.getRelativeNameFrom(any(ItemGroup.class))).thenReturn("test-item"); lv.setRecurse(true); lv.add(ig); @@ -60,7 +60,7 @@ public class ListViewTest { ListView view = new ListView("test", owner); view.setIncludeRegex(".*"); TopLevelItem it = Mockito.mock(TopLevelItem.class); - List igContent = Arrays.asList((TopLevelItem) it); + List igContent = Arrays.asList(it); when(Items.getAllItems(eq(ig), eq(TopLevelItem.class))).thenReturn(igContent); when(ig.getItems()).thenReturn(igContent); when(it.getRelativeNameFrom(any(ItemGroup.class))).thenReturn("test-item"); diff --git a/core/src/test/java/hudson/slaves/ChannelPingerTest.java b/core/src/test/java/hudson/slaves/ChannelPingerTest.java index 0e4941d00b..5616bee6cf 100644 --- a/core/src/test/java/hudson/slaves/ChannelPingerTest.java +++ b/core/src/test/java/hudson/slaves/ChannelPingerTest.java @@ -1,6 +1,6 @@ package hudson.slaves; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.verifyStatic; diff --git a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java index 15527be950..acc62bb9c0 100644 --- a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java +++ b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java @@ -13,7 +13,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.ArrayList; import static org.junit.Assert.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/core/src/test/java/hudson/slaves/NodeListTest.java b/core/src/test/java/hudson/slaves/NodeListTest.java index bdea2fca52..c4f86273bc 100644 --- a/core/src/test/java/hudson/slaves/NodeListTest.java +++ b/core/src/test/java/hudson/slaves/NodeListTest.java @@ -40,6 +40,7 @@ import hudson.util.DescribableList; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; import java.util.Random; import java.util.Set; @@ -131,7 +132,7 @@ public class NodeListTest { XmlFile x = new XmlFile(Jenkins.XSTREAM, tmp); x.write(nl); - String xml = FileUtils.readFileToString(tmp); + String xml = FileUtils.readFileToString(tmp, Charset.defaultCharset()); System.out.println(xml); assertEquals(6,xml.split("\n").length); diff --git a/core/src/test/java/hudson/util/AtomicFileWriterTest.java b/core/src/test/java/hudson/util/AtomicFileWriterTest.java index a4b0cf883b..2c0308d13e 100644 --- a/core/src/test/java/hudson/util/AtomicFileWriterTest.java +++ b/core/src/test/java/hudson/util/AtomicFileWriterTest.java @@ -68,7 +68,7 @@ public class AtomicFileWriterTest { @Before public void setUp() throws IOException { af = tmp.newFile(); - FileUtils.writeStringToFile(af, PREVIOUS); + FileUtils.writeStringToFile(af, PREVIOUS, Charset.defaultCharset()); afw = new AtomicFileWriter(af.toPath(), Charset.defaultCharset()); } @@ -117,7 +117,7 @@ public class AtomicFileWriterTest { // Then assertEquals(expectedContent.length()+3, Files.size(af.toPath())); - assertEquals(expectedContent+"hey", FileUtils.readFileToString(af)); + assertEquals(expectedContent+"hey", FileUtils.readFileToString(af, Charset.defaultCharset())); } @Test @@ -130,7 +130,7 @@ public class AtomicFileWriterTest { // Then assertTrue(Files.notExists(afw.getTemporaryPath())); - assertEquals(PREVIOUS, FileUtils.readFileToString(af)); + assertEquals(PREVIOUS, FileUtils.readFileToString(af, Charset.defaultCharset())); } @Test @@ -142,7 +142,7 @@ public class AtomicFileWriterTest { } catch (IndexOutOfBoundsException e) { } - assertEquals(PREVIOUS, FileUtils.readFileToString(af)); + assertEquals(PREVIOUS, FileUtils.readFileToString(af, Charset.defaultCharset())); } @Test public void badPath() throws Exception { diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.java b/core/src/test/java/hudson/util/SecretRewriterTest.java index d29a58bc12..881f278518 100644 --- a/core/src/test/java/hudson/util/SecretRewriterTest.java +++ b/core/src/test/java/hudson/util/SecretRewriterTest.java @@ -5,6 +5,8 @@ import hudson.Functions; import hudson.model.TaskListener; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Base64; import java.util.List; @@ -51,16 +53,16 @@ public class SecretRewriterTest { private String roundtrip(String before) throws Exception { SecretRewriter sr = new SecretRewriter(null); File f = File.createTempFile("test", "xml", tmp.getRoot()); - FileUtils.write(f, before); + FileUtils.write(f, before, Charset.defaultCharset()); sr.rewrite(f, null); //assert after.replaceAll(System.getProperty("line.separator"), "\n").trim()==f.text.replaceAll(System.getProperty("line.separator"), "\n").trim() - return FileUtils.readFileToString(f).replaceAll(System.getProperty("line.separator"), "\n").trim(); + return FileUtils.readFileToString(f, Charset.defaultCharset()).replaceAll(System.getProperty("line.separator"), "\n").trim(); } private String encryptOld(String str) throws Exception { Cipher cipher = Secret.getCipher("AES"); cipher.init(Cipher.ENCRYPT_MODE, HistoricalSecrets.getLegacyKey()); - return new String(Base64.getEncoder().encode(cipher.doFinal((str + HistoricalSecrets.MAGIC).getBytes("UTF-8")))); + return new String(Base64.getEncoder().encode(cipher.doFinal((str + HistoricalSecrets.MAGIC).getBytes(StandardCharsets.UTF_8)))); } private String encryptNew(String str) { @@ -79,7 +81,6 @@ public class SecretRewriterTest { String o = encryptOld("Hello world"); String n = encryptNew("Hello world"); String payload = "" + o + ""; - String answer = "" + n + ""; // set up some directories with stuff File t = tmp.newFolder("t"); @@ -88,7 +89,7 @@ public class SecretRewriterTest { File d = new File(t, p); d.mkdir(); try { - FileUtils.write(new File(d, "foo.xml"), payload); + FileUtils.write(new File(d, "foo.xml"), payload, Charset.defaultCharset()); } catch (IOException x) { assert false : x; } @@ -96,7 +97,7 @@ public class SecretRewriterTest { // stuff outside File t2 = tmp.newFolder("t2"); - FileUtils.write(new File(t2, "foo.xml"), payload); + FileUtils.write(new File(t2, "foo.xml"), payload, Charset.defaultCharset()); // some recursions as well as valid symlinks new FilePath(t).child("c/symlink").symlinkTo("..", st); @@ -106,11 +107,11 @@ public class SecretRewriterTest { assertEquals(6, sw.rewriteRecursive(t, st)); for (String p : dirs) { - assertTrue(MSG_PATTERN.matcher(FileUtils.readFileToString(new File(t, p + "/foo.xml")).trim()).matches()); + assertTrue(MSG_PATTERN.matcher(FileUtils.readFileToString(new File(t, p + "/foo.xml"), Charset.defaultCharset()).trim()).matches()); } // t2 is only reachable by following a symlink. this should be covered, too - assertTrue(MSG_PATTERN.matcher(FileUtils.readFileToString(new File(t2, "foo.xml")).trim()).matches()); + assertTrue(MSG_PATTERN.matcher(FileUtils.readFileToString(new File(t2, "foo.xml"), Charset.defaultCharset()).trim()).matches()); } } diff --git a/core/src/test/java/hudson/util/TextFileTest.java b/core/src/test/java/hudson/util/TextFileTest.java index b923cfd074..575412fa0d 100644 --- a/core/src/test/java/hudson/util/TextFileTest.java +++ b/core/src/test/java/hudson/util/TextFileTest.java @@ -30,7 +30,7 @@ public class TextFileTest { @Test public void shortHead() throws Exception { File f = tmp.newFile(); - FileUtils.write(f, "hello"); + FileUtils.write(f, "hello", Charset.defaultCharset()); TextFile t = new TextFile(f); assertEquals("hello", t.head(35)); @@ -40,7 +40,7 @@ public class TextFileTest { public void tail() throws Exception { File f = tmp.newFile(); FileUtils.copyURLToFile(getClass().getResource("ascii.txt"), f); - String whole = FileUtils.readFileToString(f); + String whole = FileUtils.readFileToString(f, Charset.defaultCharset()); TextFile t = new TextFile(f); String tailStr = whole.substring(whole.length() - 34); assertEquals(tailStr, t.fastTail(tailStr.length())); @@ -49,7 +49,7 @@ public class TextFileTest { @Test public void shortTail() throws Exception { File f = tmp.newFile(); - FileUtils.write(f, "hello"); + FileUtils.write(f, "hello", Charset.defaultCharset()); TextFile t = new TextFile(f); assertEquals("hello", t.fastTail(35)); diff --git a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java index 9448dd3d5a..fc4f2c73ce 100644 --- a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java +++ b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java @@ -37,7 +37,7 @@ import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/core/src/test/java/jenkins/model/NewViewLinkTest.java b/core/src/test/java/jenkins/model/NewViewLinkTest.java index 74f0d19c21..badf7e3a92 100644 --- a/core/src/test/java/jenkins/model/NewViewLinkTest.java +++ b/core/src/test/java/jenkins/model/NewViewLinkTest.java @@ -2,7 +2,7 @@ package jenkins.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/jenkins/model/RunIdMigratorTest.java b/core/src/test/java/jenkins/model/RunIdMigratorTest.java index 71a3e47832..d22734a2e9 100644 --- a/core/src/test/java/jenkins/model/RunIdMigratorTest.java +++ b/core/src/test/java/jenkins/model/RunIdMigratorTest.java @@ -161,7 +161,7 @@ public class RunIdMigratorTest { // TODO test sane recovery from various error conditions private void write(String file, String text) throws Exception { - FileUtils.write(new File(dir, file), text); + FileUtils.write(new File(dir, file), text, Charset.defaultCharset()); } private void link(String symlink, String dest) throws Exception { @@ -173,14 +173,14 @@ public class RunIdMigratorTest { } private static String summarize(File dir) throws Exception { File[] kids = dir.listFiles(); - Map m = new TreeMap(); + Map m = new TreeMap<>(); for (File kid : kids) { String notation; String symlink = Util.resolveSymlink(kid); if (symlink != null) { notation = "→" + symlink; } else if (kid.isFile()) { - notation = "'" + FileUtils.readFileToString(kid) + "'"; + notation = "'" + FileUtils.readFileToString(kid, Charset.defaultCharset()) + "'"; } else if (kid.isDirectory()) { notation = summarize(kid); } else { diff --git a/core/src/test/java/jenkins/model/lazy/FakeMap.java b/core/src/test/java/jenkins/model/lazy/FakeMap.java index a74c24733f..cd29b1d980 100644 --- a/core/src/test/java/jenkins/model/lazy/FakeMap.java +++ b/core/src/test/java/jenkins/model/lazy/FakeMap.java @@ -27,6 +27,7 @@ import org.apache.commons.io.FileUtils; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; /** * @author Kohsuke Kawaguchi @@ -43,7 +44,7 @@ public class FakeMap extends AbstractLazyLoadRunMap { @Override protected Build retrieve(File dir) throws IOException { - String n = FileUtils.readFileToString(new File(dir, "n")).trim(); + String n = FileUtils.readFileToString(new File(dir, "n"), Charset.defaultCharset()).trim(); //new Exception("loading #" + n).printStackTrace(); return new Build(Integer.parseInt(n)); } diff --git a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java index 539b72ddc4..f78c496964 100644 --- a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java +++ b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java @@ -3,6 +3,8 @@ package jenkins.security; import hudson.FilePath; import hudson.Functions; import java.io.File; +import java.nio.charset.Charset; + import org.apache.commons.io.FileUtils; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -31,7 +33,7 @@ public class DefaultConfidentialStoreTest { assertTrue(new File(tmp, "test").exists()); assertTrue(new File(tmp, "master.key").exists()); - assertThat(FileUtils.readFileToString(new File(tmp, "test")), not(containsString("Hello"))); // the data shouldn't be a plain text, obviously + assertThat(FileUtils.readFileToString(new File(tmp, "test"), Charset.defaultCharset()), not(containsString("Hello"))); // the data shouldn't be a plain text, obviously if (!Functions.isWindows()) { assertEquals(0700, new FilePath(tmp).mode() & 0777); // should be read only diff --git a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java index 7d2f8db702..1c1be386c2 100644 --- a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java +++ b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java @@ -39,6 +39,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.time.temporal.ChronoUnit; import java.util.Arrays; @@ -189,7 +190,7 @@ public class ApiTokenStatsTest { { // replace the ID_1 with ID_2 in the file XmlFile statsFile = ApiTokenStats.getConfigFile(tmp.getRoot()); - String content = FileUtils.readFileToString(statsFile.getFile()); + String content = FileUtils.readFileToString(statsFile.getFile(), Charset.defaultCharset()); // now there are multiple times the same id in the file with different stats String newContentWithDuplicatedId = content.replace(ID_1, ID_2).replace(ID_3, ID_2); FileUtils.write(statsFile.getFile(), newContentWithDuplicatedId); diff --git a/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java b/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java index e45c5263ff..5e7b336a17 100644 --- a/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java +++ b/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java @@ -1,6 +1,6 @@ package jenkins.triggers; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import org.junit.Test;