From 0f9d2cdbbada16cbbbf623e12b003d1407fb5d30 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Thu, 29 Mar 2018 11:08:33 -0400
Subject: [PATCH] Enable Meson UI tests

Change-Id: I5f0a554c92e1568dd2cda69c198640c2a99769ec
---
 build/org.eclipse.cdt.meson.ui.tests/pom.xml                 | 4 ++--
 .../cdt/internal/meson/ui/tests/NewMesonProjectTest.java     | 5 ++---
 pom.xml                                                      | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/org.eclipse.cdt.meson.ui.tests/pom.xml b/build/org.eclipse.cdt.meson.ui.tests/pom.xml
index 74639d2bc11..7488463d34e 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.meson.ui.tests/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.cmake.ui.tests</artifactId>
+	<artifactId>org.eclipse.cdt.meson.ui.tests</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
@@ -40,4 +40,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
index 4f255d89214..a3003700498 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
@@ -14,8 +14,6 @@ import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withRe
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.index.IIndexManager;
 import org.eclipse.cdt.core.model.CoreModel;
@@ -241,7 +239,8 @@ public class NewMesonProjectTest {
 		
 		IPath projectPath = project.getLocation();
 		
-		SWTBotShell mainShell = bot.shell("junit-workspace - Eclipse Platform");
+		
+		SWTBotShell mainShell = bot.activeShell();
 
 		// use mainShell to get Project menu because it will be found somewhere else
 		bot.menu(mainShell).menu("Project").menu("Clean...").click();
diff --git a/pom.xml b/pom.xml
index 071e2f31284..df39b281d31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,6 +228,7 @@
 		<module>build/org.eclipse.cdt.autotools.tests</module>
 		<module>build/org.eclipse.cdt.autotools.ui.tests</module>
 		<module>build/org.eclipse.cdt.cmake.ui.tests</module>
+		<module>build/org.eclipse.cdt.meson.ui.tests</module>
 		<module>codan/org.eclipse.cdt.codan.core.tests</module>
 		<module>codan/org.eclipse.cdt.codan.checkers.ui.tests</module>
 		<module>core/org.eclipse.cdt.core.tests</module>