Bug 528350 - [10] update in JLS 7.5.3 re duplicate static imports
-correction: expect different results per compliance level
Change-Id: I7ca40fc64cf0e97a79f131c8e5c700e011c8ab53
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
index e9f6f6e..6af278e 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
@@ -568,11 +568,20 @@
" Double d = null;\n" +
"}\n"
},
- "----------\n" +
- "1. ERROR in Test.java (at line 5)\n" +
- " Double d = null;\n" +
- " ^^^^^^\n" +
- "The type Double is ambiguous\n" +
- "----------\n");
+ (this.complianceLevel < ClassFileConstants.JDK1_8
+ ?
+ "----------\n" +
+ "1. ERROR in Test.java (at line 2)\n" +
+ " import static java.awt.geom.Point2D.Double;\n" +
+ " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+ "The import java.awt.geom.Point2D.Double collides with another import statement\n" +
+ "----------\n"
+ :
+ "----------\n" +
+ "1. ERROR in Test.java (at line 5)\n" +
+ " Double d = null;\n" +
+ " ^^^^^^\n" +
+ "The type Double is ambiguous\n" +
+ "----------\n"));
}
}
