[14] Create jclMin13* and relevant code in test framework

Change-Id: I23d3ef283ee6bb75698b811b20c11a3dd8953a1f
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>

7 files changed, 19 insertions, 3 deletions

diff --git a/org.eclipse.jdt.core.tests.model/JCL/JclMin14.jar b/org.eclipse.jdt.core.tests.model/JCL/JclMin14.jar
new file mode 100644
index 0000000000..2b6d9263b0
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/JCL/JclMin14.jar
diff --git a/org.eclipse.jdt.core.tests.model/JCL/JclMin14src.zip b/org.eclipse.jdt.core.tests.model/JCL/JclMin14src.zip
new file mode 100644
index 0000000000..175ac1576c
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/JCL/JclMin14src.zip
diff --git a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13.jar b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13.jar
index b63330135d..929343894c 100644
--- a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13.jar
+++ b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13.jar
diff --git a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13src.zip b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13src.zip
index 6f5bb89609..7b0fabee94 100644
--- a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13src.zip
+++ b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin13src.zip
diff --git a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14.jar b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14.jar
new file mode 100644
index 0000000000..44b9302631
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14.jar
diff --git a/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14src.zip b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14src.zip
new file mode 100644
index 0000000000..28151cce3d
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/JCL/converterJclMin14src.zip
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 6e4623700d..3a6cc1cefd 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
@@ -1531,6 +1531,9 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 	protected IJavaProject createJava11Project(String name, String[] srcFolders) throws CoreException {
 		return createJava9ProjectWithJREAttributes(name, srcFolders, null, "11");
 	}
+	protected IJavaProject createJava14Project(String name, String[] srcFolders) throws CoreException {
+		return createJava9ProjectWithJREAttributes(name, srcFolders, null, "14");
+	}
 	protected IJavaProject createJava9ProjectWithJREAttributes(String name, String[] srcFolders, IClasspathAttribute[] attributes) throws CoreException {
 		return createJava9ProjectWithJREAttributes(name, srcFolders, attributes, "9");
 	}
@@ -3171,7 +3174,8 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 		return this.currentProject;
 	}
 	protected IJavaProject setUpJavaProject(final String projectName, String compliance) throws CoreException, IOException {
-		return setUpJavaProject(projectName, compliance, false);
+		this.currentProject =  setUpJavaProject(projectName, compliance, false);
+		return this.currentProject;
 	}
 	protected IJavaProject setUpJavaProject(final String projectName, String compliance, boolean useFullJCL) throws CoreException, IOException {
 		// copy files in project from source workspace to target workspace
@@ -3221,7 +3225,10 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 				newJclSrcString = "JCL18_SRC"; // Use the same source
 			}
 		} else {
-			if (compliance.equals("13")) {
+			if (compliance.equals("14")) {
+				newJclLibString = "JCL14_LIB";
+				newJclSrcString = "JCL14_SRC";
+			} else if (compliance.equals("13")) {
 				newJclLibString = "JCL13_LIB";
 				newJclSrcString = "JCL13_SRC";
 			} else if (compliance.equals("12")) {
@@ -3286,11 +3293,12 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 		IPath jcl11Lib = new Path("JCL11_LIB");
 		IPath jcl12Lib = new Path("JCL12_LIB");
 		IPath jcl13Lib = new Path("JCL13_LIB");
+		IPath jcl14Lib = new Path("JCL14_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(jcl12Lib) || path.equals(jcl13Lib)
-				|| path.equals(jclFull);
+				|| path.equals(jcl14Lib) || path.equals(jclFull);
 	}
 	public void setUpJCLClasspathVariables(String compliance) throws JavaModelException, IOException {
 		setUpJCLClasspathVariables(compliance, false);
@@ -3369,6 +3377,14 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 					new IPath[] {getExternalJCLPath("13"), getExternalJCLSourcePath("13"), getExternalJCLRootSourcePath()},
 					null);
 			}
+		} else if ("14".equals(compliance)) {
+			if (JavaCore.getClasspathVariable("JCL14_LIB") == null) {
+				setupExternalJCL("jclMin14");
+				JavaCore.setClasspathVariables(
+					new String[] {"JCL14_LIB", "JCL14_SRC", "JCL_SRCROOT"},
+					new IPath[] {getExternalJCLPath("14"), getExternalJCLSourcePath("14"), getExternalJCLRootSourcePath()},
+					null);
+			}
 		} else {
 			if (JavaCore.getClasspathVariable("JCL_LIB") == null) {
 				setupExternalJCL("jclMin");