diff --git a/tests/org.eclipse.ice.client.widgets.test.utils/.project b/tests/org.eclipse.ice.client.widgets.test.utils/.project new file mode 100644 index 000000000..ea15953ab --- /dev/null +++ b/tests/org.eclipse.ice.client.widgets.test.utils/.project @@ -0,0 +1,28 @@ + + + org.eclipse.ice.client.widgets.test.utils + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + 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 new file mode 100644 index 000000000..11f6e462d --- /dev/null +++ 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 new file mode 100644 index 000000000..c8baa6655 --- /dev/null +++ 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 new file mode 100644 index 000000000..d0c550247 --- /dev/null +++ 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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractICEUITester.java b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java similarity index 96% rename from tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractICEUITester.java rename to tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java index 3c680e8a5..10a101f43 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractICEUITester.java +++ b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractSWTTester.java b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java similarity index 95% rename from tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractSWTTester.java rename to tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java index 2c80184be..9d4278634 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractSWTTester.java +++ b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractWorkbenchTester.java b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java similarity index 96% rename from tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractWorkbenchTester.java rename to tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java index e168e8851..2da92501d 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractWorkbenchTester.java +++ b/tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/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 index 6fe9f9afc..71d701055 100644 --- 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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java b/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java index f31b0d49d..22398a5f0 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java +++ b/tests/org.eclipse.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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java b/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java index 9fce9e5e4..80d710c76 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java +++ b/tests/org.eclipse.ice.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/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java b/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java index b34f14a17..859b9fdad 100644 --- a/tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java +++ b/tests/org.eclipse.ice.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;