Moved the SWTBot utility test classes to a new client.widgets.test.utils

bundle so I can use them in other test fragments. Signed-off-by: Jordan <jordan.deyton@gmail.com>
eclipse · Jun 19, 2015 · 82bb276 · 82bb276
1 parent dacf67d
commit 82bb276
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 4 deletions.
diff --git a/tests/org.eclipse.ice.client.widgets.test.utils/.project b/tests/org.eclipse.ice.client.widgets.test.utils/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ice.client.widgets.test.utils</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/tests/org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF b/tests/org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ICE Client Widget Test Utilities
+Bundle-SymbolicName: org.eclipse.ice.client.widgets.test.utils
+Bundle-Version: 2.0.0
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.ice.datastructures;bundle-version="2.0.0",
+ org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.2.1",
+ org.eclipse.swtbot.go;bundle-version="2.2.1"
+Import-Package: org.eclipse.ice.client.widgets,
+ org.eclipse.ice.datastructures.form
+Export-Package: org.eclipse.ice.client.widgets.test.utils
diff --git a/tests/org.eclipse.ice.client.widgets.test.utils/build.properties b/tests/org.eclipse.ice.client.widgets.test.utils/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
+additional.bundles = org.junit,\
+                     org.hamcrest.core
diff --git a/...ent/widgets/test/AbstractICEUITester.java → ...dgets/test/utils/AbstractICEUITester.java b/...ent/widgets/test/AbstractICEUITester.java → ...dgets/test/utils/AbstractICEUITester.java
@@ -9,7 +9,7 @@
  *   Jordan Deyton - Initial API and implementation and/or initial documentation 
  *   
  *******************************************************************************/
-package org.eclipse.ice.client.widgets.test;
+package org.eclipse.ice.client.widgets.test.utils;
 
 import java.io.BufferedWriter;
 import java.io.File;

diff --git a/...lient/widgets/test/AbstractSWTTester.java → ...widgets/test/utils/AbstractSWTTester.java b/...lient/widgets/test/AbstractSWTTester.java → ...widgets/test/utils/AbstractSWTTester.java
@@ -9,7 +9,7 @@
  *   Jordan Deyton - Initial API and implementation and/or initial documentation 
  *   
  *******************************************************************************/
-package org.eclipse.ice.client.widgets.test;
+package org.eclipse.ice.client.widgets.test.utils;
 
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;

diff --git a/...widgets/test/AbstractWorkbenchTester.java → ...s/test/utils/AbstractWorkbenchTester.java b/...widgets/test/AbstractWorkbenchTester.java → ...s/test/utils/AbstractWorkbenchTester.java
@@ -9,7 +9,7 @@
  *   Jordan Deyton - Initial API and implementation and/or initial documentation 
  *   
  *******************************************************************************/
-package org.eclipse.ice.client.widgets.test;
+package org.eclipse.ice.client.widgets.test.utils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/tests/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF b/tests/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.ice.client.widgets.test
 Bundle-Version: 2.0.0
 Fragment-Host: org.eclipse.ice.client.widgets;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.ice.viz.service,
+Import-Package: org.eclipse.ice.client.widgets.test.utils,
+ org.eclipse.ice.viz.service,
  org.eclipse.ui,
  org.junit
 Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.2.1",

diff --git a/...ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java b/...ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java
@@ -12,6 +12,7 @@
 package org.eclipse.ice.client.widgets.test;
 
 import org.eclipse.ice.client.widgets.EntryComposite;
+import org.eclipse.ice.client.widgets.test.utils.AbstractSWTTester;
 import org.eclipse.ice.datastructures.form.Entry;
 import org.eclipse.swt.SWT;
 import org.junit.Test;

diff --git a/...ce.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java b/...ce.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java
@@ -21,6 +21,7 @@
 
 import org.eclipse.ice.client.widgets.ICEFormEditor;
 import org.eclipse.ice.client.widgets.ICEResourcePage;
+import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester;
 import org.eclipse.ice.datastructures.form.DataComponent;
 import org.eclipse.ice.datastructures.form.Form;
 import org.eclipse.ice.datastructures.form.ResourceComponent;

diff --git a/....client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java b/....client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java
@@ -17,6 +17,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.ice.client.widgets.PlotGridComposite;
+import org.eclipse.ice.client.widgets.test.utils.AbstractSWTTester;
 import org.eclipse.ice.viz.service.IPlot;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;