Bug 461969: [test][apt] org.eclipse.jdt.compiler.apt.tests.ModelUtilTests.testTypesWithSystemCompiler failed

3 files changed, 19 insertions, 18 deletions

diff --git a/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc b/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc
index 3daa463214..23a05969b4 100644
--- a/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc
+++ b/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
-<jardesc>
-    <jar path="org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
-    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <javaElement handleIdentifier="=org.eclipse.jdt.compiler.apt.tests/processors"/>
-    </selectedElements>
-</jardesc>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<jardesc>

+    <jar path="org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar"/>

+    <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.jdt.compiler.apt.tests/apttestprocessors.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>

+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>

+    <selectedProjects/>

+    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">

+        <sealing sealJar="false">

+            <packagesToSeal/>

+            <packagesToUnSeal/>

+        </sealing>

+    </manifest>

+    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">

+        <javaElement handleIdentifier="=org.eclipse.jdt.compiler.apt.tests/processors"/>

+    </selectedElements>

+</jardesc>

diff --git a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
index 6856ad1c63..ceef846d01 100644
--- a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
+++ b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
diff --git a/org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/typeutils/TypeUtilsProc.java b/org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/typeutils/TypeUtilsProc.java
index fc52f8f8dd..e869708c6b 100644
--- a/org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/typeutils/TypeUtilsProc.java
+++ b/org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/typeutils/TypeUtilsProc.java
@@ -179,8 +179,9 @@ public class TypeUtilsProc extends BaseProcessor
 			reportError("getNoType() didn't return a TypeKind.NONE type");
 			return false;
 		}
-		if (!"<none>".equals(noType.toString())) {
-			reportError("NoType has the wrong name: " + noType.toString());
+		String noTypeString = noType.toString();
+		if (!("none".equals(noTypeString) || "<none>".equals(noTypeString))) {
+			reportError("NoType has the wrong name: " + noTypeString);
 			return false;
 		}
 		return true;