Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-02-28 20:16:02 +0000
committerMatthias Sohn2015-02-28 20:16:02 +0000
commit5df56a377610a6bc60a142b7838cf10e57c8f7e6 (patch)
treee5124514a9a081e68e961f197d935f5a14f877bb /org.eclipse.egit.core.test
parent586a5a60ea19eeb829b35e7d39d1b77441ecb4b0 (diff)
downloadegit-5df56a377610a6bc60a142b7838cf10e57c8f7e6.tar.gz
egit-5df56a377610a6bc60a142b7838cf10e57c8f7e6.tar.xz
egit-5df56a377610a6bc60a142b7838cf10e57c8f7e6.zip
[findBugs] Don't rely on default encoding
Change-Id: Ie4d73c4b620a8bf7001d3e8d70fac910fbd30369 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java6
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
index 9fa868e6c6..fab1b8e237 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
@@ -182,7 +182,7 @@ public class IndexDiffCacheTest extends GitTestCase {
assertThat(data1.getIgnoredNotInIndex(),
hasItem("Project-1/sub/ignore"));
- project.createFile("sub/ignored", "Ignored".getBytes());
+ project.createFile("sub/ignored", "Ignored".getBytes("UTF-8"));
// adding this file will trigger a refresh, so no manual refresh must be
// required.
@@ -214,7 +214,7 @@ public class IndexDiffCacheTest extends GitTestCase {
assertThat(data1.getIgnoredNotInIndex(), hasItem("Project-1/sub"));
// creating a file in an ignored directory will not trigger the listener
- project.createFile("sub/ignored", "Ignored".getBytes());
+ project.createFile("sub/ignored", "Ignored".getBytes("UTF-8"));
waitForListenerNotCalled();
// removing must also not trigger the listener
@@ -240,7 +240,7 @@ public class IndexDiffCacheTest extends GitTestCase {
IFile file = project.getProject().getFile("sub/ignore");
FileOutputStream str = new FileOutputStream(file.getLocation().toFile());
try {
- str.write("other contents".getBytes());
+ str.write("other contents".getBytes("UTF-8"));
} finally {
str.close();
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
index 7a71725e9f..6bc7bc6a63 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
@@ -432,7 +432,7 @@ public class GitSubscriberMergeContextTest extends GitTestCase {
private RevCommit setContentsAndCommit(IFile targetFile,
String newContents, String commitMessage) throws Exception {
targetFile.setContents(
- new ByteArrayInputStream(newContents.getBytes()),
+ new ByteArrayInputStream(newContents.getBytes("UTF-8")),
IResource.FORCE, new NullProgressMonitor());
testRepo.addToIndex(targetFile);
return testRepo.commit(commitMessage);
@@ -441,7 +441,7 @@ public class GitSubscriberMergeContextTest extends GitTestCase {
private void assertContentEquals(IFile file, String expectedContents)
throws Exception {
BufferedReader reader = new BufferedReader(new InputStreamReader(
- file.getContents()));
+ file.getContents(), "UTF-8"));
StringBuilder contentsBuilder = new StringBuilder();
String line = reader.readLine();
while (line != null) {

Back to the top