Attachment 120105 Details for Bug 258343 – patch removing TestContentTypeDetectionForXML

[patch] patch removing TestContentTypeDetectionForXML

258343_comment_out.patch (text/plain), 4.09 KB, created by Nick Sandonato

on 2008-12-10 15:30:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2008-12-10 15:30:39 EST

Size: 4.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.tests.encoding
>Index: src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java,v
>retrieving revision 1.6
>diff -u -r1.6 EncodingTestSuite.java
>--- src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java	10 Apr 2007 20:04:42 -0000	1.6
>+++ src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java	10 Dec 2008 20:24:38 -0000
>@@ -19,7 +19,6 @@
> import org.eclipse.wst.xml.tests.encoding.read.TestCodedReaderOnGennedFiles;
> import org.eclipse.wst.xml.tests.encoding.read.TestContentDescription;
> import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDescriptionOnGennedFiles;
>-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetectionForXML;
> import org.eclipse.wst.xml.tests.encoding.read.TestContentTypes;
> import org.eclipse.wst.xml.tests.encoding.write.TestCodedWrite;
> import org.eclipse.wst.xml.tests.encoding.xml.XMLEncodingTests;
>@@ -29,7 +28,9 @@
> public class EncodingTestSuite extends TestSuite {
> 
> 	// FIXME: commented out lang. spec. tests, until all migrated to org.eclipse 
>-	private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class, TestContentTypeDetectionForXML.class};
>+	// [258343] jUnit failures after org.eclipse.core.runtime.xml content type is disabled
>+	//private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class, TestContentTypeDetectionForXML.class};
>+	private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
> 	//private static Class[] classes = new Class[]{TestOverrides.class, CSSEncodingTester.class, CSSHeadTokenizerTester.class, HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, XMLMalformedInputTests.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentTypeDetection.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
> 	public EncodingTestSuite() {
> 		super("Encoding Test Suite");
>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.8
>diff -u -r1.8 TestContentTypeDetectionForXML.java
>--- src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java	6 Nov 2008 22:08:56 -0000	1.8
>+++ src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java	10 Dec 2008 20:24:38 -0000
>@@ -117,8 +117,7 @@
> 
> 	public void testFile120WS() throws CoreException, IOException {
> 		// whitespace (CRLF) before xml declaration
>-		// [251748] Leading newlines can now be picked up by the XMLContentDescriber
>-		doTest(expectedXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
>+		doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
> 	}
> 
> 	public void testFile120WS2() throws CoreException, IOException {

Actions: View | Diff

Attachments on bug 258343: 120105