diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests/src')
2 files changed, 21 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java index e40d78f73..4b951d6ec 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java @@ -241,10 +241,19 @@ public class TaskDataStoreTest extends TestCase { file.deleteOnExit(); storage.putTaskData(file, state); - try { + if (System.getProperty("java.version").compareTo("1.5") <= 0) { + // Java 1.5 fails to parse C1 characters with XML 1.1 + try { + TaskDataState state2 = storage.getTaskDataState(file); + fail("Expected CoreException, got '" + state2.getRepositoryData().getRoot().toString() + "'"); + } catch (CoreException expected) { + } + } else { + // Java 1.6 is apparently able to parse C1 characters with XML 1.1 TaskDataState state2 = storage.getTaskDataState(file); - fail("Expected CoreException, got '" + state2.getRepositoryData().getRoot().toString() + "'"); - } catch (CoreException expected) { + assertEquals(state.getRepositoryData().getRoot().toString(), state2.getRepositoryData() + .getRoot() + .toString()); } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/data/XmlExternalizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/data/XmlExternalizationTest.java index de0cbd45c..35ee29840 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/data/XmlExternalizationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/data/XmlExternalizationTest.java @@ -80,6 +80,7 @@ public class XmlExternalizationTest extends TestCase { } public void testWriteandReadBadCharacterXml10() throws Exception { + System.err.println("= XML 1.0 ="); for (int i = 0; i < 0xFFFF; i++) { char badChar = (char) i; @@ -100,15 +101,15 @@ public class XmlExternalizationTest extends TestCase { SimpleCharacterReader readHandler = new SimpleCharacterReader(); parser.setErrorHandler(new ErrorHandler() { public void warning(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } public void fatalError(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } public void error(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } }); parser.setContentHandler(readHandler); @@ -119,6 +120,7 @@ public class XmlExternalizationTest extends TestCase { } public void testWriteandReadBadCharacterXml11() throws Exception { + System.err.println("= XML 1.1 ="); for (int i = 0; i < 0xFFFF; i++) { char badChar = (char) i; @@ -139,19 +141,20 @@ public class XmlExternalizationTest extends TestCase { SimpleCharacterReader readHandler = new SimpleCharacterReader(); parser.setErrorHandler(new ErrorHandler() { public void warning(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } public void fatalError(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } public void error(SAXParseException exception) throws SAXException { - exception.printStackTrace(); + System.err.println(exception.getMessage()); } }); parser.setContentHandler(readHandler); parser.parse(new InputSource(new ByteArrayInputStream(out.toByteArray()))); + char character = readHandler.getCharacter(); assertEquals(badChar, character); } |