Merge pull request #90 from eharris369/89-updateProjectCreateInTests

Issue #89: Use new project create API for tests if available

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/console/ProjectTemplateInfo.java

@@ -59,4 +59,9 @@ private String getString(String key) {
 		return value;
 	}
 
+	@Override
+	public String toString() {
+		return projectInfo.toString();
+	}
+
 }

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/ProjectType.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -47,4 +47,9 @@ public boolean isLanguage(String language) {
 		return language != null && language.equals(this.language);
 	}
 
+	@Override
+	public String toString() {
+		return ("Project type: " + type + ", project language: " + language);
+	}
+
 }

dev/com.ibm.microclimate.test/src/com/ibm/microclimate/test/BaseTest.java

@@ -11,9 +11,11 @@
 
 package com.ibm.microclimate.test;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.resources.IMarker;
@@ -31,6 +33,7 @@
 import org.eclipse.ui.console.IConsoleManager;
 import org.eclipse.ui.console.TextConsole;
 import org.eclipse.ui.ide.IDE;
+import org.json.JSONException;
 
 import com.ibm.microclimate.core.internal.HttpUtil;
 import com.ibm.microclimate.core.internal.MCEclipseApplication;
@@ -39,6 +42,7 @@
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnection;
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnectionManager;
 import com.ibm.microclimate.core.internal.console.MicroclimateConsoleFactory;
+import com.ibm.microclimate.core.internal.console.ProjectTemplateInfo;
 import com.ibm.microclimate.core.internal.constants.AppState;
 import com.ibm.microclimate.core.internal.constants.MCConstants;
 import com.ibm.microclimate.core.internal.constants.ProjectType;
@@ -76,7 +80,7 @@ public void doSetup() throws Exception {
         MicroclimateConnectionManager.add(connection);
 
         // Create a new microprofile project
-        connection.requestProjectCreate(projectType, projectName);
+        createProject(projectType, projectName);
 
         // Wait for the project to be created
         assertTrue("The application " + projectName + " should be created", MicroclimateUtil.waitForProject(connection, projectName, 300, 5));
@@ -238,5 +242,34 @@ public static Boolean setWorkspaceAutoBuild(boolean enabled) {
 		}
 		return null;
 	}
+	
+	protected void createProject(ProjectType type, String name) throws IOException, JSONException {
+		if (connection.checkVersion(1905, "2019_M5_E")) {
+			ProjectTemplateInfo templateInfo = null;
+			List<ProjectTemplateInfo> templates = connection.requestProjectTemplates();
+			for (ProjectTemplateInfo template : templates) {
+				if (type.language.equals(template.getLanguage())) {
+					if (type.isLanguage(ProjectType.LANGUAGE_JAVA)) {
+						String extension = template.getExtension();
+						if (type.isType(ProjectType.TYPE_LIBERTY) && extension.toLowerCase().contains("microprofile")) {
+							templateInfo = template;
+							break;
+						}
+						if (type.isType(ProjectType.TYPE_SPRING) && extension.toLowerCase().contains("spring")) {
+							templateInfo = template;
+							break;
+						}
+					} else {
+						templateInfo = template;
+						break;
+					}
+				}
+			}
+			assertNotNull("No template found that matches the project type: " + projectType, templateInfo);
+			connection.requestProjectCreate(templateInfo, name);
+		} else {
+			connection.requestProjectCreate(projectType, projectName);
+		}
+	}
 
 }