Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjay2018-06-20 11:28:42 +0000
committerjay2018-06-20 11:28:42 +0000
commit02ed2f97b012e3db0627db04befcc37632d2bc70 (patch)
tree7edae3f03e2311d6716097148670f1cc7b9ed445 /org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser
parent9f83d0f9cef8b3983a0d383c949afdb93b56abdb (diff)
downloadeclipse.jdt.core-02ed2f97b012e3db0627db04befcc37632d2bc70.tar.gz
eclipse.jdt.core-02ed2f97b012e3db0627db04befcc37632d2bc70.tar.xz
eclipse.jdt.core-02ed2f97b012e3db0627db04befcc37632d2bc70.zip
Bug 536072: [10] JDT Tests failing with JRE 10 in official build
Change-Id: I22a26b89dd958df5514a377ba7e29528c73e8047 Signed-off-by: jay <jarthana@in.ibm.com>
Diffstat (limited to 'org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser')
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/RunCompletionParserTests.java23
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java2
2 files changed, 23 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/RunCompletionParserTests.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/RunCompletionParserTests.java
index fc297928cd..e42b622e44 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/RunCompletionParserTests.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/RunCompletionParserTests.java
@@ -122,7 +122,28 @@ public class RunCompletionParserTests extends junit.framework.TestCase {
TestCase.RUN_ONLY_ID = null;
all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK1_8, tests_1_8));
}
-
+ if ((possibleComplianceLevels & AbstractCompilerTest.F_9) != 0) {
+ ArrayList tests_9 = (ArrayList)testClasses.clone();
+ tests_9.addAll(TEST_CLASSES_1_5);
+ // Reset forgotten subsets tests
+ TestCase.TESTS_PREFIX = null;
+ TestCase.TESTS_NAMES = null;
+ TestCase.TESTS_NUMBERS= null;
+ TestCase.TESTS_RANGE = null;
+ TestCase.RUN_ONLY_ID = null;
+ all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK9, tests_9));
+ }
+ if ((possibleComplianceLevels & AbstractCompilerTest.F_10) != 0) {
+ ArrayList tests_10 = (ArrayList)testClasses.clone();
+ tests_10.addAll(TEST_CLASSES_1_5);
+ // Reset forgotten subsets tests
+ TestCase.TESTS_PREFIX = null;
+ TestCase.TESTS_NAMES = null;
+ TestCase.TESTS_NUMBERS= null;
+ TestCase.TESTS_RANGE = null;
+ TestCase.RUN_ONLY_ID = null;
+ all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK10, tests_10));
+ }
return all;
}
}
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java
index b95f46e47d..0f0eebe87e 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java
@@ -158,7 +158,7 @@ public static TestSuite getTestSuite(boolean addComplianceDiagnoseTest) {
TestCase.TESTS_NUMBERS= null;
TestCase.TESTS_RANGE = null;
TestCase.RUN_ONLY_ID = null;
- all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK9, tests_10));
+ all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK10, tests_10));
}
return all;
}

Back to the top