diff options
Diffstat (limited to 'org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java')
-rw-r--r-- | org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java index 7724561164..face2acc8e 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java @@ -3112,7 +3112,10 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases { newJclLibString = "JCL18_FULL"; newJclSrcString = "JCL18_SRC"; // Use the same source } else { - if (compliance.equals("11")) { + if (compliance.equals("12")) { + newJclLibString = "JCL12_LIB"; + newJclSrcString = "JCL12_SRC"; + } else if (compliance.equals("11")) { newJclLibString = "JCL11_LIB"; newJclSrcString = "JCL11_SRC"; } else if (compliance.equals("10")) { @@ -3169,10 +3172,11 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases { IPath jcl9Lib = new Path("JCL19_LIB"); IPath jcl10Lib = new Path("JCL10_LIB"); IPath jcl11Lib = new Path("JCL11_LIB"); + IPath jcl12Lib = new Path("JCL12_LIB"); IPath jclFull = new Path("JCL18_FULL"); return path.equals(jclLib) || path.equals(jcl5Lib) || path.equals(jcl8Lib) || path.equals(jcl9Lib) - || path.equals(jcl10Lib) || path.equals(jcl11Lib) || path.equals(jclFull); + || path.equals(jcl10Lib) || path.equals(jcl11Lib) || path.equals(jcl12Lib) || path.equals(jclFull); } public void setUpJCLClasspathVariables(String compliance) throws JavaModelException, IOException { setUpJCLClasspathVariables(compliance, false); @@ -3235,6 +3239,14 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases { new IPath[] {getExternalJCLPath("11"), getExternalJCLSourcePath("11"), getExternalJCLRootSourcePath()}, null); } + } else if ("12".equals(compliance)) { + if (JavaCore.getClasspathVariable("JCL12_LIB") == null) { + setupExternalJCL("jclMin12"); + JavaCore.setClasspathVariables( + new String[] {"JCL12_LIB", "JCL12_SRC", "JCL_SRCROOT"}, + new IPath[] {getExternalJCLPath("12"), getExternalJCLSourcePath("12"), getExternalJCLRootSourcePath()}, + null); + } } else { if (JavaCore.getClasspathVariable("JCL_LIB") == null) { setupExternalJCL("jclMin"); |