Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-01-09 12:24:50 +0000
committerashatalin2009-01-09 12:24:50 +0000
commit7744c60f4505702d51593008bbb5b0e32af910ca (patch)
treec6076e25a8a0553b03761e09cc3067ab2933d1dd
parent6e804726c9056d970bd9719d5c31251faeaf23a4 (diff)
downloadorg.eclipse.gmf-tooling-7744c60f4505702d51593008bbb5b0e32af910ca.tar.gz
org.eclipse.gmf-tooling-7744c60f4505702d51593008bbb5b0e32af910ca.tar.xz
org.eclipse.gmf-tooling-7744c60f4505702d51593008bbb5b0e32af910ca.zip
Proper Charset used while loading resource contents looks like it's necessary for tests execution on builder.v20090109-0726
-rw-r--r--tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/CompositeResourcesTest.java3
-rw-r--r--tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/TestsResourceManager.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/CompositeResourcesTest.java b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/CompositeResourcesTest.java
index 19b73cea2..eb370f7fc 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/CompositeResourcesTest.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/CompositeResourcesTest.java
@@ -16,6 +16,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collections;
@@ -140,7 +141,7 @@ public class CompositeResourcesTest extends TestCase {
if (resourceAsStream == null) {
return null;
}
- return new InputStreamReader(resourceAsStream);
+ return new InputStreamReader(resourceAsStream, Charset.forName("ISO-8859-1"));
}
@Override
protected void handleParserException(ParserException ex) {
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/TestsResourceManager.java b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/TestsResourceManager.java
index e132cfa73..3a860485d 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/TestsResourceManager.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/TestsResourceManager.java
@@ -13,6 +13,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.Charset;
import org.eclipse.gmf.internal.xpand.ResourceManager;
import org.eclipse.gmf.internal.xpand.expression.SyntaxConstants;
@@ -42,7 +43,7 @@ public class TestsResourceManager extends ResourceManagerImpl implements Resourc
if (inputStream == null) {
throw new FileNotFoundException(fullyQualifiedName);
}
- return new Reader[] { new InputStreamReader(inputStream) };
+ return new Reader[] { new InputStreamReader(inputStream, Charset.forName("ISO-8859-1")) };
}
@Override

Back to the top