[JBIDE-24148] fixed tests

jbosstools · Jul 4, 2017 · 8d412e4 · 8d412e4
1 parent 60bb2c7
commit 8d412e4
Show file tree

Hide file tree

Showing 6 changed files with 478 additions and 405 deletions.
diff --git a/...ft.ui/src/org/jboss/tools/openshift/internal/ui/server/ServerSettingsWizardPageModel.java b/...ft.ui/src/org/jboss/tools/openshift/internal/ui/server/ServerSettingsWizardPageModel.java
@@ -382,7 +382,7 @@ private List<IBuildConfig> getBuildConfigs(IProject project) {
 	}
 
 	protected IService getService(org.eclipse.core.resources.IProject project, List<ObservableTreeItem> services) {
-		if (ProjectUtils.isAccessible(project) 
+		if (!ProjectUtils.isAccessible(project) 
 				|| CollectionUtils.isEmpty(services)) {
 			return null;
 		}
@@ -448,12 +448,18 @@ serverName, host, connectionUrl, getResource(), sourcePath, podPath, deployProje
 		server.setAttribute(OpenShiftServerUtils.SERVER_START_ON_CREATION, true);
 		ServerProfileModel.setProfile(server, getProfileId());
 
-		OpenShiftServerUtils.updateServerProject(
-				connectionUrl, getResource(), sourcePath, podPath, routeURL, devmodeKey, debugPortKey, debugPortValue, deployProject);
+		updateServer(connectionUrl, getResource(), sourcePath, routeURL, podPath, devmodeKey, debugPortKey, debugPortValue, deployProject);
 
 		updateModules(server);
 	}
 
+	// for testing purposes
+	protected void updateServer(String connectionUrl, IResource resource, String sourcePath, String routeURL, String podPath, String devmodeKey,
+			String debugPortKey, String debugPortValue, org.eclipse.core.resources.IProject deployProject) {
+		OpenShiftServerUtils.updateServerProject(
+				connectionUrl, getResource(), sourcePath, podPath, routeURL, devmodeKey, debugPortKey, debugPortValue, deployProject);
+	}
+
 	private void updateModules(IServerWorkingCopy server) {
 		IModule[] matchingModules = ServerUtil.getModules(deployProject);
 		if( matchingModules != null && matchingModules.length > 0) {

diff --git a/...penshift.test/src/org/jboss/tools/openshift/test/core/server/OpenShiftDebugUtilsTest.java b/...penshift.test/src/org/jboss/tools/openshift/test/core/server/OpenShiftDebugUtilsTest.java