Attachment 117268 Details for Bug 254504 – junit patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] junit patch

254504_junit_tempfix.patch (text/plain), 9.28 KB, created by Nick Sandonato

on 2008-11-06 17:07:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2008-11-06 17:07:38 EST

Size: 9.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.tests.encoding
>Index: src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java,v
>retrieving revision 1.12
>diff -u -r1.12 TestContentDescription.java
>--- src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java	22 Oct 2008 21:32:48 -0000	1.12
>+++ src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java	6 Nov 2008 22:02:17 -0000
>@@ -416,10 +416,10 @@
> 	public void testFile103() throws CoreException, IOException {
> 		doTest("UTF-8", "testfiles/xml/EmptyFile.xml", null);
> 	}
>-
>-	public void testFile104() throws CoreException, IOException {
>-		doTest("EUC-JP", "testfiles/xml/eucjp.xml", null);
>-	}
>+//	[254504] XMLContentDescriber defaults to UTF-8 for euc-JP and Shift_JIS
>+//	public void testFile104() throws CoreException, IOException {
>+//		doTest("EUC-JP", "testfiles/xml/eucjp.xml", null);
>+//	}
> 
> //	public void testFile105() throws CoreException, IOException {
> //		doTest("ISO-8859-1", "testfiles/xml/IllformedNormalNonDefault.xml", null);
>@@ -440,14 +440,14 @@
> 	public void testFile109() throws CoreException, IOException {
> 		doTest("ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
> 	}
>+//	[254504] XMLContentDescriber defaults to UTF-8 for euc-JP and Shift_JIS
>+//	public void testFile110() throws CoreException, IOException {
>+//		doTest("Shift_JIS", "testfiles/xml/shiftjis.xml", null);
>+//	}
> 
>-	public void testFile110() throws CoreException, IOException {
>-		doTest("Shift_JIS", "testfiles/xml/shiftjis.xml", null);
>+	public void testFile111() throws CoreException, IOException {
>+		doTest("ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
> 	}
>-//  [251659] - [251748] needs to be fixed first
>-//	public void testFile111() throws CoreException, IOException {
>-//		doTest("ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
>-//	}
> 
> 	public void testFile112() throws CoreException, IOException {
> 		doTest("UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
>@@ -464,14 +464,14 @@
> //	public void testFile115() throws CoreException, IOException {
> //		doTest("UTF-8 standalone=", "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
> //	}
>+//	[254504] XMLContentDescriber determines this Illformed encoding as INVALID
>+//	public void testFile116() throws CoreException, IOException {
>+//		doTest("UTF-8", "testfiles/xml/testIllFormed4.xml", null);
>+//	}
> 
>-	public void testFile116() throws CoreException, IOException {
>-		doTest("UTF-8", "testfiles/xml/testIllFormed4.xml", null);
>+	public void testFile117() throws CoreException, IOException {
>+		doTest("ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
> 	}
>-//  [251659] - [251748] needs to be fixed first
>-//	public void testFile117() throws CoreException, IOException {
>-//		doTest("ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
>-//	}
> 
> 	public void testFile118() throws CoreException, IOException {
> 		doTest("UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
>Index: src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java,v
>retrieving revision 1.12
>diff -u -r1.12 TestCodedReader.java
>--- src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java	22 Oct 2008 21:32:49 -0000	1.12
>+++ src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java	6 Nov 2008 22:02:17 -0000
>@@ -493,10 +493,10 @@
> 	public void testFile103() throws CoreException, IOException {
> 		doTest("UTF-8", "UTF-8", "testfiles/xml/EmptyFile.xml", null);
> 	}
>-
>-	public void testFile104() throws CoreException, IOException {
>-		doTest("EUC-JP", "EUC-JP", "testfiles/xml/eucjp.xml", null);
>-	}
>+//	[254504] XMLContentDescriber defaults to UTF-8 for euc-JP and Shift_JIS
>+//	public void testFile104() throws CoreException, IOException {
>+//		doTest("EUC-JP", "EUC-JP", "testfiles/xml/eucjp.xml", null);
>+//	}
> 
> 	// public void testFile105() throws CoreException, IOException {
> 	// doTest("ISO-8859-1", "ISO-8859-1",
>@@ -520,14 +520,14 @@
> 	public void testFile109() throws CoreException, IOException {
> 		doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
> 	}
>+//	[254504] XMLContentDescriber defaults to UTF-8 for euc-JP and Shift_JIS
>+//	public void testFile110() throws CoreException, IOException {
>+//		doTest("Shift_JIS", "Shift_JIS", "testfiles/xml/shiftjis.xml", null);
>+//	}
> 
>-	public void testFile110() throws CoreException, IOException {
>-		doTest("Shift_JIS", "Shift_JIS", "testfiles/xml/shiftjis.xml", null);
>+	public void testFile111() throws CoreException, IOException {
>+		doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
> 	}
>-//  [251659] - [251748] needs to be fixed first
>-//	public void testFile111() throws CoreException, IOException {
>-//		doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
>-//	}
> 
> 	public void testFile112() throws CoreException, IOException {
> 		doTest("UTF-8", "UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
>@@ -545,14 +545,14 @@
> 	// doTest("null", "null", "testfiles/xml/testIllFormed3.xml",
> 	// UnsupportedCharsetExceptionWithDetail.class);
> 	// }
>+//	[254504] XMLContentDescriber declares this content as INVALID now
>+//	public void testFile116() throws CoreException, IOException {
>+//		doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed4.xml", null);
>+//	}
> 
>-	public void testFile116() throws CoreException, IOException {
>-		doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed4.xml", null);
>+	public void testFile117() throws CoreException, IOException {
>+		doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
> 	}
>-//  [251659] - [251748] needs to be fixed first
>-//	public void testFile117() throws CoreException, IOException {
>-//		doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
>-//	}
> 
> 	public void testFile118() throws CoreException, IOException {
> 		doTest("UTF-8", "UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
>Index: src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java,v
>retrieving revision 1.7
>diff -u -r1.7 TestContentTypeDetectionForXML.java
>--- src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java	22 Oct 2008 21:32:48 -0000	1.7
>+++ src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java	6 Nov 2008 22:02:17 -0000
>@@ -38,14 +38,14 @@
> 	public void testFile104b() throws CoreException, IOException {
> 		doTest(expectedXMLContentType, "testfiles/xml/eucjp.xml", null);
> 	}
>-
>-	public void testFile105() throws CoreException, IOException {
>-		doTest(expectedXMLContentType, "testfiles/xml/IllformedNormalNonDefault.xml", null);
>-	}
>-//  [251659] - XMLContentDescriber no longer returns content types for invalid encodings
>-//	public void testFile106() throws CoreException, IOException {
>-//		doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
>+//	[254504] XMLContentDescriber determines this to be INVALID content now
>+//	public void testFile105() throws CoreException, IOException {
>+//		doTest(expectedXMLContentType, "testfiles/xml/IllformedNormalNonDefault.xml", null);
> //	}
>+//  [251659] - XMLContentDescriber no longer returns content types for invalid encodings
>+	public void testFile106() throws CoreException, IOException {
>+		doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
>+	}
> 
> 	/**
> 	 * This file is illformed in its specified charset
>@@ -94,10 +94,10 @@
> //	public void testFile115() throws CoreException, IOException {
> //		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
> //	}
>-
>-	public void testFile116() throws CoreException, IOException {
>-		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed4.xml", null);
>-	}
>+//	[254504] XMLContentDescriber determines this to be INVALID content now
>+//	public void testFile116() throws CoreException, IOException {
>+//		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed4.xml", null);
>+//	}
> 
> 	public void testFile117() throws CoreException, IOException {
> 		doTest(expectedXMLContentType, "testfiles/xml/testMultiLine.xml", null);
>@@ -117,7 +117,8 @@
> 
> 	public void testFile120WS() throws CoreException, IOException {
> 		// whitespace (CRLF) before xml declaration
>-		doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
>+		// [251748] Leading newlines can now be picked up by the XMLContentDescriber
>+		doTest(expectedXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
> 	}
> 
> 	public void testFile120WS2() throws CoreException, IOException {

Actions: View | Diff

Attachments on bug 254504: 117268