From d8ce095a3717599d72ea682594e56f81792a3fc7 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Mon, 15 Dec 2014 10:34:52 -0500
Subject: [PATCH] Bug 455237 - Move VisualizerVirtualBoundsGraphicObjectTest to
 org.eclipse.cdt.dsf.gdb.tests

Change-Id: I88b6da473df3ebc124d6c250bd581127fd12615c
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/38269
Tested-by: Hudson CI
---
 dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF  | 4 +++-
 dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml               | 2 +-
 .../src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java         | 3 ++-
 .../gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java | 6 ++++--
 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF  | 5 ++---
 5 files changed, 12 insertions(+), 8 deletions(-)
 rename dsf-gdb/{org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests => org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt}/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java (98%)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
index dddb050dffb..4dcd889e9ed 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
@@ -5,4 +5,6 @@ Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.cdt.dsf.gdb
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;bundle-version="4.8.1"
+Require-Bundle: org.junit;bundle-version="4.8.1",
+ org.eclipse.cdt.visualizer.ui,
+ org.eclipse.swt
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
index a8fab4cb287..1892abc6c8f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
@@ -33,7 +33,7 @@
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<useUIHarness>false</useUIHarness>
+					<useUIHarness>true</useUIHarness>
 					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
 					<includes>
 						<include>**/AllTests.*</include>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java
index 40a0737383c..eab4d940408 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java
@@ -26,7 +26,8 @@ import org.junit.runners.Suite.SuiteClasses;
     TestMICommandConstructCommand.class,
     LaunchUtilsTest.class,
     MIStringHandlerTests.class,
-    ProcStatParserTest.class	
+    ProcStatParserTest.class,
+    VisualizerVirtualBoundsGraphicObjectTest.class,
 })	
 public class AllTests {
 	// Often overriding BeforeClass method here
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java
similarity index 98%
rename from dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java
rename to dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java
index b3e9541766b..5da01086d95 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/VisualizerVirtualBoundsGraphicObjectTest.java
@@ -8,11 +8,13 @@
  *
  * Contributors:
  *     Marc Dumais (Ericsson) - Initial API and implementation
+ *     Marc Khouzam (Ericsson) - Move to o.e.cdt.dsf.gdb.tests (bug 455237)
  *******************************************************************************/
-package org.eclipse.cdt.tests.dsf.gdb.tests;
+package org.eclipse.cdt.dsf.gdb.tests;
+
 
-import org.eclipse.cdt.visualizer.ui.canvas.VirtualBoundsGraphicObject;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.cdt.visualizer.ui.canvas.VirtualBoundsGraphicObject;
 import org.junit.Test;
 
 public class VisualizerVirtualBoundsGraphicObjectTest {
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
index 2bffcff2df0..e238eb83dcf 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
@@ -12,9 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
  org.eclipse.debug.core,
  org.eclipse.swt,
- org.eclipse.cdt.launch;bundle-version="6.1.0",
- org.eclipse.cdt.visualizer.ui,
- org.eclipse.cdt.gdb;bundle-version="7.0.0",
+ org.eclipse.cdt.launch,
+ org.eclipse.cdt.gdb,
  org.eclipse.cdt.dsf.gdb,
  org.eclipse.core.variables
 Bundle-ActivationPolicy: lazy