From 323d4f1dd6101bd95c9c05ad2d26b07fd4e0e5e2 Mon Sep 17 00:00:00 2001
From: Thanh Ha
Date: Thu, 6 Mar 2014 10:30:02 -0500
Subject: Bug 429788 - [CBI] Enable JUnit tests for sourceediting.xpath.tests
 repo

Signed-off-by: Thanh Ha <thanh.ha@eclipse.org>
---
 tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml       | 9 +++++++--
 tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml         | 4 ++--
 tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml | 8 +++++---
 tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml  | 6 +++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml
index ca67eecc..700c1126 100644
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -23,5 +23,10 @@
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml.xpath.core.tests</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.wst.xml.xpath.core.tests.XPathCoreTests</testClass>
+  </properties>
 </project>
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml
index 7aab97e7..6b7e5174 100644
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -23,5 +23,5 @@
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml.xpath.ui.tests</artifactId>
   <version>1.0.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
index d0d82348..7679db34 100644
--- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  Copyright (c) 2010, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml.xpath2.processor.tests</artifactId>
   <version>2.1.1-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
   <name>PsychoPath XPath 2.0 Processor: Tests</name>
 
   <build>
@@ -35,7 +35,9 @@
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
-          <testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>true</useUIThread>
+          <testSuite>${project.artifactId}</testSuite>
           <testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass>
         </configuration>
       </plugin>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
index 37998dcc..6899315a 100644
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2011, 2013 Eclipse Foundation and others.
+  Copyright (c) 2011, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
   <version>2.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
   <name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>
 
   <build>
@@ -34,7 +34,7 @@
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
-          <testSuite>org.eclipse.wst.xml.xpath2.wtptypes.tests</testSuite>
+          <testSuite>${project.artifactId}</testSuite>
           <testClass>org.eclipse.wst.xml.xpath2.wtptypes.test.AllXPath2TestsForWTP</testClass>
         </configuration>
       </plugin>
-- 
cgit v1.2.3