JBIDE-25592: Tests: fix OpenShiftSpringBootProfileDetectorTest

Signed-off-by: Dmitrii Bocharov <dbocharo@redhat.com>
jbosstools · Aug 1, 2018 · ae57a30 · ae57a30
1 parent 295dd78
commit ae57a30
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 60 deletions.
diff --git a/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF
@@ -1,49 +1,50 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.jboss.tools.openshift.test
-Bundle-Version: 3.5.1.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Require-Bundle: org.jboss.tools.openshift.client;bundle-version="[3.0.0,4.0.0)",
- org.jboss.tools.openshift.common.core;bundle-version="[3.0.0,4.0.0)",
- org.jboss.tools.openshift.common.ui;bundle-version="[3.0.0,4.0.0)",
- org.jboss.tools.openshift.core;bundle-version="[3.0.0,4.0.0)",
- org.jboss.tools.openshift.ui;bundle-version="[3.0.0,4.0.0)",
- org.jboss.tools.common.core;bundle-version="3.7.0",
- org.jboss.tools.common.ui;bundle-version="3.7.1",
- org.jboss.tools.locus.mockito;bundle-version="1.9.5",
- org.jboss.ide.eclipse.as.core;bundle-version="3.1.1",
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="3.1.1",
- org.eclipse.core.resources;bundle-version="3.9.100",
- org.eclipse.core.filesystem;bundle-version="1.4.200",
- org.eclipse.ui.views,
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.ui.navigator,
- org.eclipse.ui.ide;bundle-version="3.13.0",
- org.eclipse.core.runtime,
- org.eclipse.linuxtools.docker.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.core.databinding;bundle-version="1.5.0",
- org.eclipse.core.expressions;bundle-version="3.5.0",
- org.eclipse.jdt.launching;bundle-version="3.8.0",
- org.eclipse.wst.server.core,
- org.eclipse.debug.core,
- org.junit;bundle-version="4.8.2",
- org.apache.commons.io;bundle-version="2.0.1",
- org.apache.commons.collections,
- org.apache.commons.lang;bundle-version="2.6.0",
- org.apache.commons.logging;bundle-version="1.1.1",
- org.assertj.core;bundle-version="2.1.0",
- org.eclipse.egit.core,
- org.eclipse.team.core,
- org.eclipse.jgit;bundle-version="4.2.0",
- org.eclipse.wst.server.ui,
- org.eclipse.jst.server.core,
- org.jboss.tools.openshift.egit.ui,
- org.jboss.tools.openshift.js;bundle-version="3.4.0",
- org.jboss.tools.tests,
- org.eclipse.jdt.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Activator: org.jboss.tools.openshift.internal.test.OpenShiftTestActivator
-Bundle-ActivationPolicy: lazy
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.jboss.tools.openshift.test
+Bundle-Version: 3.5.1.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
+Require-Bundle: org.jboss.tools.openshift.client;bundle-version="[3.0.0,4.0.0)",
+ org.jboss.tools.openshift.common.core;bundle-version="[3.0.0,4.0.0)",
+ org.jboss.tools.openshift.common.ui;bundle-version="[3.0.0,4.0.0)",
+ org.jboss.tools.openshift.core;bundle-version="[3.0.0,4.0.0)",
+ org.jboss.tools.openshift.ui;bundle-version="[3.0.0,4.0.0)",
+ org.jboss.tools.common.core;bundle-version="3.7.0",
+ org.jboss.tools.common.ui;bundle-version="3.7.1",
+ org.jboss.tools.locus.mockito;bundle-version="1.9.5",
+ org.jboss.ide.eclipse.as.core;bundle-version="3.1.1",
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="3.1.1",
+ org.eclipse.core.resources;bundle-version="3.9.100",
+ org.eclipse.core.filesystem;bundle-version="1.4.200",
+ org.eclipse.ui.views,
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.ide;bundle-version="3.13.0",
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.docker.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.databinding;bundle-version="1.5.0",
+ org.eclipse.core.expressions;bundle-version="3.5.0",
+ org.eclipse.jdt.launching;bundle-version="3.8.0",
+ org.eclipse.wst.server.core,
+ org.eclipse.debug.core,
+ org.junit;bundle-version="4.8.2",
+ org.apache.commons.io;bundle-version="2.0.1",
+ org.apache.commons.collections,
+ org.apache.commons.lang;bundle-version="2.6.0",
+ org.apache.commons.logging;bundle-version="1.1.1",
+ org.assertj.core;bundle-version="2.1.0",
+ org.eclipse.egit.core,
+ org.eclipse.team.core,
+ org.eclipse.jgit;bundle-version="4.2.0",
+ org.eclipse.wst.server.ui,
+ org.eclipse.jst.server.core,
+ org.jboss.tools.openshift.egit.ui,
+ org.jboss.tools.openshift.js;bundle-version="3.4.0",
+ org.jboss.tools.tests,
+ org.eclipse.jdt.core,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.jdt;bundle-version="1.9.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Activator: org.jboss.tools.openshift.internal.test.OpenShiftTestActivator
+Bundle-ActivationPolicy: lazy
diff --git a/tests/org.jboss.tools.openshift.test/projects/SpringBootProject/.classpath b/tests/org.jboss.tools.openshift.test/projects/SpringBootProject/.classpath
@@ -25,7 +25,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/tests/org.jboss.tools.openshift.test/projects/SpringBootProject/.project b/tests/org.jboss.tools.openshift.test/projects/SpringBootProject/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SpringBootProject</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/...penshift/test/core/server/behavior/springboot/OpenShiftSpringBootProfileDetectorTest.java b/...penshift/test/core/server/behavior/springboot/OpenShiftSpringBootProfileDetectorTest.java
@@ -13,16 +13,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.m2e.core.internal.MavenPluginActivator;
+import org.eclipse.m2e.core.project.IProjectConfigurationManager;
+import org.eclipse.m2e.core.project.MavenUpdateRequest;
+import org.eclipse.ui.PartInitException;
 import org.jboss.tools.openshift.core.server.behavior.springboot.OpenShiftSpringBootProfileDetector;
 import org.jboss.tools.test.util.JobUtils;
 import org.jboss.tools.test.util.TestProjectProvider;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class OpenShiftSpringBootProfileDetectorTest {
@@ -37,7 +38,6 @@ public void before() throws CoreException, InterruptedException {
 		this.project = createSpringBootProject();
 	}
 
-	@Ignore("Works in Eclipse but not in Maven")
 	@Test
 	public void shouldDetectSpringBootProject() {
 		assertThat(new OpenShiftSpringBootProfileDetector().detect(null, null, project))
@@ -46,15 +46,18 @@ public void shouldDetectSpringBootProject() {
 				.isTrue();
 	}
 
+	@SuppressWarnings("restriction")
 	protected IProject createSpringBootProject() throws CoreException, InterruptedException {
 		TestProjectProvider projectProvider = new TestProjectProvider(CONTAINING_PLUGIN, null, SPRING_BOOT_PROJECT_NAME,
-				true);
-		IProject project = projectProvider.getProject();
-		project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+				false);
 		JobUtils.waitForIdle();
-		JavaCore.create(project);
-		JobUtils.waitForIdle();
-		return project;
+		IProject project = projectProvider.getProject();	
+        MavenPluginActivator mavenPlugin = MavenPluginActivator.getDefault();
+        IProjectConfigurationManager configurationManager = mavenPlugin.getProjectConfigurationManager();
+        MavenUpdateRequest request = new MavenUpdateRequest(project, false, true);
+        configurationManager.updateProjectConfiguration(request, new NullProgressMonitor());
+        JobUtils.waitForIdle();
+        return project;
 	}
 
 	@After