From 94112e50e4df4434934a6d60e54d339a60371d18 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Thu, 20 Oct 2016 16:04:13 -0400 Subject: [PATCH 01/74] Set the 2.2.0 release name. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index 690093551..f5b5f2b15 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - master + 2.2.0 0.24.0 ${tycho-version} 1.1.3 From 8224b13d7bec630d4ce594975237eab8d3c92525 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 7 Nov 2016 10:09:00 -0500 Subject: [PATCH 02/74] Fixed version numbers and Oomph profile Fixed some .pom files that had incorrect version numbers. Also applied a fix from Ed Merks for the server in the Oomph profile. Signed-off-by: Robert Smith --- org.eclipse.ice.aggregator/ICE.setup | 8 ++++++-- org.eclipse.ice.core.jaxrs.test/pom.xml | 4 ++-- org.eclipse.ice.filesimulation/pom.xml | 4 ++-- org.eclipse.ice.servicetester/pom.xml | 4 ++-- org.eclipse.ice.tablecomponenttester/pom.xml | 4 ++-- org.eclipse.ice.target.mars/pom.xml | 2 +- org.eclipse.ice.ui.swtbot.test/pom.xml | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/org.eclipse.ice.aggregator/ICE.setup b/org.eclipse.ice.aggregator/ICE.setup index 509c40b4f..3b4cf9b6e 100644 --- a/org.eclipse.ice.aggregator/ICE.setup +++ b/org.eclipse.ice.aggregator/ICE.setup @@ -29,7 +29,7 @@ Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone. @@ -97,7 +97,7 @@ - ${scope.project.label} github.remote.uris repository + ${scope.project.label} Github repository @@ -124,6 +124,8 @@ url="http://download.eclipse.org/releases/oxygen"/> + @@ -131,6 +133,8 @@ url="http://download.eclipse.org/releases/neon"/> + diff --git a/org.eclipse.ice.core.jaxrs.test/pom.xml b/org.eclipse.ice.core.jaxrs.test/pom.xml index c0924e1ce..b4a9cfaf0 100644 --- a/org.eclipse.ice.core.jaxrs.test/pom.xml +++ b/org.eclipse.ice.core.jaxrs.test/pom.xml @@ -6,12 +6,12 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.core.jaxrs.test - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.filesimulation/pom.xml b/org.eclipse.ice.filesimulation/pom.xml index d8fdf0f59..eacd24c5b 100644 --- a/org.eclipse.ice.filesimulation/pom.xml +++ b/org.eclipse.ice.filesimulation/pom.xml @@ -6,12 +6,12 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.filesimulation - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.servicetester/pom.xml b/org.eclipse.ice.servicetester/pom.xml index 535ae7cde..db85ec533 100644 --- a/org.eclipse.ice.servicetester/pom.xml +++ b/org.eclipse.ice.servicetester/pom.xml @@ -6,12 +6,12 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.servicetester - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.tablecomponenttester/pom.xml b/org.eclipse.ice.tablecomponenttester/pom.xml index 68ce7e4ca..1ec74e6ff 100644 --- a/org.eclipse.ice.tablecomponenttester/pom.xml +++ b/org.eclipse.ice.tablecomponenttester/pom.xml @@ -6,12 +6,12 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.tablecomponenttester - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.target.mars/pom.xml b/org.eclipse.ice.target.mars/pom.xml index 7f42af389..f6659c744 100644 --- a/org.eclipse.ice.target.mars/pom.xml +++ b/org.eclipse.ice.target.mars/pom.xml @@ -7,7 +7,7 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.ui.swtbot.test/pom.xml b/org.eclipse.ice.ui.swtbot.test/pom.xml index 6ad4c8c6c..24fb7b6c7 100644 --- a/org.eclipse.ice.ui.swtbot.test/pom.xml +++ b/org.eclipse.ice.ui.swtbot.test/pom.xml @@ -6,7 +6,7 @@ org.eclipse.ice org.eclipse.ice.build - 0.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice From af75fe8882994601f8d0729ed24dcf03cd428f87 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 7 Nov 2016 14:13:06 -0500 Subject: [PATCH 03/74] Fixed SerializedItemBuilder JAXB class problem Fixed a bug with the SerializedItemBuilder where the ICEJAXBClassProvider was not being used to get a full list of unmarshalable classes. Signed-off-by: Robert Smith --- .../ice/item/SerializedItemBuilder.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/SerializedItemBuilder.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/SerializedItemBuilder.java index 73924b08f..25a3201c2 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/SerializedItemBuilder.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/SerializedItemBuilder.java @@ -26,6 +26,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.ice.datastructures.ICEObject.ICEJAXBHandler; +import org.eclipse.ice.datastructures.jaxbclassprovider.ICEJAXBClassProvider; import org.eclipse.ice.item.jobLauncher.JobLauncher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -108,7 +109,10 @@ public SerializedItemBuilder(InputStream inputStream) throws IOException { Reader reader = null; ICEJAXBHandler xmlMarshaller = new ICEJAXBHandler(); boolean tryAgain = false; - ArrayList classList = new ArrayList(); + + // Initialize the class list using ICE's standard JAXB class list. + ArrayList classList = (ArrayList) new ICEJAXBClassProvider() + .getClasses(); // The input stream should be legit if (inputStream != null) { @@ -123,8 +127,8 @@ public SerializedItemBuilder(InputStream inputStream) throws IOException { buffer = new char[1024]; try { // Setup the reader - reader = new BufferedReader(new InputStreamReader(inputStream, - "UTF-8")); + reader = new BufferedReader( + new InputStreamReader(inputStream, "UTF-8")); // Load the bytes into the writer while ((numChars = reader.read(buffer)) != -1) { writer.write(buffer, 0, numChars); @@ -135,8 +139,8 @@ public SerializedItemBuilder(InputStream inputStream) throws IOException { } // Read an input stream from the writer - itemReadStream = new ByteArrayInputStream(writer.toString() - .getBytes()); + itemReadStream = new ByteArrayInputStream( + writer.toString().getBytes()); // Start by trying load the Item as a JobLauncher. Catch any // exceptions so that we can try again. @@ -145,10 +149,10 @@ public SerializedItemBuilder(InputStream inputStream) throws IOException { originalItem = (Item) xmlMarshaller.read(classList, itemReadStream); } catch (NullPointerException e) { - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); tryAgain = true; } catch (JAXBException e) { - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); tryAgain = true; } @@ -165,10 +169,10 @@ public SerializedItemBuilder(InputStream inputStream) throws IOException { originalItem = (Item) xmlMarshaller.read(classList, itemReadStream); } catch (NullPointerException e) { - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); tryAgain = true; } catch (JAXBException e) { - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); tryAgain = true; } } @@ -245,6 +249,7 @@ public Item build(IProject projectSpace) { /* * (non-Javadoc) + * * @see org.eclipse.ice.item.ItemBuilder#isPublishable() */ @Override From 26ac43592f992bab35b62d4662d6dc4dd728ad95 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Thu, 10 Nov 2016 10:12:49 -0500 Subject: [PATCH 04/74] Fixed Maven release name Fixed the release name for the build back to "next" after it had been changed to "2.2.0" for the release and never reverted. Signed-off-by: Robert Smith --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index f5b5f2b15..d4afcc1c7 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - 2.2.0 + next 0.24.0 ${tycho-version} 1.1.3 From c86826e6ef2fd95025a8d5257512909a7f21ac4e Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 11 Nov 2016 13:23:06 -0500 Subject: [PATCH 05/74] Added Windows compatibility for local job launch Added missing statement to LocalExecutionAction to run commands in the command prompt if the launched executable cannot be found in the local launch directory. Signed-off-by: Robert Smith --- .../ice/item/action/LocalExecutionAction.java | 128 ++++++++++++------ 1 file changed, 86 insertions(+), 42 deletions(-) diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java index a8faef181..eae3956da 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java @@ -21,10 +21,8 @@ import java.util.Dictionary; import java.util.concurrent.atomic.AtomicBoolean; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.ice.datastructures.form.FormStatus; /** @@ -72,19 +70,20 @@ *

* * - * * -* -*

-* localJobLaunchDirectory -*

-* -* -*

-* The name of the directory within the project/jobs folder where -* the files to be uploaded can be found (optional). -*

-* -* + * * + * + * + *

+ * localJobLaunchDirectory + *

+ * + * + *

+ * The name of the directory within the project/jobs folder where the files to + * be uploaded can be found (optional). + *

+ * + * * * *

@@ -187,18 +186,19 @@ *

* * - * * -* -*

-* os -*

-* -* -*

-* The name of the operating system. -*

-* -* + * * + * + * + *

+ * os + *

+ * + * + *

+ * The name of the operating system. + *

+ * + * * * * @author Alex McCaskey @@ -238,15 +238,15 @@ public class LocalExecutionAction extends Action { private ExecutionHelper helper; /** - * The constructor. + * The constructor. */ public LocalExecutionAction() { - // Initialize the cancelled flag and + // Initialize the cancelled flag and // the form status. status = FormStatus.ReadyToProcess; cancelled = new AtomicBoolean(false); } - + /* * (non-Javadoc) * @@ -275,8 +275,10 @@ public FormStatus execute(Dictionary dictionary) { // Write some header information first try { - stdOut.write(helper.createOutputHeader("standard output", fullCMD)); - stdErr.write(helper.createOutputHeader("standard error", fullCMD)); + stdOut.write( + helper.createOutputHeader("standard output", fullCMD)); + stdErr.write( + helper.createOutputHeader("standard error", fullCMD)); } catch (IOException e) { // Complain logger.error(getClass().getName() + " Exception!", e); @@ -300,7 +302,8 @@ public FormStatus execute(Dictionary dictionary) { status = FormStatus.Processed; return status; } else { - logger.error("Local Execution Error - the input data map was not valid."); + logger.error( + "Local Execution Error - the input data map was not valid."); status = FormStatus.InfoError; return status; } @@ -371,14 +374,18 @@ protected void launchLocally() { } /** - * Launch each of the commands in this local execution. + * Launch each of the commands in this local execution. * - * @param cmd Command to execute - * @param stdOut Standard out writer - * @param stdErr Standard error writer. + * @param cmd + * Command to execute + * @param stdOut + * Standard out writer + * @param stdErr + * Standard error writer. * @return */ - protected FormStatus launchStageLocally(String cmd, BufferedWriter stdOut, BufferedWriter stdErr) { + protected FormStatus launchStageLocally(String cmd, BufferedWriter stdOut, + BufferedWriter stdErr) { // Local Declarations String errMsg = null; @@ -395,6 +402,9 @@ protected FormStatus launchStageLocally(String cmd, BufferedWriter stdOut, Buffe if (!os.toLowerCase().contains("win")) { cmdList.add("/bin/bash"); cmdList.add("-c"); + // } else{ + // cmdList.add("CMD"); + // cmdList.add("/C"); } // Add the command to the list. It will either be just the command @@ -415,8 +425,40 @@ protected FormStatus launchStageLocally(String cmd, BufferedWriter stdOut, Buffe } } catch (IOException e) { // Grab the error - errMsg = e.getMessage(); - logger.error(getClass().getName() + " Exception! ", e); + errMsg = null; + + // Just Log the erroron Mac and Linux + if (!os.toLowerCase().contains("win")) { + errMsg = e.getMessage(); + logger.error(getClass().getName() + " Exception! ", e); + } else { + + // If this is a windows machine, try to run in the command + // prompt + cmdList.add(0, "CMD"); + cmdList.add(1, "/C"); + + // Launch the command. The command must be split on spaces to + // run + // through a Java Process because the process tries to execute + // the whole + // thing as a single command with the arguments give after it. + jobBuilder = new ProcessBuilder(cmdList); + jobBuilder.directory(directory); + // Do not direct the error to stdout. Catch it separately. + jobBuilder.redirectErrorStream(false); + + try { + // Only launch the stage if it hasn't been cancelled. + if (!cancelled.get()) { + job = jobBuilder.start(); + } + } catch (IOException e2) { + errMsg = e2.getMessage(); + logger.error(getClass().getName() + " Exception! ", e2); + } + } + } // Log any errors and return if (errMsg != null) { @@ -434,13 +476,15 @@ protected FormStatus launchStageLocally(String cmd, BufferedWriter stdOut, Buffe } // Print the execution command - logger.info("LocalExecutionAction Message: " + "Launching local command: " + "\"" + cmd + "\""); + logger.info("LocalExecutionAction Message: " + + "Launching local command: " + "\"" + cmd + "\""); // Log the output stdOutStream = job.getInputStream(); stdErrStream = job.getErrorStream(); logOutput(stdOutStream, stdErrStream); - if (logOutput(stdOutStream, stdErrStream).equals(FormStatus.InfoError)) { + if (logOutput(stdOutStream, stdErrStream) + .equals(FormStatus.InfoError)) { // Throw an error if the streaming fails return FormStatus.InfoError; } From ae1a14a5e0859d4458d8b31d4522c6317060d3ee Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Thu, 17 Nov 2016 18:45:31 -0500 Subject: [PATCH 06/74] Fixed Linux launch configuration. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.product/ice.product_linux.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.product/ice.product_linux.launch b/org.eclipse.ice.product/ice.product_linux.launch index 613fbcd30..8b55c0b49 100644 --- a/org.eclipse.ice.product/ice.product_linux.launch +++ b/org.eclipse.ice.product/ice.product_linux.launch @@ -22,7 +22,7 @@ - + From 3b6d39ae4cde69f70057214b3195171a27d19564 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Thu, 17 Nov 2016 19:17:26 -0500 Subject: [PATCH 07/74] Updated the Core OSGi.launch file. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index cf06ee0a0..0245d9307 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -1,4 +1,5 @@ - + + @@ -14,16 +15,17 @@ - + + - + - + - - \ No newline at end of file + + From e9b061369b5b93047a2655946acb2d98235b5dd3 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Thu, 17 Nov 2016 20:40:19 -0500 Subject: [PATCH 08/74] Started adding OSGi remote services support for the Core. Updated the target. Added properties map in the core. Updated the launch configuration. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 2 +- .../org/eclipse/ice/core/internal/Core.java | 173 +++++++++--------- org.eclipse.ice.target.neon/neon.target | 7 + 3 files changed, 99 insertions(+), 83 deletions(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index 0245d9307..9e8a7e493 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -22,7 +22,7 @@ - + diff --git a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java index 5016490a1..4b8351fd2 100644 --- a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java +++ b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java @@ -37,8 +37,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; @@ -168,11 +166,12 @@ public Core(ItemManager manager) { // Setup the ItemManager and the project table itemManager = manager; - projectTable = new Hashtable(); + projectTable = new Hashtable<>(); // Set the project location if (!setupProjectLocation()) { - throw new RuntimeException("ICore Message: Unable to load workspace!"); + throw new RuntimeException( + "ICore Message: Unable to load workspace!"); } // Set the update lock @@ -189,11 +188,12 @@ public Core() { // Setup the ItemManager and the project table itemManager = new ItemManager(); - projectTable = new Hashtable(); + projectTable = new Hashtable<>(); // Set the project location if (!setupProjectLocation()) { - throw new RuntimeException("ICore Message: Unable to load workspace!"); + throw new RuntimeException( + "ICore Message: Unable to load workspace!"); } // Set the update lock @@ -248,13 +248,20 @@ public void start(BundleContext context) throws CoreException { // Start the webservice! startHttpService(); - // Check the currently registered extensions - LEAVE FOR NOW! ~JJB - // 20151026 11:15 - // debugCheckExtensions(); + // Configure the remote service properties + Dictionary props = new Hashtable<>(); + // OSGi Standard Property - indicates which of the interfaces of the + // service will be exported. '*' means 'all'. + props.put("service.exported.interfaces", "*"); + // OSGi Standard Property (optional) - indicates which provider + // config(s) will be used to export the service + // (If not explicitly given here, the provider is free to choose a + // default configuration for the service) + props.put("service.exported.configs", "ecf.generic.server"); // Register this class as a service with the framework. if (context != null) { - registration = context.registerService(ICore.class, this, null); + registration = context.registerService(ICore.class, this, props); } return; @@ -267,9 +274,11 @@ private void getMaterialsDatabase() { if (bundleContext != null) { // Grab the service interface - matDBServiceRef = bundleContext.getServiceReference(IMaterialsDatabase.class); + matDBServiceRef = bundleContext + .getServiceReference(IMaterialsDatabase.class); // Get the service - IMaterialsDatabase database = bundleContext.getService(matDBServiceRef); + IMaterialsDatabase database = bundleContext + .getService(matDBServiceRef); // This should probably be delegated through the ItemManager. AbstractModelBuilder.setMaterialsDatabase(database); } @@ -302,38 +311,6 @@ public void stop(BundleContext context) throws Exception { registration.unregister(); } - /** - * This function is used for logging information on the extensions available - * to the Core. - * - * @deprecated - */ - @Deprecated - private void debugCheckExtensions() { - Set extensionPoints = new HashSet(); - extensionPoints.add("org.eclipse.ice.item.itemBuilder"); - extensionPoints.add("org.eclipse.ice.item.compositeItemBuilder"); - extensionPoints.add("org.eclipse.ice.io.writer"); - extensionPoints.add("org.eclipse.ice.io.reader"); - extensionPoints.add("org.eclipse.ice.core.persistenceProvider"); - extensionPoints.add("org.eclipse.ice.datastructures.jaxbClassProvider"); - for (String extensionPointName : extensionPoints) { - IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(extensionPointName); - logger.debug("##### Extensions for: " + extensionPointName + " #####"); - if (point != null) { - IExtension[] extensions = point.getExtensions(); - for (IExtension extension : extensions) { - logger.debug("--" + extension.getSimpleIdentifier()); - } - } else { - logger.debug("Point does not exist"); - } - - logger.debug("##### end of " + extensionPointName + " #####"); - } - - } - /* * (non-Javadoc) * @@ -344,7 +321,8 @@ public void registerItem(ItemBuilder itemBuilder) { // Register the builder with the ItemManager so long as it is not null if (itemBuilder != null) { - logger.info("ICore Message: Item " + itemBuilder.getItemName() + " registered with Core."); + logger.info("ICore Message: Item " + itemBuilder.getItemName() + + " registered with Core."); itemManager.registerBuilder(itemBuilder); } @@ -361,7 +339,8 @@ public void registerCompositeItem(ICompositeItemBuilder builder) { // Register the builder with the ItemManager so long as it is not null if (builder != null) { - logger.info("ICore Message: Composite Item " + builder.getItemName() + " registered with Core."); + logger.info("ICore Message: Composite Item " + builder.getItemName() + + " registered with Core."); itemManager.registerCompositeBuilder(builder); } @@ -385,7 +364,8 @@ public void unregisterItem(ItemBuilder itemBuilder) { @Override public String createItem(String itemType) { // This operation retrieves the default "itemDB - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB"); + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject("itemDB"); return createItem(itemType, project); } @@ -407,7 +387,8 @@ public String createItem(String itemType, IProject project) { if (itemType != null && project != null) { newItemId = itemManager.createItem(itemType, project); } else { - logger.error("Unable to create Item in the core! Type = " + itemType + " , project = " + project); + logger.error("Unable to create Item in the core! Type = " + itemType + + " , project = " + project); } return String.valueOf(newItemId); @@ -461,7 +442,7 @@ public ICEList getAvailableItemTypes() { // FIXME - this is posting a warning in Eclipse about unchecked types. // It passes unit tests, so I am inclined to leave it. - ICEList retList = new ICEList(); + ICEList retList = new ICEList<>(); // Fix the list retList.setList(types); @@ -495,7 +476,8 @@ public FormStatus updateItem(Form form, int uniqueClientId) { * @see ICore#processItem(int itemId, String actionName, int uniqueClientId) */ @Override - public FormStatus processItem(int itemId, String actionName, int uniqueClientId) { + public FormStatus processItem(int itemId, String actionName, + int uniqueClientId) { // Local Declarations FormStatus status = FormStatus.InfoError; @@ -573,7 +555,7 @@ private boolean loadDefaultAreaItems() { // Local Declarations boolean status = false; - ArrayList serializedItemNames = new ArrayList(); + ArrayList serializedItemNames = new ArrayList<>(); SerializedItemBuilder builder = null; IProject project; IResource[] resources = null; @@ -600,15 +582,18 @@ private boolean loadDefaultAreaItems() { // Grab PSF or XML file if (filename.endsWith(".psf") | filename.endsWith(".xml")) { // Get the file - file = project.getFile(currentResource.getProjectRelativePath()); + file = project.getFile( + currentResource.getProjectRelativePath()); try { // Load the SerializedItemBuilder - builder = new SerializedItemBuilder(file.getContents()); + builder = new SerializedItemBuilder( + file.getContents()); // Register the builder itemManager.registerBuilder(builder); } catch (IOException e) { // TODO Auto-generated catch block - logger.error(getClass().getName() + " Exception!", e); + logger.error(getClass().getName() + " Exception!", + e); status = false; } } @@ -647,19 +632,21 @@ private void startHttpService() { // are no longer using Declarative Services. if (bundleContext != null) { // Grab the service reference and the service - httpServiceRef = bundleContext.getServiceReference(HttpService.class); + httpServiceRef = bundleContext + .getServiceReference(HttpService.class); // If it is good to go, start up the webserver if (httpServiceRef != null) { // Local Declaration - Dictionary servletParams = new Hashtable(); + Dictionary servletParams = new Hashtable<>(); // Get the service httpService = bundleContext.getService(httpServiceRef); // Set the parameters - servletParams.put("javax.ws.rs.Application", Core.class.getName()); + servletParams.put("javax.ws.rs.Application", + Core.class.getName()); // Register the service try { @@ -668,7 +655,8 @@ private void startHttpService() { bundle = bundleContext.getBundle(); // Make sure we got a valid bundle if (bundle == null) { - logger.info("ICE Core Bundle was null! No web service started."); + logger.info( + "ICE Core Bundle was null! No web service started."); return; } @@ -678,10 +666,14 @@ private void startHttpService() { // Resolve the URLs to be absolute resourceURL = FileLocator.resolve(resourceURL); configFileURL = FileLocator.resolve(configFileURL); - HttpContext httpContext = new BasicAuthSecuredContext(resourceURL, configFileURL, + HttpContext httpContext = new BasicAuthSecuredContext( + resourceURL, configFileURL, "ICE Core Server Configuration"); - httpService.registerServlet("/ice", new ServletContainer(this), servletParams, httpContext); - } catch (ServletException | NamespaceException | IOException e) { + httpService.registerServlet("/ice", + new ServletContainer(this), servletParams, + httpContext); + } catch (ServletException | NamespaceException + | IOException e) { logger.error(getClass().getName() + " Exception!", e); } logger.info("ICE Core Server loaded and web service started!"); @@ -706,7 +698,7 @@ private void startHttpService() { @Override public Set getSingletons() { // Create a set that just points to this class as the servlet - Set result = new HashSet(); + Set result = new HashSet<>(); result.add(this); return result; } @@ -742,7 +734,8 @@ private boolean setupProjectLocation() { // If the project does not exist, create it if (!project.exists()) { // Create the project description - IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(defaultProjectName); + IProjectDescription desc = ResourcesPlugin.getWorkspace() + .newProjectDescription(defaultProjectName); // Create the project project.create(desc, null); } @@ -831,7 +824,7 @@ public void disconnect(int uniqueClientId) { private ArrayList buildMessagesFromString(String messageString) { // Create the ArrayList of messages - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList<>(); // Create the parser and gson utility JsonParser parser = new JsonParser(); @@ -846,11 +839,13 @@ private ArrayList buildMessagesFromString(String messageString) { JsonObject messageJsonObject = messageJson.getAsJsonObject(); // Get the Item id from the json - JsonPrimitive itemIdJson = messageJsonObject.getAsJsonPrimitive("item_id"); + JsonPrimitive itemIdJson = messageJsonObject + .getAsJsonPrimitive("item_id"); int itemId = itemIdJson.getAsInt(); // Get the array of posts from the message - JsonArray jsonMessagesList = messageJsonObject.getAsJsonArray("posts"); + JsonArray jsonMessagesList = messageJsonObject + .getAsJsonArray("posts"); // Load the list for (int i = 0; i < jsonMessagesList.size(); i++) { @@ -867,7 +862,8 @@ private ArrayList buildMessagesFromString(String messageString) { } } catch (JsonParseException e) { // Log the message - String err = "Core Message: " + "JSON parsing failed for message " + messageString; + String err = "Core Message: " + "JSON parsing failed for message " + + messageString; logger.error(getClass().getName() + " Exception!", e); logger.error(err); } @@ -891,7 +887,8 @@ public String postUpdateMessage(String message) { // Print the message if debugging is enabled // if (debuggingEnabled) { - logger.info("Core Message: " + "Update received with message: " + message); + logger.info( + "Core Message: " + "Update received with message: " + message); // } // Only process the message if it exists and is not empty @@ -901,7 +898,8 @@ public String postUpdateMessage(String message) { String[] messageParts = message.split("="); if (messageParts.length > 1) { // Get the message object. - ArrayList msgList = buildMessagesFromString(messageParts[1]); + ArrayList msgList = buildMessagesFromString( + messageParts[1]); // Post the messages if there are any. Fail otherwise. if (!msgList.isEmpty()) { for (int i = 0; i < msgList.size(); i++) { @@ -935,7 +933,8 @@ public String importFileAsItem(URI file, String itemType) { * java.lang.String, org.eclipse.core.resources.IProject) */ @Override - public String importFileAsItem(URI file, String itemType, IProject project) { + public String importFileAsItem(URI file, String itemType, + IProject project) { // Local Declarations int newItemId = -1; @@ -946,7 +945,8 @@ public String importFileAsItem(URI file, String itemType, IProject project) { importFile(file, project); // Get the name of the file. This is only created to get the short // name of the file. Then create the Item - newItemId = itemManager.createItem(new File(file).getName(), itemType, project); + newItemId = itemManager.createItem(new File(file).getName(), + itemType, project); } return String.valueOf(newItemId); @@ -963,7 +963,8 @@ public String importFileAsItem(IFile file, String itemType) { // This is an IFile, meaning it came from an existing // IProject, call importFileAsItem with the file URI and its // corresponding IProject - return importFileAsItem(file.getLocationURI(), itemType, file.getProject()); + return importFileAsItem(file.getLocationURI(), itemType, + file.getProject()); } /** @@ -973,9 +974,11 @@ public String importFileAsItem(IFile file, String itemType) { * java.lang.String, java.lang.String) */ @Override - public String importFileAsItem(URI file, String itemType, String projectName) { + public String importFileAsItem(URI file, String itemType, + String projectName) { // Get the project associated with the project name - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject(projectName); // Import it as normal return importFileAsItem(file, itemType, project); @@ -1004,12 +1007,13 @@ public void importFile(URI file) { @Override public void importFile(URI file, String projectName) { // Local Declarations - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject(projectName); if (project != null) { importFile(file, project); } else { - logger.info( - "File could not be imported into project " + projectName + " because the project does not exist."); + logger.info("File could not be imported into project " + projectName + + " because the project does not exist."); } } @@ -1029,7 +1033,8 @@ public void importFile(URI file, IProject project) { IFile fileInProject = project.getFile(path.lastSegment()); // Get the paths and convert them to strings IPath fullPathInProject = fileInProject.getLocation(); - String path1 = path.toString(), path2 = fullPathInProject.toString(); + String path1 = path.toString(), + path2 = fullPathInProject.toString(); // Remove devices ids and other such things from the path strings path1 = path1.substring(path1.lastIndexOf(":") + 1); path2 = path2.substring(path2.lastIndexOf(":") + 1); @@ -1045,14 +1050,16 @@ public void importFile(URI file, IProject project) { fileInProject.delete(true, null); } catch (CoreException e) { // Complain and don't do anything else. - logger.info("Core Message: " + "Unable to import file."); + logger.info( + "Core Message: " + "Unable to import file."); logger.error(getClass().getName() + " Exception!", e); return; } } try { // Open a stream of the file - FileInputStream fileStream = new FileInputStream(new File(file)); + FileInputStream fileStream = new FileInputStream( + new File(file)); // Import the file fileInProject.create(fileStream, true, null); } catch (FileNotFoundException e) { @@ -1072,10 +1079,12 @@ public void importFile(URI file, IProject project) { // Drop some debug info. if (System.getProperty("DebugICE") != null) { - logger.info("Core Message: " + "Imported file " + file.toString()); + logger.info( + "Core Message: " + "Imported file " + file.toString()); } } else { - logger.info("File could not be imported into project because the File URI was not valid."); + logger.info( + "File could not be imported into project because the File URI was not valid."); } } diff --git a/org.eclipse.ice.target.neon/neon.target b/org.eclipse.ice.target.neon/neon.target index 81de87af9..2a6afbcdb 100644 --- a/org.eclipse.ice.target.neon/neon.target +++ b/org.eclipse.ice.target.neon/neon.target @@ -54,7 +54,14 @@ + + + + + + + From 2cd5dea51e3c23aa40824a6ab20b6a7351a12eb4 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 18 Nov 2016 08:00:02 -0500 Subject: [PATCH 09/74] Fixed persistence bugs Fixed a bug where ExecutableEntries were calling the supertype clone() method, causing Forms using them to have Entries of the wrong type. Fixed a bug where the VibeModel's IOservice, which does not need to be persisted, was missing an XMLTransient annotation. Signed-off-by: Robert Smith --- .../datastructures/entry/ExecutableEntry.java | 40 +++++++++++++++++++ .../org/eclipse/ice/vibe/model/VibeModel.java | 2 + 2 files changed, 42 insertions(+) diff --git a/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/entry/ExecutableEntry.java b/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/entry/ExecutableEntry.java index e67e0f640..a71fd3352 100644 --- a/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/entry/ExecutableEntry.java +++ b/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/entry/ExecutableEntry.java @@ -147,6 +147,46 @@ public void loadFromPreferences(String prefId) { } } + + /* + * (non-Javadoc) + * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#clone() + */ + @Override + public Object clone() { + ExecutableEntry entry = new ExecutableEntry(); + entry.copy(this); + return entry; + } + + + /** + * Copy the source entity's data into this object. + * + * @param entity The Entry of which this object will be come a copy. + */ + public void copy(ExecutableEntry entity) { + + // Return if null + if (entity == null) { + return; + } + + //Copy all data members + super.copy(entity); + executableUri = entity.executableUri; + + //Clear the current map + allowedValueToURI.clear(); + + //Copy in each value from the other map. + for(String value : entity.allowedValueToURI.keySet()){ + allowedValueToURI.put(value, allowedValueToURI.get(value)); + } + + return; + } + /* * (non-Javadoc) * diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java index 37be6bd1d..9d3033620 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -58,6 +59,7 @@ public class VibeModel extends Model { private ArrayList actionItems; + @XmlTransient private IIOService ioService; From 4aa247dc8b709995660fe0a2ea3ae4e7e8601a01 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 18 Nov 2016 17:28:13 -0500 Subject: [PATCH 10/74] Fixed some errors in the launch configuration. Fixed the way logging works and configured the logging bundles to match the rest of ICE's run configurations. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index 9e8a7e493..ad7d26bf3 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -19,10 +19,10 @@ - + - + From 51358f7ddecfd6341ac0cb3edd152fbb513c1545 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 18 Nov 2016 17:50:37 -0500 Subject: [PATCH 11/74] Fixed the event error from the Core OSGi.Launch file. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index ad7d26bf3..1348444b6 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -22,7 +22,7 @@ - + From d17ef622b220273ab6d039ff3a04d33ea9b26d5d Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 18 Nov 2016 18:44:03 -0500 Subject: [PATCH 12/74] Updated the ECF configuration in the core. Updated launch file too. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 4 +- .../org/eclipse/ice/core/internal/Core.java | 139 +++++++----------- 2 files changed, 59 insertions(+), 84 deletions(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index 1348444b6..d65a9d073 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -19,10 +19,10 @@ - + - + diff --git a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java index 4b8351fd2..8c3d2d748 100644 --- a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java +++ b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java @@ -155,6 +155,12 @@ public class Core extends Application implements ICore, BundleActivator { */ private ServiceRegistration registration; + /** + * This constant is used by ECF to register the exported interfaces for the + * remote OSGI service. + */ + private static final String OSGI_SERVICE_EXPORTED_INTERFACES = "service.exported.interfaces"; + /** * An alternative constructor that allows the Core to be constructed with a * particular ItemManager. This is used for testing. @@ -170,8 +176,7 @@ public Core(ItemManager manager) { // Set the project location if (!setupProjectLocation()) { - throw new RuntimeException( - "ICore Message: Unable to load workspace!"); + throw new RuntimeException("ICore Message: Unable to load workspace!"); } // Set the update lock @@ -192,8 +197,7 @@ public Core() { // Set the project location if (!setupProjectLocation()) { - throw new RuntimeException( - "ICore Message: Unable to load workspace!"); + throw new RuntimeException("ICore Message: Unable to load workspace!"); } // Set the update lock @@ -246,18 +250,23 @@ public void start(BundleContext context) throws CoreException { itemManager.loadItems(itemDBProject); // Start the webservice! - startHttpService(); + //startHttpService(); // Configure the remote service properties - Dictionary props = new Hashtable<>(); - // OSGi Standard Property - indicates which of the interfaces of the - // service will be exported. '*' means 'all'. - props.put("service.exported.interfaces", "*"); - // OSGi Standard Property (optional) - indicates which provider - // config(s) will be used to export the service - // (If not explicitly given here, the provider is free to choose a - // default configuration for the service) + Dictionary props = new Hashtable<>(); + // Add OSGi required remote service properties + props.put(OSGI_SERVICE_EXPORTED_INTERFACES, System.getProperty(OSGI_SERVICE_EXPORTED_INTERFACES, "*")); + // Use ECF generic server config. props.put("service.exported.configs", "ecf.generic.server"); + // Setup hostname config (default:localhost) + String hostname = System.getProperty("ecf.generic.server.hostname"); + if (hostname != null) { + props.put("ecf.generic.server.hostname", hostname); + } + // Setup port config (default:-1) + props.put("ecf.generic.server.port", new Integer(System.getProperty("ecf.generic.server.port", "-1"))); + // Setup IRaspberryPiAsync as async remote service + props.put("ecf.exported.async.interfaces", "*"); // Register this class as a service with the framework. if (context != null) { @@ -274,11 +283,9 @@ private void getMaterialsDatabase() { if (bundleContext != null) { // Grab the service interface - matDBServiceRef = bundleContext - .getServiceReference(IMaterialsDatabase.class); + matDBServiceRef = bundleContext.getServiceReference(IMaterialsDatabase.class); // Get the service - IMaterialsDatabase database = bundleContext - .getService(matDBServiceRef); + IMaterialsDatabase database = bundleContext.getService(matDBServiceRef); // This should probably be delegated through the ItemManager. AbstractModelBuilder.setMaterialsDatabase(database); } @@ -321,8 +328,7 @@ public void registerItem(ItemBuilder itemBuilder) { // Register the builder with the ItemManager so long as it is not null if (itemBuilder != null) { - logger.info("ICore Message: Item " + itemBuilder.getItemName() - + " registered with Core."); + logger.info("ICore Message: Item " + itemBuilder.getItemName() + " registered with Core."); itemManager.registerBuilder(itemBuilder); } @@ -339,8 +345,7 @@ public void registerCompositeItem(ICompositeItemBuilder builder) { // Register the builder with the ItemManager so long as it is not null if (builder != null) { - logger.info("ICore Message: Composite Item " + builder.getItemName() - + " registered with Core."); + logger.info("ICore Message: Composite Item " + builder.getItemName() + " registered with Core."); itemManager.registerCompositeBuilder(builder); } @@ -364,8 +369,7 @@ public void unregisterItem(ItemBuilder itemBuilder) { @Override public String createItem(String itemType) { // This operation retrieves the default "itemDB - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject("itemDB"); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("itemDB"); return createItem(itemType, project); } @@ -387,8 +391,7 @@ public String createItem(String itemType, IProject project) { if (itemType != null && project != null) { newItemId = itemManager.createItem(itemType, project); } else { - logger.error("Unable to create Item in the core! Type = " + itemType - + " , project = " + project); + logger.error("Unable to create Item in the core! Type = " + itemType + " , project = " + project); } return String.valueOf(newItemId); @@ -476,8 +479,7 @@ public FormStatus updateItem(Form form, int uniqueClientId) { * @see ICore#processItem(int itemId, String actionName, int uniqueClientId) */ @Override - public FormStatus processItem(int itemId, String actionName, - int uniqueClientId) { + public FormStatus processItem(int itemId, String actionName, int uniqueClientId) { // Local Declarations FormStatus status = FormStatus.InfoError; @@ -582,18 +584,15 @@ private boolean loadDefaultAreaItems() { // Grab PSF or XML file if (filename.endsWith(".psf") | filename.endsWith(".xml")) { // Get the file - file = project.getFile( - currentResource.getProjectRelativePath()); + file = project.getFile(currentResource.getProjectRelativePath()); try { // Load the SerializedItemBuilder - builder = new SerializedItemBuilder( - file.getContents()); + builder = new SerializedItemBuilder(file.getContents()); // Register the builder itemManager.registerBuilder(builder); } catch (IOException e) { // TODO Auto-generated catch block - logger.error(getClass().getName() + " Exception!", - e); + logger.error(getClass().getName() + " Exception!", e); status = false; } } @@ -632,8 +631,7 @@ private void startHttpService() { // are no longer using Declarative Services. if (bundleContext != null) { // Grab the service reference and the service - httpServiceRef = bundleContext - .getServiceReference(HttpService.class); + httpServiceRef = bundleContext.getServiceReference(HttpService.class); // If it is good to go, start up the webserver if (httpServiceRef != null) { @@ -645,8 +643,7 @@ private void startHttpService() { httpService = bundleContext.getService(httpServiceRef); // Set the parameters - servletParams.put("javax.ws.rs.Application", - Core.class.getName()); + servletParams.put("javax.ws.rs.Application", Core.class.getName()); // Register the service try { @@ -655,8 +652,7 @@ private void startHttpService() { bundle = bundleContext.getBundle(); // Make sure we got a valid bundle if (bundle == null) { - logger.info( - "ICE Core Bundle was null! No web service started."); + logger.info("ICE Core Bundle was null! No web service started."); return; } @@ -666,14 +662,10 @@ private void startHttpService() { // Resolve the URLs to be absolute resourceURL = FileLocator.resolve(resourceURL); configFileURL = FileLocator.resolve(configFileURL); - HttpContext httpContext = new BasicAuthSecuredContext( - resourceURL, configFileURL, + HttpContext httpContext = new BasicAuthSecuredContext(resourceURL, configFileURL, "ICE Core Server Configuration"); - httpService.registerServlet("/ice", - new ServletContainer(this), servletParams, - httpContext); - } catch (ServletException | NamespaceException - | IOException e) { + httpService.registerServlet("/ice", new ServletContainer(this), servletParams, httpContext); + } catch (ServletException | NamespaceException | IOException e) { logger.error(getClass().getName() + " Exception!", e); } logger.info("ICE Core Server loaded and web service started!"); @@ -734,8 +726,7 @@ private boolean setupProjectLocation() { // If the project does not exist, create it if (!project.exists()) { // Create the project description - IProjectDescription desc = ResourcesPlugin.getWorkspace() - .newProjectDescription(defaultProjectName); + IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(defaultProjectName); // Create the project project.create(desc, null); } @@ -839,13 +830,11 @@ private ArrayList buildMessagesFromString(String messageString) { JsonObject messageJsonObject = messageJson.getAsJsonObject(); // Get the Item id from the json - JsonPrimitive itemIdJson = messageJsonObject - .getAsJsonPrimitive("item_id"); + JsonPrimitive itemIdJson = messageJsonObject.getAsJsonPrimitive("item_id"); int itemId = itemIdJson.getAsInt(); // Get the array of posts from the message - JsonArray jsonMessagesList = messageJsonObject - .getAsJsonArray("posts"); + JsonArray jsonMessagesList = messageJsonObject.getAsJsonArray("posts"); // Load the list for (int i = 0; i < jsonMessagesList.size(); i++) { @@ -862,8 +851,7 @@ private ArrayList buildMessagesFromString(String messageString) { } } catch (JsonParseException e) { // Log the message - String err = "Core Message: " + "JSON parsing failed for message " - + messageString; + String err = "Core Message: " + "JSON parsing failed for message " + messageString; logger.error(getClass().getName() + " Exception!", e); logger.error(err); } @@ -887,8 +875,7 @@ public String postUpdateMessage(String message) { // Print the message if debugging is enabled // if (debuggingEnabled) { - logger.info( - "Core Message: " + "Update received with message: " + message); + logger.info("Core Message: " + "Update received with message: " + message); // } // Only process the message if it exists and is not empty @@ -898,8 +885,7 @@ public String postUpdateMessage(String message) { String[] messageParts = message.split("="); if (messageParts.length > 1) { // Get the message object. - ArrayList msgList = buildMessagesFromString( - messageParts[1]); + ArrayList msgList = buildMessagesFromString(messageParts[1]); // Post the messages if there are any. Fail otherwise. if (!msgList.isEmpty()) { for (int i = 0; i < msgList.size(); i++) { @@ -933,8 +919,7 @@ public String importFileAsItem(URI file, String itemType) { * java.lang.String, org.eclipse.core.resources.IProject) */ @Override - public String importFileAsItem(URI file, String itemType, - IProject project) { + public String importFileAsItem(URI file, String itemType, IProject project) { // Local Declarations int newItemId = -1; @@ -945,8 +930,7 @@ public String importFileAsItem(URI file, String itemType, importFile(file, project); // Get the name of the file. This is only created to get the short // name of the file. Then create the Item - newItemId = itemManager.createItem(new File(file).getName(), - itemType, project); + newItemId = itemManager.createItem(new File(file).getName(), itemType, project); } return String.valueOf(newItemId); @@ -963,8 +947,7 @@ public String importFileAsItem(IFile file, String itemType) { // This is an IFile, meaning it came from an existing // IProject, call importFileAsItem with the file URI and its // corresponding IProject - return importFileAsItem(file.getLocationURI(), itemType, - file.getProject()); + return importFileAsItem(file.getLocationURI(), itemType, file.getProject()); } /** @@ -974,11 +957,9 @@ public String importFileAsItem(IFile file, String itemType) { * java.lang.String, java.lang.String) */ @Override - public String importFileAsItem(URI file, String itemType, - String projectName) { + public String importFileAsItem(URI file, String itemType, String projectName) { // Get the project associated with the project name - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(projectName); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); // Import it as normal return importFileAsItem(file, itemType, project); @@ -1007,13 +988,12 @@ public void importFile(URI file) { @Override public void importFile(URI file, String projectName) { // Local Declarations - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(projectName); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); if (project != null) { importFile(file, project); } else { - logger.info("File could not be imported into project " + projectName - + " because the project does not exist."); + logger.info( + "File could not be imported into project " + projectName + " because the project does not exist."); } } @@ -1033,8 +1013,7 @@ public void importFile(URI file, IProject project) { IFile fileInProject = project.getFile(path.lastSegment()); // Get the paths and convert them to strings IPath fullPathInProject = fileInProject.getLocation(); - String path1 = path.toString(), - path2 = fullPathInProject.toString(); + String path1 = path.toString(), path2 = fullPathInProject.toString(); // Remove devices ids and other such things from the path strings path1 = path1.substring(path1.lastIndexOf(":") + 1); path2 = path2.substring(path2.lastIndexOf(":") + 1); @@ -1050,16 +1029,14 @@ public void importFile(URI file, IProject project) { fileInProject.delete(true, null); } catch (CoreException e) { // Complain and don't do anything else. - logger.info( - "Core Message: " + "Unable to import file."); + logger.info("Core Message: " + "Unable to import file."); logger.error(getClass().getName() + " Exception!", e); return; } } try { // Open a stream of the file - FileInputStream fileStream = new FileInputStream( - new File(file)); + FileInputStream fileStream = new FileInputStream(new File(file)); // Import the file fileInProject.create(fileStream, true, null); } catch (FileNotFoundException e) { @@ -1079,12 +1056,10 @@ public void importFile(URI file, IProject project) { // Drop some debug info. if (System.getProperty("DebugICE") != null) { - logger.info( - "Core Message: " + "Imported file " + file.toString()); + logger.info("Core Message: " + "Imported file " + file.toString()); } } else { - logger.info( - "File could not be imported into project because the File URI was not valid."); + logger.info("File could not be imported into project because the File URI was not valid."); } } From 7f4d80447693529a5d704a9a14650139b54a16cf Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 18 Nov 2016 20:35:18 -0500 Subject: [PATCH 13/74] Fixed #289 as far as I can tell. This was completely hosed. plugin.xml was missing from the build.properties file. The schema was incorrectly defined. The XMLPersistenceProvider was not pulling from the extension points correctly. I fixed this and tested it with a clean build. Signed-off-by: Jay Jay Billings --- .../build.properties | 2 +- org.eclipse.ice.datastructures/plugin.xml | 2 +- .../schema/jaxbClassProvider.exsd | 4 +- .../src/org/eclipse/ice/item/ItemBuilder.java | 10 +- .../test/XMLPersistenceProviderTester.java | 24 ++-- .../xml/XMLPersistenceProvider.java | 109 +++++++++++------- 6 files changed, 89 insertions(+), 62 deletions(-) diff --git a/org.eclipse.ice.datastructures/build.properties b/org.eclipse.ice.datastructures/build.properties index f6354d935..3464a1c65 100644 --- a/org.eclipse.ice.datastructures/build.properties +++ b/org.eclipse.ice.datastructures/build.properties @@ -2,7 +2,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ schema/,\ - ,\ + plugin.xml,\ OSGI-INF/ src.includes = META-INF/,\ src/ diff --git a/org.eclipse.ice.datastructures/plugin.xml b/org.eclipse.ice.datastructures/plugin.xml index 30c16e4c3..15fc1bd46 100644 --- a/org.eclipse.ice.datastructures/plugin.xml +++ b/org.eclipse.ice.datastructures/plugin.xml @@ -1,7 +1,7 @@ - + - + This Extension Point can be used by clients to automatically provide a class to ICE's JAXB-based persistence services. Extensions must realize the IJAXBProvider interface from org.eclipse.ice.datastructures.jaxbclassprovider. @@ -52,7 +52,7 @@ - + A class that implements the IJAXBClassProvider interface (or extends one of its implementations) to provide new classes to Eclipse ICE's XML persistence API. diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/ItemBuilder.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/ItemBuilder.java index 0d5f9b119..61df72c45 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/ItemBuilder.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/ItemBuilder.java @@ -40,8 +40,7 @@ public interface ItemBuilder { * This operation returns the short name of the Item that can be constructed * by this ItemBuilder. * - * @return - * The name + * @return The name */ public String getItemName(); @@ -49,8 +48,7 @@ public interface ItemBuilder { * This operation returns the type of Item that can be built by the * ItemBuilder. * - * @return - * The type + * @return The type */ public ItemType getItemType(); @@ -70,8 +68,7 @@ public interface ItemBuilder { * * @param projectSpace * The Eclipse project that the Item should use for storage. - * @return - * The newly created Item. + * @return The newly created Item. */ public Item build(IProject projectSpace); @@ -89,7 +86,6 @@ public static ItemBuilder[] getItemBuilders() throws CoreException { * Logger for handling event messages and other information. */ Logger logger = LoggerFactory.getLogger(ItemBuilder.class); - ItemBuilder[] builders = null; String id = "org.eclipse.ice.item.itemBuilder"; IExtensionPoint point = Platform.getExtensionRegistry() diff --git a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java b/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java index 6cb5235ae..466dedb04 100644 --- a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java +++ b/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java @@ -98,7 +98,7 @@ static public void setup() { try { // Start the service xmlpp.start(); - } catch (JAXBException e) { + } catch (JAXBException | CoreException e) { e.printStackTrace(); fail(); } @@ -233,7 +233,7 @@ private void pause(int seconds) { } /** - * Check that we can rename Items with the persistence provider. + * Check that we can rename Items with the persistence provider. * */ @Test @@ -251,14 +251,14 @@ public void checkRename() { pause(2); xmlpp.renameItem(item, "testItemName"); - + pause(2); - + assertTrue(project.getFile("testItemName.xml").exists()); assertFalse(project.getFile(name).exists()); - + } - + /** * This operation checks the ability of the XMLPersistenceProvider to * persist Items to its project space. It also checks update() since that @@ -366,9 +366,9 @@ public void checkLoad() { // Check the list Item listItem = items.get(0); - // Look for the correct name and item id - assertEquals(listItem.getName(),MOOSEModelBuilder.name); - assertEquals(listItem.getId(),3); + // Look for the correct name and item id + assertEquals(listItem.getName(), MOOSEModelBuilder.name); + assertEquals(listItem.getId(), 3); // Delete the item assertTrue(xmlpp.deleteItem(item)); @@ -387,10 +387,10 @@ public void checkLoad() { assertTrue(xmlpp.persistItem(vibeItem)); pause(2); items = xmlpp.loadItems(); - assertEquals(1,items.size()); + assertEquals(1, items.size()); listItem = items.get(0); - assertEquals(vibeItem.getName(),listItem.getName()); - + assertEquals(vibeItem.getName(), listItem.getName()); + // Delete the Item xmlpp.deleteItem(vibeItem); pause(2); diff --git a/org.eclipse.ice.persistence.xml/src/org/eclipse/ice/persistence/xml/XMLPersistenceProvider.java b/org.eclipse.ice.persistence.xml/src/org/eclipse/ice/persistence/xml/XMLPersistenceProvider.java index fa9604201..89997a01c 100644 --- a/org.eclipse.ice.persistence.xml/src/org/eclipse/ice/persistence/xml/XMLPersistenceProvider.java +++ b/org.eclipse.ice.persistence.xml/src/org/eclipse/ice/persistence/xml/XMLPersistenceProvider.java @@ -15,6 +15,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.Hashtable; import java.util.List; import java.util.Set; @@ -75,12 +76,14 @@ * @author Jay Jay Billings * */ -public class XMLPersistenceProvider implements IPersistenceProvider, Runnable, IReader, IWriter { +public class XMLPersistenceProvider + implements IPersistenceProvider, Runnable, IReader, IWriter { /** * Logger for handling event messages and other information. */ - private static final Logger logger = LoggerFactory.getLogger(XMLPersistenceProvider.class); + private static final Logger logger = LoggerFactory + .getLogger(XMLPersistenceProvider.class); /** * An atomic boolean used to manage the event loop. It is set to true when @@ -122,7 +125,7 @@ private static class QueuedTask { * The blocking queue that holds all of the persistence tasks that are left * to be processed. */ - ArrayBlockingQueue taskQueue = new ArrayBlockingQueue(1024); + ArrayBlockingQueue taskQueue = new ArrayBlockingQueue<>(1024); /** * A private thread on which the event loop is run. The runnable for this @@ -141,14 +144,14 @@ private static class QueuedTask { * with the persistence provider by calling addBuilder(). These Items are * used to create the list of classes passed to the JAXBContext. */ - private ArrayList referenceItems = new ArrayList(); + private ArrayList referenceItems = new ArrayList<>(); /** * A map of the ids of the Items that have persisted as its keys and the * file names of those Items as values. This is used when loading Items off * of disk and updated when Items are persisted. */ - private Hashtable itemIdMap = new Hashtable(); + private Hashtable itemIdMap = new Hashtable<>(); /** * The list of IJAXBClassProviders to be used in the construction of the @@ -166,7 +169,7 @@ private static class QueuedTask { * Default constructor. */ public XMLPersistenceProvider() { - classProviders = new ArrayList(); + classProviders = new ArrayList<>(); } /** @@ -177,7 +180,7 @@ public XMLPersistenceProvider() { * The project space that should be used instead of the default. */ public XMLPersistenceProvider(IProject projectSpace) { - classProviders = new ArrayList(); + classProviders = new ArrayList<>(); project = projectSpace; } @@ -206,7 +209,7 @@ private void loadItemIdMap() { // Local Declarations int id; - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); IResource[] members; try { @@ -216,8 +219,8 @@ private void loadItemIdMap() { // Only add the resources that are xml files with the format // that we expect. This uses a regular expression that checks // for _.xml. - if (resource.getType() == IResource.FILE - && resource.getName().matches("^[a-zA-Z0-9_\\-]*_\\d+\\.xml$")) { + if (resource.getType() == IResource.FILE && resource.getName() + .matches("^[a-zA-Z0-9_\\-]*_\\d+\\.xml$")) { names.add(resource.getName()); } } @@ -225,13 +228,15 @@ private void loadItemIdMap() { // Get the ids of all of the items from the file names and map them // to the names. for (String name : names) { - logger.info("XMLPersistenceProvider Message: " + "Found persisted Item at " + name); + logger.info("XMLPersistenceProvider Message: " + + "Found persisted Item at " + name); // Remove the file extension String[] nameParts = name.split("\\."); String nameMinusExt = nameParts[0]; // Get the id from the end String[] nameMinusExtParts = nameMinusExt.split("_"); - String idString = nameMinusExtParts[nameMinusExtParts.length - 1]; + String idString = nameMinusExtParts[nameMinusExtParts.length + - 1]; id = Integer.valueOf(idString); // Put the info in the map itemIdMap.put(id, name); @@ -252,20 +257,28 @@ private void loadItemIdMap() { * @throws JAXBException * An exception indicating that the JAXB Context could not be * created. + * @throws CoreException */ - private void createJAXBContext() throws JAXBException { + private void createJAXBContext() throws JAXBException, CoreException { // Make an array to store the class list of registered Items - ArrayList classList = new ArrayList(); + ArrayList classList = new ArrayList<>(); Class[] classArray = {}; // Create the list of classes for the JAXBContext for (Item refItem : referenceItems) { classList.add(refItem.getClass()); } - // We need to explicitly add some classes to the list so that they will - // be handled appropriately. For example, Material does not have a - // component so it will not get added to the class list when the Form is - // read from all of the Items above. - // classList.add(Material.class); + + // Pull any class providers registered through extension points and add + // them to the list. + IJAXBClassProvider[] extensionProviders = IJAXBClassProvider + .getJAXBProviders(); + if (extensionProviders != null && extensionProviders.length > 0) { + classProviders.addAll(Arrays.asList(extensionProviders)); + logger.debug("Providers found at IJAXBClassProvider " + + "extension point."); + } else { + logger.debug("No extensions found for IJAXBClassProviders."); + } // Now add all Classes provided by the registered // IJAXBClassProviders if they are available. @@ -273,6 +286,9 @@ private void createJAXBContext() throws JAXBException { for (IJAXBClassProvider provider : classProviders) { classList.addAll(provider.getClasses()); } + } else { + logger.debug("No IJAXBClassProvider instances found! " + + "Persistence will be disabled."); } // Create new JAXB class context and unmarshaller @@ -287,8 +303,9 @@ private void createJAXBContext() throws JAXBException { * @throws JAXBException * An exception indicating that the JAXB Context could not be * created. + * @throws CoreException */ - public void start() throws JAXBException { + public void start() throws JAXBException, CoreException { // Debug information logger.info("XMLPersistenceProvider Message: " + "Starting Provider!"); @@ -361,7 +378,8 @@ public void stop() { */ public void addBuilder(ItemBuilder builder) { - logger.info("XMLPersistenceProvider Message: " + "Item " + builder.getItemName() + " registered."); + logger.info("XMLPersistenceProvider Message: " + "Item " + + builder.getItemName() + " registered."); // Build an Item from this builder and store it so that we can get its // class info later. @@ -389,12 +407,14 @@ private ByteArrayOutputStream createXMLStream(Object obj) { Marshaller marshaller; try { marshaller = context.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, + Boolean.TRUE); marshaller.marshal(obj, outputStream); } catch (JAXBException e) { // Complain logger.error(getClass().getName() + " Exception!", e); - logger.info("XMLPersistenceProvider Message: " + "Failed to execute persistence task for " + obj); + logger.info("XMLPersistenceProvider Message: " + + "Failed to execute persistence task for " + obj); } return outputStream; } @@ -411,7 +431,8 @@ private void writeFile(Object obj, IFile file) { // Create an output stream containing the XML. ByteArrayOutputStream outputStream = createXMLStream(obj); // Convert it to an input stream so it can be pushed to file - ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray()); + ByteArrayInputStream inputStream = new ByteArrayInputStream( + outputStream.toByteArray()); try { // Update the output file if it already exists if (file.exists()) { @@ -443,9 +464,11 @@ private void processTask(QueuedTask currentTask) { // Handle the task if it is available if (currentTask != null) { // Get the file name if this is a persist or delete - if ("persist".equals(currentTask.task) || "delete".equals(currentTask.task)) { + if ("persist".equals(currentTask.task) + || "delete".equals(currentTask.task)) { // Setup the file name - name = currentTask.item.getName().replaceAll("\\s+", "_") + ".xml"; + name = currentTask.item.getName().replaceAll("\\s+", "_") + + ".xml"; // Get the file from the project registered with the Item. // This may change depending on whether or not this Item was // created in the default project. @@ -476,18 +499,22 @@ private void processTask(QueuedTask currentTask) { } else if ("rename".equals(currentTask.task)) { String oldFile = itemIdMap.get(currentTask.item.getId()); if (oldFile != null) { - itemIdMap.put(currentTask.item.getId(), currentTask.file.getName()); - - // Sleep for a bit to let the platform delete if it wants + itemIdMap.put(currentTask.item.getId(), + currentTask.file.getName()); + + // Sleep for a bit to let the platform delete if it + // wants Thread.currentThread(); Thread.sleep(1000); - + IProject project = currentTask.item.getProject(); IFile oldFileHandle = project.getFile(oldFile); if (oldFileHandle.exists()) { - oldFileHandle.move(currentTask.file.getProjectRelativePath(), true, null); + oldFileHandle.move( + currentTask.file.getProjectRelativePath(), + true, null); } - + } } @@ -499,7 +526,7 @@ private void processTask(QueuedTask currentTask) { } catch (InterruptedException | CoreException e) { // Complain logger.error(getClass().getName() + " Exception!", e); - } + } return; } @@ -537,7 +564,7 @@ public void run() { */ @Override public void renameItem(Item item, String newName) { - IFile newFile = item.getProject().getFile(newName+".xml"); + IFile newFile = item.getProject().getFile(newName + ".xml"); submitTask(item, "rename", item.getForm(), newFile); return; } @@ -555,7 +582,8 @@ public void renameItem(Item item, String newName) { * @return True if the task was submitted, false if there was some exception * or the Item was null. */ - private boolean submitTask(Item item, String taskName, Form form, IFile file) { + private boolean submitTask(Item item, String taskName, Form form, + IFile file) { // Local Declarations boolean retVal = true; @@ -663,7 +691,8 @@ public Item loadItem(int itemID) { @Override public Item loadItem(IResource itemResource) { // If the IResource is an IFile, load it and otherwise return null. - return (itemResource instanceof IFile) ? loadItem((IFile) itemResource) : null; + return (itemResource instanceof IFile) ? loadItem((IFile) itemResource) + : null; } /** @@ -709,7 +738,7 @@ public boolean updateItem(Item item) { public ArrayList loadItems() { // Local Declarations - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); Set keys = itemIdMap.keySet(); Item item = null; @@ -745,7 +774,8 @@ public void write(Form formToWrite, IFile file) { public void replace(IFile file, String regex, String value) { try { throw new OperationNotSupportedException( - "XMLPersistenceProvider Error: " + "IWriter.replace() is not supported."); + "XMLPersistenceProvider Error: " + + "IWriter.replace() is not supported."); } catch (OperationNotSupportedException e) { // TODO Auto-generated catch block logger.error(getClass().getName() + " Exception!", e); @@ -798,7 +828,8 @@ public Form read(IFile file) { public ArrayList findAll(IFile file, String regex) { try { throw new OperationNotSupportedException( - "XMLPersistenceProvider Error: " + "IReader.findAll() is not supported."); + "XMLPersistenceProvider Error: " + + "IReader.findAll() is not supported."); } catch (OperationNotSupportedException e) { // TODO Auto-generated catch block logger.error(getClass().getName() + " Exception!", e); From 4fa3adcdabe5f3ed09553d79597341a9391bb1bb Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Sat, 19 Nov 2016 20:53:40 -0500 Subject: [PATCH 14/74] Set the test data directory to get rid of a weird resources plugin bug. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.core/Core OSGi.launch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.core/Core OSGi.launch b/org.eclipse.ice.core/Core OSGi.launch index d65a9d073..9f68e7e49 100644 --- a/org.eclipse.ice.core/Core OSGi.launch +++ b/org.eclipse.ice.core/Core OSGi.launch @@ -17,9 +17,9 @@ - + - + From 7f3c549eb2f0c2691cf6481de34cd2a8a1f9df1d Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Sun, 20 Nov 2016 19:58:08 -0500 Subject: [PATCH 15/74] Turned the web service back on. Signed-off-by: Jay Jay Billings --- .../src/org/eclipse/ice/core/internal/Core.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java index 8c3d2d748..d4266f4f1 100644 --- a/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java +++ b/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java @@ -250,7 +250,7 @@ public void start(BundleContext context) throws CoreException { itemManager.loadItems(itemDBProject); // Start the webservice! - //startHttpService(); + startHttpService(); // Configure the remote service properties Dictionary props = new Hashtable<>(); From 6fc1e33d8623b0d5e15b7a0272d74e424c645b55 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 29 Nov 2016 11:16:28 -0500 Subject: [PATCH 16/74] VibeLauncher now performs file error checking The VibeLauncher will now open a dialog and set itself to an error state if provided an input file without SIM_NAME and SIM_DIR. This isn't enough to completely validate the file, but can catch simple errors like trying to run a non-VIBE input file. Signed-off-by: Robert Smith --- .../ice/vibe/launcher/VibeLauncher.java | 84 ++++++++++++++----- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java index 177bbe669..f4955f81b 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java @@ -19,6 +19,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ice.datastructures.ICEObject.IUpdateable; import org.eclipse.ice.datastructures.entry.DiscreteEntry; import org.eclipse.ice.datastructures.entry.IEntry; @@ -29,6 +31,10 @@ import org.eclipse.ice.io.serializable.IOService; import org.eclipse.ice.io.serializable.IReader; import org.eclipse.ice.item.jobLauncher.JobLauncher; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; /** *

@@ -113,10 +119,12 @@ protected void setupItemInfo() { @Override public void setupForm() { String copyCase = "cp -r ${installDir}vibe/examples/case6/* .;"; - String fixSIMROOT = "sed -i.bak 's?SIM_ROOT=.*?" + "SIM_ROOT='`pwd`'?g' ${inputFile};"; + String fixSIMROOT = "sed -i.bak 's?SIM_ROOT=.*?" + + "SIM_ROOT='`pwd`'?g' ${inputFile};"; // Setup the VIBE launch script - String VIBEExec = "${installDir}ipsframework-code/install/bin/ips.py" + " -a --log=temp.log --platform=" - + IPS_ROOT + "/workstation.conf --simulation=${inputFile};"; + String VIBEExec = "${installDir}ipsframework-code/install/bin/ips.py" + + " -a --log=temp.log --platform=" + IPS_ROOT + + "/workstation.conf --simulation=${inputFile};"; // Setup the command stages. An explicit forward slash is used here, so // will only work on linux for now. fullExecCMD = copyCase + fixSIMROOT + VIBEExec; @@ -137,12 +145,14 @@ public void setupForm() { entry.setValue("false"); entry.setName("Use custom key-value pair file?"); entry.setTag("MODE"); - entry.setDescription("Allows the use of a customized KV Pair file generated by ICE"); + entry.setDescription( + "Allows the use of a customized KV Pair file generated by ICE"); // Add the selector to the form && make it listen for changes DataComponent fileComponent = (DataComponent) form.getComponent(1); fileComponent.addEntry(entry); - fileComponent.retrieveEntry("Use custom key-value pair file?").register(this); + fileComponent.retrieveEntry("Use custom key-value pair file?") + .register(this); form.removeComponent(1); form.addComponent(fileComponent); update(fileComponent.retrieveEntry("Use custom key-value pair file?")); @@ -163,10 +173,11 @@ public void setupForm() { @Override public FormStatus process(String actionName) { - IReader reader = (IReader) ioService.getReader("IPS"); + IReader reader = ioService.getReader("IPS"); DataComponent fileComponent = (DataComponent) form.getComponent(1); IEntry inputFileEntry = fileComponent.retrieveEntry("Input File"); - IEntry kvPairFileEntry = fileComponent.retrieveEntry("Use custom key-value pair file?"); + IEntry kvPairFileEntry = fileComponent + .retrieveEntry("Use custom key-value pair file?"); IFile inputFile = project.getFile(inputFileEntry.getValue()); // Get the Run ID that may be used to locate the simulation files @@ -179,7 +190,8 @@ public FormStatus process(String actionName) { // Get the Case Name which may also be used to locate the simulation // files String caseName = ""; - ArrayList caseNameMatches = reader.findAll(inputFile, "SIM_NAME=.*"); + ArrayList caseNameMatches = reader.findAll(inputFile, + "SIM_NAME=.*"); if (caseNameMatches != null && !caseNameMatches.isEmpty()) { caseName = caseNameMatches.get(0).getName().split("=")[1]; } @@ -191,16 +203,41 @@ public FormStatus process(String actionName) { // Get the base path for the simulation files String dataDir = ""; - ArrayList simRootMatches = reader.findAll(inputFile, "SIM_ROOT=.*"); + ArrayList simRootMatches = reader.findAll(inputFile, + "SIM_ROOT=.*"); if (simRootMatches != null && !simRootMatches.isEmpty()) { dataDir = simRootMatches.get(0).getName().split("=")[1]; } + + // TODO Check if it is ever valid for one of these to be empty but not + // the other. Change from AND to OR if not. + // Check if a case is specified in the input file. Create an error + // dialog if not. + if (dataDir.isEmpty() && caseName.isEmpty()) { + + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override + public void run() { + ErrorDialog.openError(new Shell(Display.getDefault()), + "Error Reading VIBE Input File", + "SIM not specified in input.", + new Status(IStatus.ERROR, + "org.eclipse.ice.vibe.launcher", + "Required attributes SIM_NAME and SIM_ROOT are " + + "not specified in input file.")); + return; + } + }); + return FormStatus.InfoError; + } + if (dataDir.endsWith("/$SIM_NAME")) { dataDir = dataDir.substring(0, dataDir.length() - 10); } else if (dataDir.endsWith("${SIM_NAME}")) { dataDir = dataDir.substring(0, dataDir.length() - 12); } else if (dataDir.endsWith(caseName)) { - dataDir = dataDir.substring(0, dataDir.length() - (caseName.length() + 1)); + dataDir = dataDir.substring(0, + dataDir.length() - (caseName.length() + 1)); } // If we are supplying a new KV Pair file replace it in the input file @@ -209,7 +246,8 @@ public FormStatus process(String actionName) { String backupKVFile = ""; String mvKVPairFile = ""; if (kvPairFileEntry.getValue() != "false") { - String kvFileName = fileComponent.retrieveEntry("Key-value pair file").getValue(); + String kvFileName = fileComponent + .retrieveEntry("Key-value pair file").getValue(); // writer.replace(inputFile, "input_keyvalue", kvFileName); setKVPerms = "chmod 775 " + kvFileName + " && "; backupKVFile = "mv input/input_keyvalue input/input_keyvalue.bak && "; @@ -221,14 +259,19 @@ public FormStatus process(String actionName) { CAEBAT_ROOT = hostTable.getRow(0).get(2).getValue(); // Set up the execution command - String exportRoot = "export CAEBAT_ROOT=" + CAEBAT_ROOT + "/vibe/components && "; + String exportRoot = "export CAEBAT_ROOT=" + CAEBAT_ROOT + + "/vibe/components && "; String copyCase = "cp -r " + dataDir + "/" + caseName + "/* . && "; - String fixSIMROOT = "sed -i.bak 's?SIM_ROOT\\ *=\\ *.*?" + "SIM_ROOT\\ =\\ '`pwd`'?g' ${inputFile} && "; + String fixSIMROOT = "sed -i.bak 's?SIM_ROOT\\ *=\\ *.*?" + + "SIM_ROOT\\ =\\ '`pwd`'?g' ${inputFile} && "; // The main execution of the simulation. - String VIBEExec = "${installDir}ipsframework-code/install/bin/ips.py" + " -a --log=temp.log --platform=" - + CAEBAT_ROOT + "/vibe/examples/config/batsim.conf" + " --simulation=${inputFile}; "; - fullExecCMD = exportRoot + copyCase + setKVPerms + backupKVFile + mvKVPairFile + fixSIMROOT + VIBEExec; + String VIBEExec = "${installDir}ipsframework-code/install/bin/ips.py" + + " -a --log=temp.log --platform=" + CAEBAT_ROOT + + "/vibe/examples/config/batsim.conf" + + " --simulation=${inputFile}; "; + fullExecCMD = exportRoot + copyCase + setKVPerms + backupKVFile + + mvKVPairFile + fixSIMROOT + VIBEExec; // Setup the executable information setExecutable(getName(), getDescription(), this.fullExecCMD); @@ -246,11 +289,14 @@ public void update(IUpdateable component) { if (component instanceof IEntry) { // Determine whether the file selector needs to be added to or // removed from the form - if (component.getName() == "Use custom key-value pair file?" && ((IEntry) component).getValue() == "true") { - addInputType("Key-value pair file", "keyValueFile", "Key-value pair with case parameters", ".dat"); + if (component.getName() == "Use custom key-value pair file?" + && ((IEntry) component).getValue() == "true") { + addInputType("Key-value pair file", "keyValueFile", + "Key-value pair with case parameters", ".dat"); } else if (component.getName() == "Use custom key-value pair file?" && ((IEntry) component).getValue() == "false") { - DataComponent fileComponent = (DataComponent) form.getComponent(1); + DataComponent fileComponent = (DataComponent) form + .getComponent(1); fileComponent.deleteEntry("Key-value pair file"); } } From 427cb7db96664f7cabd94ca937c9d17862874954 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 29 Nov 2016 11:52:36 -0500 Subject: [PATCH 17/74] Fixing VIBE manifest file Committing the edited version of the o.e.i.vibe manifest file which was accidentally left out of the last commit. Signed-off-by: Robert Smith --- org.eclipse.ice.vibe/META-INF/MANIFEST.MF | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.ice.vibe/META-INF/MANIFEST.MF b/org.eclipse.ice.vibe/META-INF/MANIFEST.MF index bac9d9279..b0b08f224 100644 --- a/org.eclipse.ice.vibe/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.vibe/META-INF/MANIFEST.MF @@ -5,6 +5,9 @@ Bundle-SymbolicName: org.eclipse.ice.vibe;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.ice.io.serializable, + org.eclipse.jface.dialogs, + org.eclipse.swt.widgets, + org.eclipse.ui, org.osgi.framework;version="1.3.0", org.slf4j;version="1.7.2" Bundle-ActivationPolicy: lazy From 8033cd128fc3effdeca4b66aed84b039aee34ee3 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 29 Nov 2016 14:59:29 -0500 Subject: [PATCH 18/74] Fixed RemoteAction bug for using old connections Fixed a bug where RemoteAction was trying to find pre-existing connections by looking up the address for the current connection's name instead of its hostname. It now simply compares the two connections' names. This allows a user to, for example, configure two different connections to the same machine but which use different ports. Signed-off-by: Robert Smith --- .../eclipse/ice/item/action/RemoteAction.java | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java index 396f49465..e4cc4622a 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java @@ -1,11 +1,8 @@ package org.eclipse.ice.item.action; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.List; import org.eclipse.remote.core.IRemoteConnection; -import org.eclipse.remote.core.IRemoteConnectionHostService; import org.eclipse.remote.core.IRemoteConnectionType; import org.eclipse.remote.core.IRemoteServicesManager; import org.eclipse.remote.core.exception.RemoteConnectionException; @@ -82,26 +79,27 @@ protected IRemoteConnection getRemoteConnection(String host) { } if (connectionType != null) { - try { - // Loop over existing connections to see if the user already - // specified - // a connection to the provided host - for (IRemoteConnection c : connectionType - .getConnections()) { - String connectionHost = c - .getService(IRemoteConnectionHostService.class) - .getHostname(); - if (InetAddress.getByName(host).getHostAddress() - .equals(InetAddress.getByName(connectionHost) - .getHostAddress())) { - connection = c; - - // Found it, return the connection - return connection; - } + + // Loop over existing connections to see if the user already + // specified + // a connection to the provided host + for (IRemoteConnection c : connectionType.getConnections()) { + // String connectionHost = c + // .getService(IRemoteConnectionHostService.class) + // .getHostname(); + // + // String a = InetAddress.getByName(host).getHostAddress(); + // String b = InetAddress.getByName(connectionHost) + // .getHostAddress(); + // + // c.getName() + + if (host.equals(c.getName())) { + connection = c; + + // Found it, return the connection + return connection; } - } catch (UnknownHostException e) { - logger.error(getClass().getName() + " Exception!", e); } // If no connection found, let's ask the user to define it. From ec2e3d3640626d3cc9a6bcbf7b21f9c921ade403 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 30 Nov 2016 09:52:24 -0500 Subject: [PATCH 19/74] Removed old commented code Removed some old code as well as some debug code that had been commented out but accidentally left in the file before being committed. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/item/action/RemoteAction.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java index e4cc4622a..dd7dbd032 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java @@ -84,16 +84,6 @@ protected IRemoteConnection getRemoteConnection(String host) { // specified // a connection to the provided host for (IRemoteConnection c : connectionType.getConnections()) { - // String connectionHost = c - // .getService(IRemoteConnectionHostService.class) - // .getHostname(); - // - // String a = InetAddress.getByName(host).getHostAddress(); - // String b = InetAddress.getByName(connectionHost) - // .getHostAddress(); - // - // c.getName() - if (host.equals(c.getName())) { connection = c; From 84ca59ee87938a62644fad330327d2452cfeec59 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 30 Nov 2016 09:59:33 -0500 Subject: [PATCH 20/74] Fixing RemoteAction bug Moving a bugfix for #295 from the 2.2.2 branch to 2.2.1. Signed-off-by: Robert Smith --- .../eclipse/ice/item/action/RemoteAction.java | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java index 396f49465..8b38f1bfc 100644 --- a/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java +++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java @@ -1,11 +1,8 @@ package org.eclipse.ice.item.action; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.List; import org.eclipse.remote.core.IRemoteConnection; -import org.eclipse.remote.core.IRemoteConnectionHostService; import org.eclipse.remote.core.IRemoteConnectionType; import org.eclipse.remote.core.IRemoteServicesManager; import org.eclipse.remote.core.exception.RemoteConnectionException; @@ -82,26 +79,17 @@ protected IRemoteConnection getRemoteConnection(String host) { } if (connectionType != null) { - try { - // Loop over existing connections to see if the user already - // specified - // a connection to the provided host - for (IRemoteConnection c : connectionType - .getConnections()) { - String connectionHost = c - .getService(IRemoteConnectionHostService.class) - .getHostname(); - if (InetAddress.getByName(host).getHostAddress() - .equals(InetAddress.getByName(connectionHost) - .getHostAddress())) { - connection = c; - - // Found it, return the connection - return connection; - } + + // Loop over existing connections to see if the user already + // specified + // a connection to the provided host + for (IRemoteConnection c : connectionType.getConnections()) { + if (host.equals(c.getName())) { + connection = c; + + // Found it, return the connection + return connection; } - } catch (UnknownHostException e) { - logger.error(getClass().getName() + " Exception!", e); } // If no connection found, let's ask the user to define it. @@ -150,4 +138,4 @@ public void run() { return connection; } -} +} \ No newline at end of file From 90fdfca564e776530267c6ed8c97e38b12fa8dd0 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 30 Nov 2016 11:07:16 -0500 Subject: [PATCH 21/74] Switched to NatTable version 1.4 Switched the target to use NatTable 1.4 in response to issue #296. Signed-off-by: Robert Smith --- org.eclipse.ice.target.neon/neon.target | 344 ++++++++++++------------ 1 file changed, 172 insertions(+), 172 deletions(-) diff --git a/org.eclipse.ice.target.neon/neon.target b/org.eclipse.ice.target.neon/neon.target index 2a6afbcdb..4af92ba13 100644 --- a/org.eclipse.ice.target.neon/neon.target +++ b/org.eclipse.ice.target.neon/neon.target @@ -1,172 +1,172 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d322eefaead223ac4c33038088e85e96f2f9bc10 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 30 Nov 2016 11:39:23 -0500 Subject: [PATCH 22/74] Removed NatTable version requirements The target no longer specifies exact bundle versions for NatTable bundles. Signed-off-by: Robert Smith --- org.eclipse.ice.target.neon/neon.target | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.ice.target.neon/neon.target b/org.eclipse.ice.target.neon/neon.target index 4af92ba13..c6d1cb1dc 100644 --- a/org.eclipse.ice.target.neon/neon.target +++ b/org.eclipse.ice.target.neon/neon.target @@ -160,12 +160,12 @@ - - - - - - + + + + + + From 79df032fd8c5efcee13ceb7b4758f61f473b20bd Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Wed, 30 Nov 2016 21:06:31 -0500 Subject: [PATCH 23/74] Issue #301 - Initial try at Oxygen support --- org.eclipse.ice.aggregator/pom.xml | 2 +- org.eclipse.ice.parent/pom.xml | 6 +- .../ice.macosx_product.launch | 4 +- org.eclipse.ice.product/ice.runtime.product | 1 + org.eclipse.ice.product/ice.sdk.product | 1 + org.eclipse.ice.target.oxygen/oxygen.target | 176 ++++++++++++++++++ org.eclipse.ice.target.oxygen/pom.xml | 46 +++++ 7 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 org.eclipse.ice.target.oxygen/oxygen.target create mode 100644 org.eclipse.ice.target.oxygen/pom.xml diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml index 0708790e4..511468f41 100644 --- a/org.eclipse.ice.aggregator/pom.xml +++ b/org.eclipse.ice.aggregator/pom.xml @@ -53,7 +53,7 @@ ../org.eclipse.ice.reflectivity ../org.eclipse.ice.reflectivity.test ../org.eclipse.ice.reflectivity.ui - ../org.eclipse.ice.target.neon + ../org.eclipse.ice.target.oxygen ../org.eclipse.ice.vibe ../org.eclipse.ice.vibe.test ../org.eclipse.ice.feature diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index d4afcc1c7..27f7d54cb 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -5,7 +5,7 @@ next - 0.24.0 + 0.26.0 ${tycho-version} 1.1.3 pom.xml @@ -240,9 +240,9 @@ org.eclipse.ice - org.eclipse.ice.target.neon + org.eclipse.ice.target.oxygen 2.2.0-SNAPSHOT - neon + oxygen diff --git a/org.eclipse.ice.product/ice.macosx_product.launch b/org.eclipse.ice.product/ice.macosx_product.launch index 0fb44e212..a95cc4d5f 100644 --- a/org.eclipse.ice.product/ice.macosx_product.launch +++ b/org.eclipse.ice.product/ice.macosx_product.launch @@ -22,8 +22,8 @@ - - + + diff --git a/org.eclipse.ice.product/ice.runtime.product b/org.eclipse.ice.product/ice.runtime.product index 5ac330e2a..3e5d58289 100644 --- a/org.eclipse.ice.product/ice.runtime.product +++ b/org.eclipse.ice.product/ice.runtime.product @@ -131,6 +131,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + diff --git a/org.eclipse.ice.product/ice.sdk.product b/org.eclipse.ice.product/ice.sdk.product index 3ea96ac61..d90a74036 100644 --- a/org.eclipse.ice.product/ice.sdk.product +++ b/org.eclipse.ice.product/ice.sdk.product @@ -131,6 +131,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + diff --git a/org.eclipse.ice.target.oxygen/oxygen.target b/org.eclipse.ice.target.oxygen/oxygen.target new file mode 100644 index 000000000..a83a7546d --- /dev/null +++ b/org.eclipse.ice.target.oxygen/oxygen.target @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.target.oxygen/pom.xml b/org.eclipse.ice.target.oxygen/pom.xml new file mode 100644 index 000000000..ac7449814 --- /dev/null +++ b/org.eclipse.ice.target.oxygen/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + + org.eclipse.ice + org.eclipse.ice.build + 2.2.0-SNAPSHOT + ../org.eclipse.ice.parent/pom.xml + + + org.eclipse.ice.target.oxygen + pom + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.3 + + + + attach-artifacts + package + + attach-artifact + + + + + + oxygen.target + target + ice-oxygen + + + + + + + + + From f452abe1900710cce955ce7871e52f00c3e9f0cd Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Thu, 1 Dec 2016 13:56:16 -0500 Subject: [PATCH 24/74] Templates added to VIBE Key-Value Pair Item The VIBE Key-Value Pair Item's Form now features a section to select a template for either NTG or DualFoil problems, which will reset the table to the correct format for that problem type. Signed-off-by: Robert Smith --- org.eclipse.ice.vibe/data/DualFoil.conf | 111 +++++++ org.eclipse.ice.vibe/data/DualFoil.dat | 28 ++ org.eclipse.ice.vibe/data/NTG.conf | 106 ++++++ org.eclipse.ice.vibe/data/NTG.dat | 23 ++ .../eclipse/ice/vibe/kvPair/VibeKVPair.java | 304 ++++++++++++++++-- .../ice/vibe/kvPair/VibeKVPairRow.java | 286 ++++++++++++++++ 6 files changed, 832 insertions(+), 26 deletions(-) create mode 100644 org.eclipse.ice.vibe/data/DualFoil.conf create mode 100644 org.eclipse.ice.vibe/data/DualFoil.dat create mode 100644 org.eclipse.ice.vibe/data/NTG.conf create mode 100644 org.eclipse.ice.vibe/data/NTG.dat create mode 100644 org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java diff --git a/org.eclipse.ice.vibe/data/DualFoil.conf b/org.eclipse.ice.vibe/data/DualFoil.conf new file mode 100644 index 000000000..fb6eeac8b --- /dev/null +++ b/org.eclipse.ice.vibe/data/DualFoil.conf @@ -0,0 +1,111 @@ +BIN_DIR= $CAEBAT_ROOT/bin + +OUTPUT_PREFIX = + +SIM_NAME = case10 # Name of current simulation +SIM_ROOT =$CAEBAT_ROOT/../examples/$SIM_NAME # Where to put results from this simulation + +PLASMA_STATE_WORK_DIR = $SIM_ROOT/work/battery_state # Where to put state files as the simulation evolves + +CURRENT_STATE = cphit.cgns +PRINT_DEBUG = 0 + +RUN_COMMENT = Coupled CAEBAT Module simulation # A run comment picked up by the portal + +TAG = ElectroChemElectricalThermal # A tag that enables related runs to be retrieved together +USER = batsim # Optional, if missing the unix username is used + +NUM_CCP_ZONES = 84 +NUM_CCN_ZONES = 80 +NUM_CHARTRAN_ZONES = 136 +NUM_POUCH_ZONES = 8 +NUM_ZONES = 308 + +PLASMA_STATE_FILES = $CURRENT_STATE + +SIMULATION_MODE = NORMAL # Simulation mode + +LOG_LEVEL = WARNING +LOG_FILE = $SIM_ROOT/${SIM_NAME}.log + +[PORTS] + NAMES = INIT DRIVER CHARTRAN THERMAL + + [[DRIVER]] # REQUIRED Port section + IMPLEMENTATION = CHARTRAN_THERMAL_DRIVER + + # How is the simulation initialized + # (generate the very first state - if needed) + [[INIT]] # REQUIRED Port section (check currently + IMPLEMENTATION = INIT_STATE + + [[THERMAL]] + IMPLEMENTATION = AMPERES_THERMAL + + [[CHARTRAN]] + IMPLEMENTATION = DUALFOIL + +# Individual configuration sections + +# Component sepcification (entries similar for all components) +# NAME entry MUST match the name of the python class that implements the component +[INIT_STATE] + CLASS = DRIVERS + SUB_CLASS = + NAME = InitialState + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = + INPUT_FILES = + OUTPUT_FILES = $CURRENT_STATE + VARIABLES = 'lumped_source', 'lumped_temperature' + INIT_VALUES = '0.0', '298.0' + SCRIPT = $BIN_PATH/init_state.py + +[CHARTRAN_THERMAL_DRIVER] + CLASS = DRIVERS + SUB_CLASS = CHARTRAN_THERMAL + NAME = Driver + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = + INPUT_FILES = + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/thermal_chartran_driver_n.py + +[AMPERES_THERMAL] + CLASS = THERMAL + SUB_CLASS = + NAME = Amperes + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/input + INPUT_FILES = 'input_keyvalue', 'FarasisModule_4P.e' + OUTPUT_FILES = $CURRENT_STATE + INPUT_VAR = 'lumped_source' + OUTPUT_VAR = 'lumped_temperature' + SCRIPT = $BIN_PATH/amperes_thermal.py + + [DUALFOIL] + CLASS = CHARTRAN + SUB_CLASS = + NAME = DualFoil + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/input + INPUT_FILES = 'input_keyvalue', 'dualfoil5.in' , 'li-ion-ebar.in' + OUTPUT_FILES = 'df_caebat.out' + INPUT_VAR = 'lumped_temperature' + OUTPUT_VAR = 'lumped_source', 'lumped_resistance' + SCRIPT = $BIN_PATH/dualfoil_chartran.py + +# Time loop sepecification (two modes for now) EXPLICIT | REGULAR +# For MODE = REGULAR, the framework uses the variables START, FINISH, and NSTEP +# For MODE = EXPLICIT, the frame work uses the variable VALUES (space separated list of time values) + +[TIME_LOOP] + MODE = EXPLICIT + START = 0.0 + FINISH = 0.0 + NSTEP = 0 + VALUES = 0.0 0.4 0.8 1.2 1.6 diff --git a/org.eclipse.ice.vibe/data/DualFoil.dat b/org.eclipse.ice.vibe/data/DualFoil.dat new file mode 100644 index 000000000..ee7c95caf --- /dev/null +++ b/org.eclipse.ice.vibe/data/DualFoil.dat @@ -0,0 +1,28 @@ +ELECTRICAL=1 +XCONDUCTIVITY=3.07 +YCONDUCTIVITY=3.07 +ZCONDUCTIVITY=1.7899 +HEATCAPACITY=1100 +ICSHORT=0 +NUMBCS=2 +BCTYPE=1,1 +BCIDS=3,4 +AMBIENTTEMP=320,298 +CONVECTIVERATE=15.0,55.0 + +ICSHORT=0 +CurrentFlux=268750000.00 + +CRATE=1 +NUMSEG=5 +CURRDEN=0.0,30.0,0.0,-22.,0. +MODESEG=1,1,0,1,0 +CUTOFFL=2.0,2.0,2.0,2.0,2.0 +CUTOFFH=4.3,4.3,4.3,4.3,4.3 + + +THICKNESS=135e-6 +YPolyCoefficients =3.6433e+02,-2.0629e+03,1.1248e+04,-2.8978e+04,4.0999e+04,-3.1353e+04,9.8589e+03 +UPolyCoefficients =4.1210,-1.0206,-1.1902,8.2938,-20.6735,24.8684,-11.0442 +YPolyDegrees =6,0 +UPolyDegrees =6,0 diff --git a/org.eclipse.ice.vibe/data/NTG.conf b/org.eclipse.ice.vibe/data/NTG.conf new file mode 100644 index 000000000..cbf03a33c --- /dev/null +++ b/org.eclipse.ice.vibe/data/NTG.conf @@ -0,0 +1,106 @@ + +BIN_DIR = $CAEBAT_ROOT/bin +OUTPUT_PREFIX = +RUN_ID = prismatic_cell_20141110060439 +SIM_NAME = case6 +SIM_ROOT = $CAEBAT_ROOT/../examples/${SIM_NAME} +PLASMA_STATE_WORK_DIR = $SIM_ROOT/work/battery_state +CURRENT_STATE = cphit.cgns +RUN_COMMENT = A run comment picked up by the portal. +TAG = ElectroChemElectricalThermal +USER = +NUM_CHARTRAN_ZONES = 34 +NUM_CCP_ZONES = 19 +NUM_CCN_ZONES = 18 +NUM_ZONES = 73 +NUM_POUCH_ZONES = 2 +PLASMA_STATE_FILES = $CURRENT_STATE +SIMULATION_MODE = NORMAL +LOG_LEVEL = WARNING +LOG_FILE = $SIM_ROOT/${SIM_NAME}.log +PRINT_DEBUG = 0 + +[PORTS] + NAMES = INIT DRIVER THERMAL ELECTRICAL CHARTRAN + + [[INIT]] + IMPLEMENTATION = INIT_STATE + [[DRIVER]] + IMPLEMENTATION = CHARTRAN_ELECTRICAL_THERMAL_DRIVER + [[THERMAL]] + IMPLEMENTATION = AMPERES_THERMAL + [[ELECTRICAL]] + IMPLEMENTATION = AMPERES_ELECTRICAL + [[CHARTRAN]] + IMPLEMENTATION = NTG + +[CHARTRAN_ELECTRICAL_THERMAL_DRIVER] + CLASS = DRIVERS + SUB_CLASS = CHARTRAN_THERMAL + NAME = Driver + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/ + INPUT_FILES = + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/thermal_electrical_chartran_driver_n.py + +[AMPERES_THERMAL] + CLASS = THERMAL + SUB_CLASS = + NAME = Amperes + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/input + INPUT_FILES = 'input_keyvalue','FarasisWSingleTab.e' + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/amperes_thermal.py + INPUT_VAR = 'lumped_source' + OUTPUT_VAR = 'lumped_temperature' +[AMPERES_ELECTRICAL] + CLASS = ELECTRICAL + SUB_CLASS = + NAME = Amperes + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/input + INPUT_FILES = 'input_keyvalue','FarasisWSingleTab.e' + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/amperes_electrical.py + INPUT_VAR = 'lumped_resistance' + OUTPUT_VAR = 'lumped_source' + +[NTG] + CLASS = CHARTAN + SUB_CLASS = + NAME = NTG + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/input + INPUT_FILES = 'input_keyvalue' + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/ntg_chartran.py + INPUT_VAR = 'lumped_temperature' + OUTPUT_VAR = 'lumped_source','lumped_resistance' + +[INIT_STATE] + CLASS = DRIVERS + SUB_CLASS = + NAME = InitialState + NPROC = 1 + BIN_PATH = $CAEBAT_ROOT/bin + INPUT_DIR = $SIM_ROOT/ + INPUT_FILES = + OUTPUT_FILES = $CURRENT_STATE + SCRIPT = $BIN_PATH/init_state.py + VARIABLES = 'lumped_source', 'lumped_resistance', 'lumped_temperature' + INIT_VALUES = '0.0', '0.0', '298.' + + +[TIME_LOOP] + MODE = REGULAR + START = 0.0 + FINISH = 10.0 + NSTEP = 3 + VALUES = 0.1 0.2 0.3 0.4 0.5 0.6 1.5 3.5 6.5 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 + diff --git a/org.eclipse.ice.vibe/data/NTG.dat b/org.eclipse.ice.vibe/data/NTG.dat new file mode 100644 index 000000000..8a5923310 --- /dev/null +++ b/org.eclipse.ice.vibe/data/NTG.dat @@ -0,0 +1,23 @@ +ELECTRICAL=1 +XCONDUCTIVITY=1.7899 +YCONDUCTIVITY=1.7899 +ZCONDUCTIVITY=1.7899 +HEATCAPACITY=1100 +ICSHORT=0 +NUMBCS=6 +BCTYPE=1,1,2,2,1,1 +BCIDS=3,4,5,6,7,8 +AMBIENTTEMP=300,300,298,328,300,300 +CONVECTIVERATE=0.0,0.0,5.0,5.0,1.0,1.0 + +ICSHORT=0 +CurrentFlux=3602431. + +CRATE=5 +CURRDEN=79.26 +CUTOFF=2.8 +THICKNESS=135e-6 +YPolyCoefficients = 3.6433e+02, -2.0629e+03, 1.1248e+04, -2.8978e+04, 4.0999e+04, -3.1353e+04, 9.8589e+03 +UPolyCoefficients = 4.1210, -1.0206, -1.1902, 8.2938, -20.6735, 24.8684, -11.0442 +YPolyDegrees = 6, 0 +UPolyDegrees = 6, 0 diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index 56f67107e..a13f8c533 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -37,8 +37,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.ice.datastructures.ICEObject.Component; +import org.eclipse.ice.datastructures.ICEObject.IUpdateable; +import org.eclipse.ice.datastructures.entry.DiscreteEntry; import org.eclipse.ice.datastructures.entry.IEntry; import org.eclipse.ice.datastructures.entry.StringEntry; +import org.eclipse.ice.datastructures.form.DataComponent; import org.eclipse.ice.datastructures.form.Form; import org.eclipse.ice.datastructures.form.FormStatus; import org.eclipse.ice.datastructures.form.TableComponent; @@ -52,27 +55,51 @@ * This class is a Model Item that configures a set of data components that * represent key-value pairs for VIBE input. * - * @author Jay Jay Billings, Andrew Bennett + * @author Jay Jay Billings, Andrew Bennett, Robert Smith * */ @XmlRootElement(name = "VibeKVPair") public class VibeKVPair extends Item implements IReader, IWriter { + /** + * The index for the template component in the list of components. + */ + private static final int TEMPLATE_COMPONENT_ID = 0; + /** * Keep track of everything that we can do with the KV Pair Item */ private ArrayList actionItems; + /** + * The name of the default template to load. + */ + private static String defaultTemplate = "NTG"; + /** * The tag that indicates this file should be exported to kv pairs. */ private String customTaggedExportString = "Export to key-value pair output"; + /** + * The component for the table of editable key value pairs. + */ + TableComponent kvTable; + + /** + * The name of the last template used to initialize the table component. + */ + private String templateName; + /** * The nullary constructor. */ public VibeKVPair() { this(null); + + // Initialize the template name + templateName = defaultTemplate; + return; } @@ -85,9 +112,60 @@ public VibeKVPair() { public VibeKVPair(IProject projectSpace) { // Punt to the base class. super(projectSpace); + + // Initialize the template name + templateName = defaultTemplate; return; } + /** + * This operation returns a data component that contains the list of + * reafiles that may be selected by a user from the Nek5000_Model_Builder + * directory. This component will be empty if there are no files and contain + * an Entry that says "No problems available." + * + * @param files + * The set of Nek reafiles available to be loaded + * @return the data component + */ + private DataComponent createSelectorComponent() { + + // Local Declaration + DataComponent caseComp = new DataComponent(); + + // The list of available templates + ArrayList templateNames = new ArrayList(); + templateNames.add("NTG"); + templateNames.add("DualFoil"); + + // Setup the data component + caseComp.setName("Problem Type Templates"); + caseComp.setDescription("The following is a list of VIBE Key-Value " + + "Pair input type templates for editing."); + caseComp.setId(0); + + // Create an Entry for the template names + DiscreteEntry templatesEntry = new DiscreteEntry(); + templatesEntry.setAllowedValues(templateNames); + templatesEntry.setDefaultValue(defaultTemplate); + templatesEntry.setValue(defaultTemplate); + + // Setup the file Entry's descriptive information + templatesEntry.setName("Available Templates"); + templatesEntry.setDescription("A list of the templates available " + + "for populating the VIBE Key-Value Pair table component"); + templatesEntry.setId(1); + + // Add the Entry to the Component + caseComp.addEntry(templatesEntry); + + // Register this Item as a listener of templatesEntry + templatesEntry.register(this); + + return caseComp; + + } + /** * This operation overrides the base class' operation to create a Form with * Entries that will be used to generate the VIBEkey-value pair file. It has @@ -98,10 +176,13 @@ public void setupForm() { // Create the form form = new Form(); + // Add the template selector component + form.addComponent(createSelectorComponent()); + // If loading from the new item button we should just // load up the default case 6 file by passing in null if (project != null) { - loadDefault(); + loadDefault(defaultTemplate); } } @@ -153,6 +234,12 @@ protected FormStatus reviewEntries(Form preparedForm) { + "Could not find any data to write out"); retStatus = FormStatus.InfoError; } + + // Get the selection from the template component + DataComponent templateComp = (DataComponent) components + .get(TEMPLATE_COMPONENT_ID); + String template = templateComp.retrieveAllEntries().get(0).getValue(); + return retStatus; } @@ -203,7 +290,7 @@ public FormStatus process(String actionName) { // Complain System.err.println("VibeKVPair Generator Message: " + "Failed to refresh the project space."); - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); } // return a success retStatus = FormStatus.Processed; @@ -233,7 +320,8 @@ public FormStatus process(String actionName) { @Override public void loadInput(String name) { IFile inputFile = inputFile = project.getFile(name); - logger.info("VibeKVPair Message: Loading" + inputFile.getFullPath().toOSString()); + logger.info("VibeKVPair Message: Loading" + + inputFile.getFullPath().toOSString()); form = read(inputFile); form.setName(getName()); form.setDescription(getDescription()); @@ -244,8 +332,12 @@ public void loadInput(String name) { /** * Loads a default dataset that's embedded in the plugin + * + * @param caseName + * The name of the file containing the default case that will be + * used to populate the table */ - public void loadDefault() { + public void loadDefault(String caseName) { IFile inputFile = null; File temp = null; try { @@ -254,13 +346,13 @@ public void loadDefault() { // Create a filepath for the default file if (project != null) { defaultFilePath = project.getLocation().toOSString() - + System.getProperty("file.separator") - + "case_6.dat"; + + System.getProperty("file.separator") + caseName + + ".dat"; } else { defaultFilePath = ResourcesPlugin.getWorkspace().getRoot() .getLocation().toOSString() - + System.getProperty("file.separator") - + "case_6.dat"; + + System.getProperty("file.separator") + caseName + + ".dat"; } // Create a temporary location to load the default file @@ -270,8 +362,8 @@ public void loadDefault() { } // Pull the default file from inside the plugin - URI uri = new URI( - "platform:/plugin/org.eclipse.ice.vibe/data/case_6.dat"); + URI uri = new URI("platform:/plugin/org.eclipse.ice.vibe/data/" + + caseName + ".dat"); InputStream reader = uri.toURL().openStream(); FileOutputStream outStream = new FileOutputStream(temp); @@ -283,13 +375,15 @@ public void loadDefault() { } outStream.close(); if (project != null) { - inputFile = project.getFile("case_6.dat"); + inputFile = project.getFile(caseName + ".dat"); project.refreshLocal(IResource.DEPTH_INFINITE, null); } else { inputFile = ResourcesPlugin.getWorkspace().getRoot() .getFile(new Path(defaultFilePath)); } - logger.info("VibeKVPair Message: Loading" + inputFile.getFullPath().toOSString()); + logger.info("VibeKVPair Message: Loading" + + inputFile.getFullPath().toOSString()); + form = read(inputFile); form.setName(getName()); form.setDescription(getDescription()); @@ -310,10 +404,10 @@ public void loadDefault() { + " Vibe case data!"); } catch (CoreException e) { // TODO Auto-generated catch block - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); } } - + /** * Reads in the KV Pair file to a form. * @@ -328,14 +422,18 @@ public Form read(IFile ifile) { if (ifile == null) { return null; } - Form form = new Form(); + + // Initialize the form if it does not exist + if (form == null) { + form = new Form(); + } // Read in the ini file to an ArrayList ArrayList lines = new ArrayList(); BufferedReader reader = null; try { - reader = new BufferedReader(new InputStreamReader( - ifile.getContents())); + reader = new BufferedReader( + new InputStreamReader(ifile.getContents())); // Read the FileInputStream and append to a StringBuffer StringBuffer buffer = new StringBuffer(); @@ -358,8 +456,8 @@ public Form read(IFile ifile) { + "Error! Could not find file for loading."); return null; } catch (IOException e) { - logger.error("VibeKVPair Message: " - + "Error! Trouble reading file."); + logger.error( + "VibeKVPair Message: " + "Error! Trouble reading file."); return null; } catch (CoreException e) { logger.error("VibeKVPair Message: " @@ -367,8 +465,14 @@ public Form read(IFile ifile) { return null; } - // - TableComponent kvTable = new TableComponent(); + // Create the table if it doesn't exist or empty it if it does + if (kvTable == null) { + kvTable = new TableComponent(); + } else { + for (int i : kvTable.getRowIds()) { + kvTable.deleteRow(0); + } + } ArrayList row; ArrayList kvEntries = new ArrayList(); IEntry key = new StringEntry(); @@ -379,16 +483,145 @@ public Form read(IFile ifile) { kvEntries.add(value); kvTable.setRowTemplate(kvEntries); + // The list of keys whose rows will be dependent on another row + ArrayList dependentKeys = new ArrayList(); + dependentKeys.add("MODESEG"); + dependentKeys.add("CUTOFFL"); + dependentKeys.add("CUTOFFH"); + + // The list of rows dependent on another row + ArrayList dependentRows = new ArrayList(); + + // The row for the NUMSEG key + VibeKVPairRow numsegRow = null; + for (String line : lines) { if (line.contains("=")) { String[] keyValue = line.split("="); int rowID = kvTable.addRow(); row = kvTable.getRow(rowID); - row.get(0).setValue(keyValue[0]); - row.get(1).setValue(keyValue[1]); + + // The new row under construction + VibeKVPairRow entryRow = null; + + // For most keys, create a standard row + if (!dependentKeys.contains(keyValue[0])) { + + entryRow = new VibeKVPairRow((StringEntry) row.get(0), + (StringEntry) row.get(1)); + + if ("NUMSEG".equals(keyValue[0])) { + numsegRow = entryRow; + + // The prescence of NUMSEG means that this is a DualFoil + // problem. We must set the template name appropriately, + // in case this function was invoked by importing a + // key-value file directly. + templateName = "DualFoil"; + ((DataComponent) form + .getComponent(TEMPLATE_COMPONENT_ID)) + .retrieveAllEntries().get(0) + .setValue("DualFoil"); + } + } + + else { + + // TODO If we ever want to create more complex relationships + // between rows, change this to handle things more + // generically + // For keys whose lengths depend on numseg, add a listener + entryRow = new VibeKVPairRow((StringEntry) row.get(0), + (StringEntry) row.get(1)) { + @Override + public void update(IUpdateable component) { + + // This row won't need to send updates of its own, + // so ignore the value entry + if (component == getValue()) { + return; + } + + // Cast the component + VibeKVPairRow source = (VibeKVPairRow) component; + + // The string that will be written to this row's + // value + String valueString = getValue().getValue(); + + // Calculate the size of the vector + int vectorSize = valueString.length() + - valueString.replace(",", "").length() + 1; + + // Get the new value of the numseg key + int numseg = Integer + .valueOf(source.getValue().getValue()); + + // If numseg is an invalid value, ignore the change + if (numseg <= 0) { + return; + } + + // If numseg has been reduced, shorten the value + // vector + if (numseg < vectorSize) { + + // The amount of numbers to be removed + int numRemove = vectorSize - numseg; + + // Remove the last number in the vector, + // numRemove times + for (int i = 0; i < numRemove; i++) { + valueString = valueString.substring(0, + valueString.lastIndexOf(',')); + } + + getValue().setValue(valueString); + + } + + // If numseg has been increased, lengthen the value + // vector + else if (numseg > vectorSize) { + + // The number of additional values to add + int numAdd = numseg - vectorSize; + + // The default value to pad the vector with + String pad = null; + + // MODESEG is a vector of integers, all others + // are vectors of doubles + if (!getKey().getValue().equals("MODESEG")) { + pad = ",0.0"; + } else { + pad = ",0"; + } + + // Pad the vector out with the default value + for (int i = 0; i < numAdd; i++) { + valueString += pad; + } + + getValue().setValue(valueString); + } + } + }; + + // Add this row to the list + dependentRows.add(entryRow); + } + + entryRow.getKey().setValue(keyValue[0]); + entryRow.getValue().setValue(keyValue[1]); } } + // Register each dependent row as a listener to the NUMSEG row + for (VibeKVPairRow dependentRow : dependentRows) { + numsegRow.register(dependentRow); + } + form.addComponent(kvTable); // Return the form return form; @@ -413,7 +646,8 @@ public void write(Form formToWrite, IFile ifile) { // Make sure that the form had data that looks correct, and the output // file exists - if (components != null && components.size() > 0 && outputFile.isFile()) { + if (components != null && components.size() > 0 + && outputFile.isFile()) { try { // Get an output stream to the file PipedInputStream in = new PipedInputStream(8196); @@ -454,7 +688,7 @@ public void write(Form formToWrite, IFile ifile) { + outputFile.getAbsolutePath() + "."); } catch (CoreException e) { // TODO Auto-generated catch block - logger.error(getClass().getName() + " Exception!",e); + logger.error(getClass().getName() + " Exception!", e); } } @@ -487,4 +721,22 @@ public String getReaderType() { return "VibeKVPairItem"; } + @Override + public void update(IUpdateable updateable) { + + if (updateable instanceof DiscreteEntry) { + DiscreteEntry e = (DiscreteEntry) updateable; + + // Get the user selected template + String template = e.getValue(); + + // If the template was changed from the last loaded template, load + // the + // newly selected template + if (!templateName.equals(template)) { + loadDefault(template); + templateName = template; + } + } + } } diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java new file mode 100644 index 000000000..a0fa4ae12 --- /dev/null +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java @@ -0,0 +1,286 @@ +/******************************************************************************* + * Copyright (c) 2016 UT-Battelle, LLC. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Robert Smith + *******************************************************************************/ +package org.eclipse.ice.vibe.kvPair; + +import java.util.ArrayList; + +import org.eclipse.ice.datastructures.ICEObject.IUpdateable; +import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener; +import org.eclipse.ice.datastructures.entry.StringEntry; + +/** + * This class represents one of the rows of the TableComponent comprising the + * majority of the VIBE Key-Value Pair Item. Each VibeKVPairRow consists of two + * StringEntries, one each for the key and the value. The VibeKVPairRow is + * responsible for listening to other rows and updating its own value to keep it + * valid, according to the values of other rows on which its value depends. + * + * @author Robert Smith + * + */ +public class VibeKVPairRow implements IUpdateable, IUpdateableListener { + + // The Identifiable context + private String context; + + // The Identifiable description + private String description; + + // The Identifiable ID + private int ID; + + // The Entry containing the key's name + private StringEntry key; + + private ArrayList listeners; + + // The Identifiable name + private String name; + + // The Entry containing the value associated with key + private StringEntry value; + + /** + * The nullary constructor. + */ + private VibeKVPairRow() { + + // Initialize the Identifiable information + context = ""; + description = ""; + ID = 0; + name = ""; + + // Initialize the listener list + listeners = new ArrayList(); + } + + /** + * The default constructor. + * + * @param key + * The entry for the row's key. + * @param value + * The entry for the row's value. + */ + public VibeKVPairRow(StringEntry key, StringEntry value) { + + // Initialize the class with the nullary constructor + this(); + + // Set the data members + this.key = key; + this.value = value; + + // Listen to changes in the value + value.register(this); + + } + + /** + * Getter method for the key. + * + * @return The row's entry for the key + */ + public StringEntry getKey() { + return key; + } + + /** + * Getter method for the value. + * + * @return The row's entry for the value + */ + public StringEntry getValue() { + return value; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.datastructures.ICEObject.Identifiable#setId(int) + */ + @Override + public void setId(int id) { + ID = id; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.Identifiable#getDescription() + */ + @Override + public String getDescription() { + return description; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.datastructures.ICEObject.Identifiable#getId() + */ + @Override + public int getId() { + return 0; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.Identifiable#setName(java.lang. + * String) + */ + @Override + public void setName(String name) { + this.name = name; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.datastructures.ICEObject.Identifiable#getName() + */ + @Override + public String getName() { + return name; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.Identifiable#setDescription(java + * .lang.String) + */ + @Override + public void setDescription(String description) { + this.description = description; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.datastructures.ICEObject.Identifiable#getContext() + */ + @Override + public String getContext() { + return context; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.Identifiable#setContext(java. + * lang.String) + */ + @Override + public void setContext(String context) { + this.context = context; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.IUpdateableListener#update(org. + * eclipse.ice.datastructures.ICEObject.IUpdateable) + */ + @Override + public void update(IUpdateable component) { + + // Notify own listeners of a change in the value + update(null, null); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.IUpdateable#update(java.lang. + * String, java.lang.String) + */ + @Override + public void update(String updatedKey, String newValue) { + + // Iterate through the listeners, updating each + for (IUpdateableListener listener : listeners) { + listener.update(this); + } + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.IUpdateable#register(org.eclipse + * .ice.datastructures.ICEObject.IUpdateableListener) + */ + @Override + public void register(IUpdateableListener listener) { + listeners.add(listener); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.datastructures.ICEObject.IUpdateable#unregister(org. + * eclipse.ice.datastructures.ICEObject.IUpdateableListener) + */ + @Override + public void unregister(IUpdateableListener listener) { + listeners.remove(listener); + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#clone() + */ + @Override + public Object clone() { + + // Make a new row and copy this object's data into it + VibeKVPairRow clone = new VibeKVPairRow(); + clone.copy(this); + return clone; + } + + /** + * Make the receiver into a copy of the given object. + * + * @param source + */ + public void copy(Object source) { + + // If the source is not a VibeKVPairRow, fail silently + if (source instanceof VibeKVPairRow) { + + // Cast the source object + VibeKVPairRow castSource = (VibeKVPairRow) source; + + // Copy the key and value + key = (StringEntry) castSource.key.clone(); + value = (StringEntry) castSource.value.clone(); + + // Copy the other data members + context = castSource.context; + description = castSource.description; + ID = castSource.ID; + key = castSource.key; + name = castSource.name; + } + } + +} From e279aa4e0f3cec6292b54fd3835dcc94f4cc829b Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Thu, 1 Dec 2016 14:21:35 -0500 Subject: [PATCH 25/74] Fixed VibePKPairRowTestester Updated a test to look for the appropriate number of components after the object had been updated. Signed-off-by: Robert Smith --- .../vibe/kvPair/test/VibeKVPairTester.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java index 3b1f0b036..9dba21f28 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java @@ -49,7 +49,7 @@ public class VibeKVPairTester { /** *

- * This operation sets up the workspace. + * This operation sets up the workspace. *

*/ @BeforeClass @@ -70,7 +70,7 @@ public static void beforeTests() { IPath projectPath = new Path(userDir + separator + ".project"); // Create the project description IProjectDescription desc = ResourcesPlugin.getWorkspace() - .loadProjectDescription(projectPath); + .loadProjectDescription(projectPath); // Get the project handle and create it project = workspaceRoot.getProject(desc.getName()); // Create the project if it doesn't exist @@ -79,7 +79,7 @@ public static void beforeTests() { } // Open the project if it is not already open if (project.exists() && !project.isOpen()) { - project.open(new NullProgressMonitor()); + project.open(new NullProgressMonitor()); } // Refresh the workspace project.refreshLocal(IResource.DEPTH_INFINITE, null); @@ -94,12 +94,10 @@ public static void beforeTests() { return; } - - - + /** - * Test the constructor and make sure that all of the information is - * entered in correctly. + * Test the constructor and make sure that all of the information is entered + * in correctly. */ @Test public void checkConstruction() { @@ -109,7 +107,8 @@ public void checkConstruction() { // check to see if the form exists, and the item is setup correctly. assertEquals("VIBE Key-Value Pair", vibeKVPair.getName()); - assertEquals("Generate input files for VIBE.",vibeKVPair.getDescription()); + assertEquals("Generate input files for VIBE.", + vibeKVPair.getDescription()); // Try with project not as null IProject project = projectSpace; @@ -117,7 +116,8 @@ public void checkConstruction() { // check to see if the form exists, and the item is setup correctly. assertEquals("VIBE Key-Value Pair", vibeKVPair.getName()); - assertEquals("Generate input files for VIBE.", vibeKVPair.getDescription()); + assertEquals("Generate input files for VIBE.", + vibeKVPair.getDescription()); } /** @@ -134,11 +134,12 @@ public void checkSetupForm() { // Check values stored on the form // Check to see if executable exists assertEquals("VIBE Key-Value Pair", vibeKVPair.getName()); - assertEquals("Generate input files for VIBE.", vibeKVPair.getDescription()); + assertEquals("Generate input files for VIBE.", + vibeKVPair.getDescription()); } - + /** - * Try processing the form with both valid and invalid + * Try processing the form with both valid and invalid */ @Test public void checkProcessing() { @@ -151,7 +152,7 @@ public void checkProcessing() { // Check default contents form = vibeKVPair.getForm(); assertNotNull(form.getComponents()); - assertEquals(1, form.getComponents().size()); + assertEquals(2, form.getComponents().size()); // Since there are entries and DataComponents, lets run the test! // Now try to pass it the wrong information into the process @@ -163,11 +164,14 @@ public void checkProcessing() { vibeKVPair.process("Export to key-value pair output")); form = vibeKVPair.getForm(); assertNotNull(form.getComponents()); - assertEquals(1, form.getComponents().size()); - assertTrue(projectSpace.getFile( - "VIBE_Key-Value_Pair_" + vibeKVPair.getId() + ".dat").exists()); + assertEquals(2, form.getComponents().size()); + assertTrue(projectSpace + .getFile("VIBE_Key-Value_Pair_" + vibeKVPair.getId() + ".dat") + .exists()); try { - projectSpace.getFile("VIBE_Key-Value_Pair_" + vibeKVPair.getId() + ".dat").delete(true, true, null); + projectSpace.getFile( + "VIBE_Key-Value_Pair_" + vibeKVPair.getId() + ".dat") + .delete(true, true, null); } catch (CoreException e) { e.printStackTrace(); fail("Could not delete test output file."); From bfd4844481494bfe6a21691c0d2ef1b91394567c Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 2 Dec 2016 13:52:36 -0500 Subject: [PATCH 26/74] Fixed VIBE Key-Value pair table Fixed a bug where importing an Item to the VIBE Key-Value pair would cause the table in the Form to be displayed twice Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index a13f8c533..286e0fe22 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -622,7 +622,10 @@ else if (numseg > vectorSize) { numsegRow.register(dependentRow); } - form.addComponent(kvTable); + //Add the table to the form if it isn't already there + if(form.getComponents().size() < 2){ + form.addComponent(kvTable); + } // Return the form return form; } From 8ae7ae53c79341b1d19618781a79eff0a707be22 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 2 Dec 2016 16:34:08 -0500 Subject: [PATCH 27/74] VIVE Key-Value Pair Item no longer locks files Fixed a bug in the VIBE Key-Value Pair Item where the reader for imported files was not being closed, which prevented all other processes, including ICE itself, from editing the file. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index 286e0fe22..f3b4e2139 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -323,7 +323,6 @@ public void loadInput(String name) { logger.info("VibeKVPair Message: Loading" + inputFile.getFullPath().toOSString()); form = read(inputFile); - form.setName(getName()); form.setDescription(getDescription()); form.setId(getId()); form.setItemID(getId()); @@ -434,7 +433,7 @@ public Form read(IFile ifile) { try { reader = new BufferedReader( new InputStreamReader(ifile.getContents())); - + // Read the FileInputStream and append to a StringBuffer StringBuffer buffer = new StringBuffer(); int fileByte; @@ -451,6 +450,10 @@ public Form read(IFile ifile) { // Add a dummy EOF line so that the last line of the file is // read in correctly lines.add("EOF"); + + //Close the reader + reader.close(); + } catch (FileNotFoundException e) { logger.error("VibeKVPair Message: " + "Error! Could not find file for loading."); From 81508d618992c45737b0e6b5a8867fc0221f2c3b Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 2 Dec 2016 16:44:30 -0500 Subject: [PATCH 28/74] Restoring accidentally removed line Accidentally deleted a line setting the form's name in the VibeKVPair class with the last commit. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index f3b4e2139..8a981decb 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -323,6 +323,7 @@ public void loadInput(String name) { logger.info("VibeKVPair Message: Loading" + inputFile.getFullPath().toOSString()); form = read(inputFile); + form.setName(getName()); form.setDescription(getDescription()); form.setId(getId()); form.setItemID(getId()); From 04501811872e4e43f940fcfc78bc8dba3e2d9008 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Wed, 7 Dec 2016 10:32:09 -0500 Subject: [PATCH 29/74] Issue #308 - remove unused dependency --- org.eclipse.ice.item/META-INF/MANIFEST.MF | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.ice.item/META-INF/MANIFEST.MF b/org.eclipse.ice.item/META-INF/MANIFEST.MF index 4b995e1a4..c08371aba 100644 --- a/org.eclipse.ice.item/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.item/META-INF/MANIFEST.MF @@ -29,7 +29,6 @@ Import-Package: com.google.common.collect;version="10.0.1", org.eclipse.jface.images, org.eclipse.remote.core, org.eclipse.remote.core.exception, - org.eclipse.remote.internal.jsch.core, org.eclipse.remote.ui, org.eclipse.remote.ui.widgets, org.eclipse.swt.widgets, From 07dd9cc64287cb46a5da7af80095d9de5145d599 Mon Sep 17 00:00:00 2001 From: "Hilda B. Klasky" Date: Thu, 8 Dec 2016 09:42:56 -0500 Subject: [PATCH 30/74] Fixed Bug #298: ICE XSEDE Tutorial, section 1.2.2 provide the location and the name of the executable file... Signed-off-by: Hilda B. Klasky --- docs/installation/src/content.tex | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/installation/src/content.tex b/docs/installation/src/content.tex index 55a8fb4ff..7834cbb0b 100644 --- a/docs/installation/src/content.tex +++ b/docs/installation/src/content.tex @@ -22,9 +22,7 @@ \subsection{ICE Installation} \end{enumerate} \subsection{Starting ICE for the first time} -To start ICE, double-click on the application executable to open up ICE. When the workspace chooser -dialog opens, select the default workspace by clicking on the \texttt{OK} -button. +To start ICE, double-click on the application executable, i.e. \textit{ICE_SDK} file, which is located in the \textit{ice.sdk.product*} directory created by opening the zip file referenced in the previous section. The latter operation will open up ICE. When the workspace chooser dialog opens, select the default workspace by clicking on the \texttt{OK} button. You can enter your own directory for the workspace location, but please make sure that it is writable and readable by you, and you remember where it is. \begin{center} \includegraphics[width=\textwidth]{figures/workspace} \end{center} From d00b674d5c3c33defca6f4c0d166b0e7dd72420c Mon Sep 17 00:00:00 2001 From: "Hilda B. Klasky" Date: Thu, 8 Dec 2016 09:44:12 -0500 Subject: [PATCH 31/74] Fixed bug #299: ICE XSEDE Tutorial, section 4.4.1 typo: duplicated word 'the' Signed-off-by: Hilda B. Klasky --- docs/visualization/src/content.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/visualization/src/content.tex b/docs/visualization/src/content.tex index 2d8f44e8b..45e4697fd 100644 --- a/docs/visualization/src/content.tex +++ b/docs/visualization/src/content.tex @@ -138,7 +138,7 @@ \subsection{Opening a Plot Editor} To open a Plot Editor, a file that uses this editor must first be placed in the Project Explorer. This view lists files imported into ICE. To access the Project -Explorer, use the the menu bar at the top of the window and navigate to Window +Explorer, use the menu bar at the top of the window and navigate to Window $\rightarrow$ Show View $\rightarrow$ Project Explorer. Depending on the active Eclipse perspective, opening this view may require selecting Other\ldots and finding the Project Explorer in the dialog under the General category in the From 1fa88b01be1e73b631eb0e1213d525ffd0a23701 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 8 Dec 2016 14:47:49 -0500 Subject: [PATCH 32/74] Demonstrate using extensions to build Developer menu --- org.eclipse.ice.client.rcp/plugin.xml | 17 ++ .../META-INF/MANIFEST.MF | 3 +- org.eclipse.ice.developer.moose/plugin.xml | 75 ++++-- org.eclipse.ice.developer/plugin.xml | 230 +++++++++++++----- 4 files changed, 250 insertions(+), 75 deletions(-) diff --git a/org.eclipse.ice.client.rcp/plugin.xml b/org.eclipse.ice.client.rcp/plugin.xml index 6549f5762..aa792ff90 100644 --- a/org.eclipse.ice.client.rcp/plugin.xml +++ b/org.eclipse.ice.client.rcp/plugin.xml @@ -99,4 +99,21 @@ + + + + + + + + diff --git a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF index 58bfa37ae..c55ea6a10 100644 --- a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF @@ -34,4 +34,5 @@ Require-Bundle: org.eclipse.cdt;bundle-version="8.7.0", org.eclipse.core.runtime;bundle-version="3.11.0", org.eclipse.core.resources;bundle-version="3.10.0", org.eclipse.egit;bundle-version="4.0.0", - org.eclipse.ice.developer + org.eclipse.ice.developer, + org.eclipse.ui diff --git a/org.eclipse.ice.developer.moose/plugin.xml b/org.eclipse.ice.developer.moose/plugin.xml index e1399507d..190d59ebd 100644 --- a/org.eclipse.ice.developer.moose/plugin.xml +++ b/org.eclipse.ice.developer.moose/plugin.xml @@ -2,23 +2,64 @@ - - - - - - + point="org.eclipse.ui.menus"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.developer/plugin.xml b/org.eclipse.ice.developer/plugin.xml index abf3d7395..2342a4ed4 100644 --- a/org.eclipse.ice.developer/plugin.xml +++ b/org.eclipse.ice.developer/plugin.xml @@ -4,7 +4,7 @@ - @@ -13,67 +13,183 @@ class="org.eclipse.ice.developer.menu.ICEExtensionContributionFactory" locationURI="menu:org.eclipse.ui.main.menu"> - + - - - - - - - - - - + point="org.eclipse.ui.menus"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + point="org.eclipse.ui.commands"> + + + + + + + + + + + + + + + + + + + + + + - - - - + point="org.eclipse.ui.handlers"> + + + + + + + + + + From 67cfb2377f87f8b8ec8ce06522fd8be88bfa65a5 Mon Sep 17 00:00:00 2001 From: amccaskey Date: Thu, 8 Dec 2016 15:18:51 -0500 Subject: [PATCH 33/74] Removing *.mylyn.* features from ice_sdk.product to fix (#310) Signed-off-by: amccaskey --- org.eclipse.ice.product/ice.sdk.product | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/org.eclipse.ice.product/ice.sdk.product b/org.eclipse.ice.product/ice.sdk.product index d90a74036..3602c0685 100644 --- a/org.eclipse.ice.product/ice.sdk.product +++ b/org.eclipse.ice.product/ice.sdk.product @@ -3,6 +3,7 @@ + @@ -37,6 +38,7 @@ + @@ -163,14 +165,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - - - - - - - From ba14c5851d213c5e10c18ec7dccd3337cd1279fa Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 8 Dec 2016 20:35:43 -0500 Subject: [PATCH 34/74] Issue #259 - remove Jython from build to avoid IP issue; still need to fix dev menu to allow easy installation. --- org.eclipse.ice.product/ice.runtime.product | 2 -- org.eclipse.ice.product/ice.sdk.product | 2 -- org.eclipse.ice.target.neon/neon.target | 8 +------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/org.eclipse.ice.product/ice.runtime.product b/org.eclipse.ice.product/ice.runtime.product index 5ac330e2a..5c70af6fb 100644 --- a/org.eclipse.ice.product/ice.runtime.product +++ b/org.eclipse.ice.product/ice.runtime.product @@ -123,11 +123,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - diff --git a/org.eclipse.ice.product/ice.sdk.product b/org.eclipse.ice.product/ice.sdk.product index 3ea96ac61..fe02a8060 100644 --- a/org.eclipse.ice.product/ice.sdk.product +++ b/org.eclipse.ice.product/ice.sdk.product @@ -123,11 +123,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - diff --git a/org.eclipse.ice.target.neon/neon.target b/org.eclipse.ice.target.neon/neon.target index 2a6afbcdb..6d0895b69 100644 --- a/org.eclipse.ice.target.neon/neon.target +++ b/org.eclipse.ice.target.neon/neon.target @@ -1,5 +1,5 @@ - + @@ -151,22 +151,16 @@ - - - - - - From d2ccc545af6b595031bd38d0a7b6d48c7caeb8a4 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 12 Dec 2016 15:39:46 -0500 Subject: [PATCH 35/74] Fixed bugs for importing VIBE Items Made some improvements to the IPSReader for importing VIBE Items to address #312, including: There are no longer issues with differing file systems' line returns. Fixed a bug where reading would fail if an entire line was commented out. Added support for the AMPERE and CHARTRAN_THERMAL_DRIVER port types. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/io/ips/IPSReader.java | 57 ++++++++++++++++--- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java index 83e29dd82..dbbc83fef 100644 --- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java +++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java @@ -239,15 +239,16 @@ private ArrayList readFileLines(IFile ifile) throws FileNotFoundExceptio // Read the FileInputStream and append to a StringBuffer StringBuffer buffer = new StringBuffer(); int fileByte; - while ((fileByte = reader.read()) != -1) { - buffer.append((char) fileByte); + + //Read each the file, putting each line into its own string + ArrayList fileLines = new ArrayList(); + String line = reader.readLine(); + while(line != null){ + fileLines.add(line); + line = reader.readLine(); } reader.close(); - // Break up the StringBuffer at each newline character - String[] bufferSplit = (buffer.toString()).split("\n"); - ArrayList fileLines = new ArrayList(Arrays.asList(bufferSplit)); - // Add a dummy EOF line so that the last line of the file is // read in correctly fileLines.add("EOF"); @@ -292,7 +293,7 @@ private TableComponent loadGlobalConfiguration(Iterator it) { // The format in this section is: KEY = VALUE # Comment // First check if the line contains a parameter if (line.contains("=")) { - + // If the line has a comment split on it and disregard it if (line.contains("#")) { line = line.split("#", 2)[0]; @@ -300,6 +301,11 @@ private TableComponent loadGlobalConfiguration(Iterator it) { // Get the content for the entry splitLine = line.split("=", 2); + + //If the line cannot be split into two valid tokens, then the entire line must have been commented out and can be safely ignored. + if(splitLine.length < 2 || splitLine[0].trim().length() == 0){ + continue; + } // Set up the data in the table ArrayList row = new ArrayList(); @@ -396,6 +402,11 @@ private TableComponent loadPortsData(Iterator it) { // Take care of comments if (line.contains("#")) { line = line.split("#", 2)[0]; + + //If the line is empty, then the entire line must have been commented out and can be safely ignored. + if(line.trim().length() == 0){ + continue; + } } // Get the port name of the entry & make sure that it is in @@ -541,7 +552,7 @@ private MasterDetailsComponent buildMasterDetailsComponent(ArrayList allowedPortList = new ArrayList(Arrays.asList(allowedPortNames)); ArrayList portTemplates = new ArrayList(); Boolean portAdded; @@ -705,6 +716,36 @@ private void populatePortMap() { "SCRIPT = $BIN_PATH/dualfoil_chartran.py", "", "" }; portLines = new ArrayList(Arrays.asList(dfoilStrings)); portMap.put("DUALFOIL", portLines); + + //CHARTRAN_THERMAL_DRIVER definitions + String[] ctdStrings = { "CHARTRAN_THERMAL_DRIVER", "CLASS = DRIVERS", + "SUB_CLASS = CHARTRAN_THERMAL", + "NAME = Driver", + "NPROC = 1", + "BIN_PATH = $CAEBAT_ROOT/bin", + "INPUT_DIR = $SIM_ROOT/", + "INPUT_FILES =", + "OUTPUT_FILES = $CURRENT_STATE", + "SCRIPT = $BIN_PATH/thermal_chartran_driver_n.py" + }; + portLines = new ArrayList(Arrays.asList(ctdStrings)); + portMap.put("CHARTRAN_THERMAL_DRIVER", portLines); + + //AMPERES definitions + String[] ampereStrings = { "AMPERES", "CLASS = THERMAL", + "SUB_CLASS =", + "NAME = Amperes", + "NPROC = 1", + "BIN_PATH = $CAEBAT_ROOT/bin", + "INPUT_DIR = $SIM_ROOT/input", + "INPUT_FILES = 'input_keyvalue' , 'Cell-zones1.e'", + "OUTPUT_FILES = $CURRENT_STATE", + "INPUT_VAR = 'lumped_source'", + "OUTPUT_VAR = 'lumped_temperature'", + "SCRIPT = $BIN_PATH/amperes_thermal.py" + }; + portLines = new ArrayList(Arrays.asList(ampereStrings)); + portMap.put("AMPERES", portLines); } From 23ba459685057375c110fe9d37985726745d9a95 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 13 Dec 2016 10:14:56 -0500 Subject: [PATCH 36/74] Fixed IPSReader bugs The IPSReader now correctly populates the Master Details Section to allow the creation of new ports to address bug #313. Also changed the reader to use the logger and create an error window instead of using System.err, to address bug #314. Signed-off-by: Robert Smith --- org.eclipse.ice.io/META-INF/MANIFEST.MF | 2 + .../src/org/eclipse/ice/io/ips/IPSReader.java | 92 +++++++++++++++---- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/org.eclipse.ice.io/META-INF/MANIFEST.MF b/org.eclipse.ice.io/META-INF/MANIFEST.MF index 931037b13..d047e381a 100644 --- a/org.eclipse.ice.io/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.io/META-INF/MANIFEST.MF @@ -15,4 +15,6 @@ Export-Package: org.eclipse.ice.io.csv, Bundle-Vendor: Oak Ridge National Laboratory Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, + org.eclipse.jface.dialogs, + org.eclipse.swt.widgets, org.slf4j diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java index dbbc83fef..937e13f6d 100644 --- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java +++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java @@ -23,6 +23,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ice.datastructures.entry.IEntry; import org.eclipse.ice.datastructures.entry.StringEntry; import org.eclipse.ice.datastructures.form.DataComponent; @@ -30,6 +32,9 @@ import org.eclipse.ice.datastructures.form.MasterDetailsComponent; import org.eclipse.ice.datastructures.form.TableComponent; import org.eclipse.ice.io.serializable.IReader; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,7 +133,7 @@ public Form read(IFile ifile) { // Read in each of the ports individually String name = ""; while (!name.equals("TIME_LOOP")) { - DataComponent ipsComponent = loadComponent(iniIterator); + DataComponent ipsComponent = loadComponent(iniIterator, true); name = ipsComponent.getName(); if (!name.equals("TIME_LOOP")) { ipsComponents.add(ipsComponent); @@ -321,8 +326,9 @@ private TableComponent loadGlobalConfiguration(Iterator it) { // Make sure that we are not at the end of the file if (!it.hasNext()) { - System.err.println( + logger.error( "IPS Reader Message: Reached unexpected " + "end of file while reading the global configuration."); + createErrorDialog(); return null; } @@ -364,8 +370,9 @@ private TableComponent loadPortsData(Iterator it) { // loadGlobalConfiguration() method the current line that the iterator // is at should be [PORTS] if (!it.hasNext()) { - System.err.println("Reached unexpected end of file while trying to " + logger.error("Reached unexpected end of file while trying to " + "locate the Ports Table. Please check your input file and " + "try again."); + createErrorDialog(); return null; } @@ -382,8 +389,9 @@ private TableComponent loadPortsData(Iterator it) { // in, so make sure that we've not accidentally parsed over the entire // thing. If we have, tell the user that their file may be incorrect. if (!it.hasNext()) { - System.err.println("Reached unexpected end of file while trying to " + "read the Ports Table. " + logger.error("Reached unexpected end of file while trying to " + "read the Ports Table. " + "Please check your input file and try again."); + createErrorDialog(); return null; } @@ -430,9 +438,10 @@ private TableComponent loadPortsData(Iterator it) { String implementation = line.split(" = ", 2)[1]; row.get(1).setValue(implementation); } else { - System.err.println( + logger.error( "Unexpected token after ports entry, " + "check your input file and try again."); - System.exit(1); + createErrorDialog(); + return null; } // Found a complete port entry, now remove the port from the @@ -446,8 +455,8 @@ private TableComponent loadPortsData(Iterator it) { // Make sure that we are not at the end of the file if (!it.hasNext()) { - System.err - .println("IPS Reader Message: Reached unexpected " + "end of file while reading the ports table."); + logger.error("IPS Reader Message: Reached unexpected " + "end of file while reading the ports table."); + createErrorDialog(); return null; } @@ -461,15 +470,27 @@ private TableComponent loadPortsData(Iterator it) { * * @param it * Iterator over the lines of the INI file as an ArrayList + * @param fromFile + * True if the iterator is for the file the reader is parsing or false if the iterator is for a standalone set of strings which are to be parsed by themselves. * @return A DataComponent containing information for one of the port * entries. */ - private DataComponent loadComponent(Iterator it) { + private DataComponent loadComponent(Iterator it, boolean fromFile) { // Create the port component and a generic entry DataComponent portComponent = new DataComponent(); IEntry entry; String[] splitLine = null; - + + //The local line that is being parsed + String line; + + //Get the line for the file or from the iterator, as appropriate for the source + if(fromFile){ + line = this.line; + } else{ + line = it.next(); + } + // Scan until we get to the next port component while (!line.contains("[") && !line.contains("]") && it.hasNext()) { line = it.next(); @@ -505,6 +526,11 @@ private DataComponent loadComponent(Iterator it) { portComponent.addEntry(entry); } + //If we have parsed all the lines from a standalone data set, stop parsing + if(!fromFile && !it.hasNext()){ + return portComponent; + } + // Read in another line line = it.next(); @@ -518,11 +544,17 @@ private DataComponent loadComponent(Iterator it) { foundNextPort = true; } } + + //If we loaded from the file, set the overall current line to the last line parsed + if(fromFile){ + this.line = line; + } // Make sure that we are not at the end of the file if (!it.hasNext()) { - System.err.println( + logger.error( "IPS Reader Message: Reached unexpected " + "end of file while reading the port configuration."); + createErrorDialog(); return null; } @@ -569,14 +601,29 @@ private MasterDetailsComponent buildMasterDetailsComponent(ArrayList portData; + // Add in the missing definitions for (String port : allowedPortList) { - portTemplates.add(loadComponent(portMap.get(port).iterator())); + portTemplates.add(loadComponent(portMap.get(port).iterator(), false)); + } + + //The list of portTemplates, re-ordered to match that of the allowedPortNames + ArrayList orderedPortTemplates = new ArrayList(); + + //Add the corresponding template for each port name to the list + for(String port : allowedPortNames){ + for(DataComponent template : portTemplates){ + if(port.equals(template.getName())){ + orderedPortTemplates.add(template); + break; + } + } } // Recreate the overall list & Set the template allowedPortList = new ArrayList(Arrays.asList(allowedPortNames)); - masterDetails.setTemplates(allowedPortList, portTemplates); + masterDetails.setTemplates(allowedPortList, orderedPortTemplates); // Add the ports to the MasterDetailsComponent for (DataComponent data : ipsComponents) { @@ -590,6 +637,18 @@ private MasterDetailsComponent buildMasterDetailsComponent(ArrayList it) { // Scan until we get to the next port component if (!it.hasNext()) { - System.err.println("Unexpectedly reached the end of file. " + logger.error("Unexpectedly reached the end of file. " + "Please check the INI file you have chosen and" + " try again."); + createErrorDialog(); return null; } @@ -718,7 +778,7 @@ private void populatePortMap() { portMap.put("DUALFOIL", portLines); //CHARTRAN_THERMAL_DRIVER definitions - String[] ctdStrings = { "CHARTRAN_THERMAL_DRIVER", "CLASS = DRIVERS", + String[] ctdStrings = { "[CHARTRAN_THERMAL_DRIVER]", "CLASS = DRIVERS", "SUB_CLASS = CHARTRAN_THERMAL", "NAME = Driver", "NPROC = 1", @@ -732,7 +792,7 @@ private void populatePortMap() { portMap.put("CHARTRAN_THERMAL_DRIVER", portLines); //AMPERES definitions - String[] ampereStrings = { "AMPERES", "CLASS = THERMAL", + String[] ampereStrings = { "[AMPERES]", "CLASS = THERMAL", "SUB_CLASS =", "NAME = Amperes", "NPROC = 1", From 382df19e6a64f51dc5ae88e13a93b092e0f15e50 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 13 Dec 2016 10:30:15 -0500 Subject: [PATCH 37/74] Fixed IPSReader error dialogs Fixed a bug with the IPSReader's opening of dialogs. Signed-off-by: Robert Smith --- org.eclipse.ice.io/META-INF/MANIFEST.MF | 1 + .../src/org/eclipse/ice/io/ips/IPSReader.java | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/org.eclipse.ice.io/META-INF/MANIFEST.MF b/org.eclipse.ice.io/META-INF/MANIFEST.MF index d047e381a..b1bf20abe 100644 --- a/org.eclipse.ice.io/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.io/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.jface.dialogs, org.eclipse.swt.widgets, + org.eclipse.ui, org.slf4j diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java index 937e13f6d..09aab0dd8 100644 --- a/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java +++ b/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java @@ -35,6 +35,7 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -641,11 +642,21 @@ private MasterDetailsComponent buildMasterDetailsComponent(ArrayList Date: Tue, 13 Dec 2016 12:50:16 -0500 Subject: [PATCH 38/74] Made oxygen target a project Created a .project file for the org.eclipse.ice.target.oxygen folder. Also updated to NatTable 1.4.0 in the Oxygen target. Signed-off-by: Robert Smith --- org.eclipse.ice.target.oxygen/.project | 17 +++++++++++++++++ org.eclipse.ice.target.oxygen/oxygen.target | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 org.eclipse.ice.target.oxygen/.project diff --git a/org.eclipse.ice.target.oxygen/.project b/org.eclipse.ice.target.oxygen/.project new file mode 100644 index 000000000..a8de65653 --- /dev/null +++ b/org.eclipse.ice.target.oxygen/.project @@ -0,0 +1,17 @@ + + + org.eclipse.ice.target.oxygen + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/org.eclipse.ice.target.oxygen/oxygen.target b/org.eclipse.ice.target.oxygen/oxygen.target index a83a7546d..ea9cd2dc6 100644 --- a/org.eclipse.ice.target.oxygen/oxygen.target +++ b/org.eclipse.ice.target.oxygen/oxygen.target @@ -31,12 +31,12 @@ + - + - - + From 768133f3f3e5ee86484fec4f9293127e6d6c4986 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 14 Dec 2016 13:25:43 -0500 Subject: [PATCH 39/74] Updated SWTBot and VIBE tests Updated the tests for VIBE, as well as the SWTBOT UI tests. Signed-off-by: Robert Smith --- .../ice.product_WINDOWS.launch | 4 +- .../ice/reflectivity/ui/ReflectivityPage.java | 30 +-- .../MOOSETester.launch | 6 +- .../MaterialsDatabaseTester.launch | 4 +- .../ReflectivityModelTester.launch | 4 +- .../VIBEKeyValuePairTester.launch | 4 +- .../VIBELauncher.launch | 4 +- .../VIBEModel.launch | 4 +- .../ice/ui/swtbot/test/MOOSETester.java | 15 +- .../swtbot/test/ReflectivityModelTester.java | 1 + .../swtbot/test/VIBEKeyValuePairTester.java | 37 +++- .../ice/ui/swtbot/test/VIBEModelTester.java | 30 +-- .../vibe/kvPair/test/VibeKVPairRowTester.java | 174 ++++++++++++++++++ .../vibe/kvPair/test/VibeKVPairTester.java | 118 ++++++++++++ .../ice/vibe/kvPair/VibeKVPairRow.java | 2 +- 15 files changed, 387 insertions(+), 50 deletions(-) create mode 100644 org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java diff --git a/org.eclipse.ice.product/ice.product_WINDOWS.launch b/org.eclipse.ice.product/ice.product_WINDOWS.launch index 286a17111..361391be9 100644 --- a/org.eclipse.ice.product/ice.product_WINDOWS.launch +++ b/org.eclipse.ice.product/ice.product_WINDOWS.launch @@ -22,8 +22,8 @@ - - + + diff --git a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPage.java b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPage.java index c325e522f..c2e94ed3e 100644 --- a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPage.java +++ b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPage.java @@ -183,7 +183,7 @@ protected void createFormContent(IManagedForm managedForm) { Section listSection = formToolkit.createSection(sashForm, Section.TITLE_BAR | Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED | Section.COMPACT); - + listSection.setLayout(new GridLayout(1, false)); listSection.setLayoutData( new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); @@ -243,9 +243,9 @@ public void selectionChanged(SelectionChangedEvent event) { if (!newSelection.equals(selectedCell)) { selectedCell = newSelection; for (ISelectionChangedListener listener : listeners) { - listener.selectionChanged(new SelectionChangedEvent( - ReflectivityPage.this, ReflectivityPage.this - .getSelection())); + listener.selectionChanged( + new SelectionChangedEvent(ReflectivityPage.this, + ReflectivityPage.this.getSelection())); } } } @@ -262,10 +262,12 @@ public void selectionChanged(SelectionChangedEvent event) { // Create the resource form page contents super.createFormContent(resourceForm); - - //Open the properties view and set the focuse on this view to force the correct properties to display. + + // Open the properties view and set the focuse on this view to force the + // correct properties to display. try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.ui.propertiesView"); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .showView("org.eclipse.ui.propertiesView"); } catch (PartInitException e) { e.printStackTrace(); } @@ -331,9 +333,9 @@ public void widgetSelected(SelectionEvent e) { list.getReadWriteLock().writeLock().unlock(); } } - + } - + listTable.getTable().refresh(); } @@ -375,7 +377,7 @@ public void widgetSelected(SelectionEvent arg0) { } } } - + listTable.getTable().refresh(); } @@ -432,7 +434,7 @@ public void widgetSelected(SelectionEvent arg0) { } } - + listTable.getTable().refresh(); } } @@ -489,7 +491,7 @@ public void widgetSelected(SelectionEvent arg0) { listTable.setSelection(selected); } } - + listTable.getTable().refresh(); } } @@ -515,7 +517,7 @@ public void widgetSelected(SelectionEvent arg0) { list.clear(); list.getReadWriteLock().writeLock().unlock(); } - + listTable.getTable().refresh(); } @@ -676,7 +678,5 @@ public void removeSelectionChangedListener( public void setSelection(ISelection selection) { // Do nothing, as we do not want this capability } - - } diff --git a/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch b/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch index 275f392f7..d26a74ecc 100644 --- a/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch +++ b/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch @@ -11,7 +11,7 @@ - + @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch b/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch index 2bb75e514..c5a0c8035 100644 --- a/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch +++ b/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch b/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch index d055f838b..bc0c389db 100644 --- a/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch +++ b/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch b/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch index a3f421f0e..6b2a6ba5f 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch +++ b/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch b/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch index 0b13d5c13..36701e45e 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch +++ b/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch b/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch index 7ab0cccad..2c88ad2d9 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch +++ b/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java index 8c0f55244..f3ac93b62 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java +++ b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java @@ -30,7 +30,7 @@ public void beforeAllTests() { // Test the functionality of the Moose Actions drop down button @Test public void checkMooseActions() { - + // Open the MOOSE perspective bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); @@ -60,7 +60,7 @@ public void checkMooseActions() { // Open the add item dialog and add a MOOSE workflow bot.viewByPartName("Item Viewer").setFocus(); - //bot.toolbarButton(0).click(); + // bot.toolbarButton(0).click(); bot.toolbarButtonWithTooltip("Create an Item").click(); bot.list(0).select("MOOSE Workflow"); bot.button("Finish").click(); @@ -85,11 +85,12 @@ public void checkMooseActions() { .equals("There are unsaved changes on the form.")); // Save and check that the header's text returned to normal. - try{ - bot.toolbarButtonWithTooltip("Save (Ctrl+S)").click(); - - //If the save button wasn't found with the windows/linux tooltip, try the mac tooltip - }catch(WidgetNotFoundException e){ + try { + bot.toolbarButtonWithTooltip("Save (Ctrl+S)").click(); + + // If the save button wasn't found with the windows/linux tooltip, + // try the mac tooltip + } catch (WidgetNotFoundException e) { bot.toolbarButtonWithTooltip("Save (\u2318S)").click(); } assertTrue(bot.clabel(0).getText().equals("Ready to process.")); diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java index a65a4c59d..1d38533f4 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java +++ b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java @@ -127,6 +127,7 @@ public void checkReflectivityModel() { assertTrue("107Ag".equals(cellName)); // Move it up two rows + table.selectCell(bot, 0, 5); bot.button("^").click(); bot.button("^").click(); cellName = (String) realTable.getDataValueByPosition(1, 4); diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java index 3f189a5cb..d6f852d56 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java +++ b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java @@ -70,9 +70,12 @@ public void checkVIBEKeyValuePair() { // Change the first row's value to two bot.table(1).click(0, 1); - bot.text().typeText("2"); + bot.text("1 ", 0).setText("2"); bot.table(1).click(0, 0); + // Check that the cell was set + assertTrue("2".equals(bot.table(1).cell(0, 1))); + // Makes sure the form registers that it is dirty assertTrue("There are unsaved changes on the form." .equals(bot.clabel(0).getText())); @@ -100,5 +103,37 @@ public void checkVIBEKeyValuePair() { bot.button("Go!").click(); assertTrue(bot.clabel(0).getText().equals("Done!")); + // Set the template to DualFoil + bot.radio(1).click(); + + // Check that a couple of the DualFoil's rows are set up correctly + assertTrue("NUMSEG".equals(bot.table(1).cell(14, 0))); + assertTrue("CUTOFFL".equals(bot.table(1).cell(17, 0))); + assertTrue("2.0,2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); + + // Set the NUMSEG key to 8. + bot.table(1).click(14, 1); + bot.text("5", 0).setText("8"); + bot.table(1).click(14, 0); + + // CUTOFFL should have had its vector increased in size to account for + // the new NUMSEG value + assertTrue("2.0,2.0,2.0,2.0,2.0,0.0,0.0,0.0" + .equals(bot.table(1).cell(17, 1))); + + // Set NUMSEG to 4 + bot.table(1).click(14, 1); + bot.text("8", 0).setText("4"); + bot.table(1).click(14, 0); + + // CUTOFFL should have been reduced to only 4 numbers + assertTrue("2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); + + // Set the template back to NTG + bot.radio(0).click(); + + // Check one of the rows to ensure that the NTG template has been loaded + assertTrue("CUTOFF".equals(bot.table(1).cell(15, 0))); + } } diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java index 622e4d033..ac232503f 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java +++ b/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java @@ -155,15 +155,11 @@ public void checkVIBELauncher() { // Check each of the port types available in the menu and check the // number of text fields they display. - // FIXME INIT_STATE, CHARTRAN_ElECTRICAL_THERMAL_DRIVER, and NTG have - // different variables available for editing between the default - // provided sockets and the ones added by the button. Need to figure out - // if this is intentional. bot.button(2).click(); bot.table().select("INIT_STATE"); bot.button("OK").click(); - // bot.table(1).select(5); - // bot.text(13).typeText("Test"); + bot.table(1).select(5); + bot.text(13).typeText("Test"); bot.button(2).click(); bot.table().select("AMPERES_THERMAL"); @@ -180,14 +176,14 @@ public void checkVIBELauncher() { bot.button(2).click(); bot.table().select("CHARTRAN_ELECTRICAL_THERMAL_DRIVER"); bot.button("OK").click(); - // bot.table(1).select(8); - // bot.text(11).typeText("Test"); + bot.table(1).select(8); + bot.text(12).typeText("Test"); bot.button(2).click(); bot.table().select("NTG"); bot.button("OK").click(); - // bot.table(1).select(9); - // bot.text(13).typeText("Test"); + bot.table(1).select(9); + bot.text(14).typeText("Test"); bot.button(2).click(); bot.table().select("DUALFOIL"); @@ -197,9 +193,21 @@ public void checkVIBELauncher() { // table to see if it was added instead. assertEquals(11, bot.table(1).rowCount()); + bot.button(2).click(); + bot.table().select("AMPERES"); + bot.button("OK").click(); + bot.table(1).select(11); + bot.text(14).typeText("Test"); + + bot.button(2).click(); + bot.table().select("CHARTRAN_THERMAL_DRIVER"); + bot.button("OK").click(); + bot.table(1).select(12); + bot.text(10).typeText("Test"); + // Delete a row and make sure it's gone bot.table().select(0); bot.button("Delete").click(); - assertTrue("11 DUALFOIL".equals(bot.table(1).cell(9, 0))); + assertTrue("11 DUALFOIL".equals(bot.table(1).cell(10, 0))); } } diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java new file mode 100644 index 000000000..10331c530 --- /dev/null +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java @@ -0,0 +1,174 @@ +/******************************************************************************* + * Copyright (c) 2016 UT-Battelle, LLC. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Robert Smith + *******************************************************************************/ +package org.eclipse.ice.vibe.kvPair.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.eclipse.ice.datastructures.ICEObject.IUpdateable; +import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener; +import org.eclipse.ice.datastructures.entry.StringEntry; +import org.eclipse.ice.vibe.kvPair.VibeKVPairRow; +import org.junit.Test; + +/** + * A class to test the functionality of the VibeKVPairRow + * + * @author Robert Smith + * + */ +public class VibeKVPairRowTester { + + /** + * Test that rows can be cloned and copied. + */ + @Test + public void checkClone() { + + // Initialize the test row + StringEntry testKey = new StringEntry(); + StringEntry testValue = new StringEntry(); + VibeKVPairRow row = new VibeKVPairRow(testKey, testValue); + + // Set some values to the row + testKey.setValue("key"); + testValue.setValue("value"); + row.setName("row"); + + // Initialize another row + VibeKVPairRow copyRow = new VibeKVPairRow(new StringEntry(), + new StringEntry()); + + // Copy the first row's data into the second + copyRow.copy(row); + + // Check that the data members were all copied correctly + assertTrue("key".equals(copyRow.getKey().getValue())); + assertTrue("value".equals(copyRow.getValue().getValue())); + assertTrue("row".equals(copyRow.getName())); + + // Clone the row + VibeKVPairRow clone = (VibeKVPairRow) row.clone(); + + // Check that the data members were all copied correctly + assertTrue("key".equals(clone.getKey().getValue())); + assertTrue("value".equals(clone.getValue().getValue())); + assertTrue("row".equals(clone.getName())); + } + + /** + * Check that the getters and setters for the class work correctly. + */ + @Test + public void checkSetters() { + + // Initiailze the test row + StringEntry testKey = new StringEntry(); + StringEntry testValue = new StringEntry(); + VibeKVPairRow row = new VibeKVPairRow(testKey, testValue); + + // Check that the key and value entries are correct + assertTrue(testKey == row.getKey()); + assertTrue(testValue == row.getValue()); + + // Check the context methods + row.setContext("context"); + assertTrue("context".equals(row.getContext())); + + // Check the description methods + row.setDescription("description"); + assertTrue("description".equals(row.getDescription())); + + // Check the ID methods + row.setId(2); + assertEquals(2, row.getId()); + + // Check the name methods + row.setName("name"); + assertTrue("name".equals(row.getName())); + + } + + /** + * Test the row's ability to give and receive updates + */ + @Test + public void checkUpdate() { + + // Initiailze the test row + StringEntry testKey = new StringEntry(); + StringEntry testValue = new StringEntry(); + VibeKVPairRow row = new VibeKVPairRow(testKey, testValue); + + // Add a listener + TestListener listener = new TestListener(row); + listener.wasUpdated(); + + // Update the value and make sure that the listener was notified. + testValue.setValue("test"); + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + fail("Exception while waiting for update."); + } + assertTrue(listener.wasUpdated()); + + } + + /** + * A simple class to listen to a VibeKVPairRow and record when it sends an + * update. + * + * @author Robert Smith + * + */ + private class TestListener implements IUpdateableListener { + + /** + * Whether or not this object has received an update since the last time + * it was checked. + */ + private boolean updated = false; + + public TestListener(VibeKVPairRow row) { + row.register(this); + } + + /** + * Checks whether the listener was updated since the last time this + * message was called + * + * @return True if update() was called since the last time this method + * was invoked. False otherwise. + */ + public boolean wasUpdated() { + boolean temp = updated; + updated = false; + return temp; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.datastructures.ICEObject.IUpdateableListener#update( + * org.eclipse.ice.datastructures.ICEObject.IUpdateable) + */ + @Override + public void update(IUpdateable component) { + updated = true; + } + } + +} diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java index 9dba21f28..cc2b12e60 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java @@ -17,6 +17,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.ArrayList; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; @@ -26,8 +28,11 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.ice.datastructures.ICEObject.Component; +import org.eclipse.ice.datastructures.form.DataComponent; import org.eclipse.ice.datastructures.form.Form; import org.eclipse.ice.datastructures.form.FormStatus; +import org.eclipse.ice.datastructures.form.TableComponent; import org.eclipse.ice.vibe.kvPair.VibeKVPair; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -138,6 +143,119 @@ public void checkSetupForm() { vibeKVPair.getDescription()); } + /** + * Test that changing the template will set the table up appropriately. + */ + @Test + public void checkTemplates() { + VibeKVPair vibeKVPair; + IProject project = projectSpace; + + // Create a VibeLauncher + vibeKVPair = new VibeKVPair(project); + + // The components from the item's form. + ArrayList components = vibeKVPair.getForm().getComponents(); + + // The component containing the table Key-Value pairs + TableComponent table = null; + + // The component containing the problem templates + DataComponent template = null; + + // Search the list of components, saving them to the approrpiate + // variables + for (Component component : components) { + + // The template component will be the only DataComponent + if (component instanceof DataComponent) { + template = (DataComponent) component; + } + + // The table will be the only TableComponent + else if (component instanceof TableComponent) { + table = (TableComponent) component; + } + } + + // Whether or not the CUTOFF key was found in the table + boolean foundCutoff = false; + + // Search for the CUTOFF key in each of the tables rows + for (int id : table.getRowIds()) { + if ("CUTOFF".equals(table.getRow(id).get(0).getValue())) { + foundCutoff = true; + break; + } + } + + // If the CUTOFF key was absent, then the table was not set up correctly + if (!foundCutoff) { + fail("Did not find CUTOFF row in default table."); + } + + // Set the item to the DualFoil template + template.retrieveAllEntries().get(0).setValue("DualFoil"); + + // Give the form time to load the new data + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + fail(); + } + + // Whether the CUTOFFL key was found in the table + boolean foundL = false; + + // Whether the CUTOFFH key was found in the table + boolean foundH = false; + + // Search each row of the table for the DualFoil keys + for (int id : table.getRowIds()) { + + // Get the value of the current key-value pair's row + String value = table.getRow(id).get(0).getValue(); + + if ("CUTOFFL".equals(value)) { + foundL = true; + } else if ("CUTOFFH".equals(value)) { + foundH = true; + } + } + + // If the expected keys were not found, then the DualFoil template was + // not properly applied to the table + if (!foundL || !foundH) { + fail("Table was not changed to DualFoil template."); + } + + // Set the template back to NTG + template.retrieveAllEntries().get(0).setValue("NTG"); + + // Give the form time to load the new data + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + fail(); + } + + // Search for the CUTOFF key in each of the tables rows + foundCutoff = false; + for (int id : table.getRowIds()) { + if ("CUTOFF".equals(table.getRow(id).get(0).getValue())) { + foundCutoff = true; + break; + } + } + + // If the CUTOFF key was absent, then the table was not set up correctly + if (!foundCutoff) { + fail("Table was not changed to NTG template."); + } + } + /** * Try processing the form with both valid and invalid */ diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java index a0fa4ae12..0464da444 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairRow.java @@ -131,7 +131,7 @@ public String getDescription() { */ @Override public int getId() { - return 0; + return ID; } /* From 1055de553e0f73eda1582742b16d0a220d5fdfff Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 11 Jan 2017 12:15:11 -0500 Subject: [PATCH 40/74] Made templates optional for VIBE The VIBE Key-Value Pair Item now defaults to an empty table. Templates may still be selected manually to populate it. Signed-off-by: Robert Smith --- .../ice.product_WINDOWS.launch | 4 ++-- .../ice/vibe/kvPair/test/VibeKVPairTester.java | 16 +++++++++++++++- org.eclipse.ice.vibe/data/None.dat | 1 + .../org/eclipse/ice/vibe/kvPair/VibeKVPair.java | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.ice.vibe/data/None.dat diff --git a/org.eclipse.ice.product/ice.product_WINDOWS.launch b/org.eclipse.ice.product/ice.product_WINDOWS.launch index 361391be9..8ef13a8c0 100644 --- a/org.eclipse.ice.product/ice.product_WINDOWS.launch +++ b/org.eclipse.ice.product/ice.product_WINDOWS.launch @@ -22,8 +22,8 @@ - - + + diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java index cc2b12e60..5f9f3a259 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java @@ -178,6 +178,20 @@ else if (component instanceof TableComponent) { } } + //The table should be empty initially + assertEquals(0, table.numberOfRows()); + + //Load a template + template.retrieveAllEntries().get(0).setValue("NTG"); + + // Give the form time to load the new data + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + fail(); + } + // Whether or not the CUTOFF key was found in the table boolean foundCutoff = false; @@ -190,7 +204,7 @@ else if (component instanceof TableComponent) { } // If the CUTOFF key was absent, then the table was not set up correctly - if (!foundCutoff) { + if (foundCutoff) { fail("Did not find CUTOFF row in default table."); } diff --git a/org.eclipse.ice.vibe/data/None.dat b/org.eclipse.ice.vibe/data/None.dat new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/org.eclipse.ice.vibe/data/None.dat @@ -0,0 +1 @@ + diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index 8a981decb..4f454816e 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -74,7 +74,7 @@ public class VibeKVPair extends Item implements IReader, IWriter { /** * The name of the default template to load. */ - private static String defaultTemplate = "NTG"; + private static String defaultTemplate = "None"; /** * The tag that indicates this file should be exported to kv pairs. @@ -135,6 +135,7 @@ private DataComponent createSelectorComponent() { // The list of available templates ArrayList templateNames = new ArrayList(); + templateNames.add("None"); templateNames.add("NTG"); templateNames.add("DualFoil"); @@ -728,6 +729,10 @@ public String getReaderType() { return "VibeKVPairItem"; } + /* + * (non-Javadoc) + * @see org.eclipse.ice.item.Item#update(org.eclipse.ice.datastructures.ICEObject.IUpdateable) + */ @Override public void update(IUpdateable updateable) { From 6b9dbd76b8ac6f11781729a5ef552caf4211f5e0 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 11 Jan 2017 14:47:25 -0500 Subject: [PATCH 41/74] Fixed VibeKVPairTest Replaced a ! operator that had been accidentally removed before being committed. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java index 5f9f3a259..9ea587079 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java @@ -204,7 +204,7 @@ else if (component instanceof TableComponent) { } // If the CUTOFF key was absent, then the table was not set up correctly - if (foundCutoff) { + if (!foundCutoff) { fail("Did not find CUTOFF row in default table."); } From b1cf638e6170d100ad45ff6d918b03ddf693d3c0 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Thu, 12 Jan 2017 10:01:29 -0500 Subject: [PATCH 42/74] Fixed test bundle names In response to the comment on bug #302 ,changed the test bundle names to conform to the official Eclipse naming conventions, which state names should be of the form org.eclipse.(project).tests.(bundle name) rather than org.eclipse.(project).(bundle name).test as they had been named previously. Signed-off-by: Robert Smith --- org.eclipse.ice.aggregator/pom.xml | 36 ++++---- .../defaultUser/default/.project | 22 ++--- org.eclipse.ice.io.test/.project | 34 -------- org.eclipse.ice.nek5000.test/.project | 34 -------- org.eclipse.ice.persistence.xml.test/.project | 34 -------- .../.project | 34 -------- org.eclipse.ice.proteus.test/.project | 34 -------- org.eclipse.ice.reactor.plant.test/.project | 34 -------- org.eclipse.ice.reactor.plant.test/pom.xml | 18 ---- org.eclipse.ice.reflectivity.test/.project | 34 -------- org.eclipse.ice.reflectivity.test/pom.xml | 18 ---- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../batml}/BatMLModelBuilderTester.java | 2 +- .../tests/caebat/batml}/BatMLModelTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 0 .../pom.xml | 2 +- .../MooseXMLFormContentDescriberTester.java | 4 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 0 .../pom.xml | 2 +- .../widgets}/utils/AbstractICEUITester.java | 2 +- .../widgets}/utils/AbstractSWTTester.java | 2 +- .../utils/AbstractWorkbenchTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.client.widgets/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../FileSimulationTester.launch | 83 +++++++++--------- .../META-INF/MANIFEST.MF | 4 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../client/widgets}/ActionTreeTester.java | 2 +- .../client/widgets}/EMFSectionPageTester.java | 2 +- .../widgets}/EclipseErrorBoxWidgetTester.java | 2 +- .../EclipseExtraInfoWidgetTester.java | 2 +- .../widgets}/EclipseFormWidgetTester.java | 2 +- .../widgets}/EclipseTextEditorTester.java | 2 +- .../EclipseUIWidgetFactoryTester.java | 2 +- .../client/widgets}/EntryCompositeTester.java | 4 +- .../widgets}/ExtraInfoDialogTester.java | 2 +- .../client/widgets}/FileSimulationTester.java | 2 +- .../ICEDataComponentSectionPartTester.java | 2 +- .../client/widgets}/ICEFormEditorTester.java | 2 +- .../widgets}/ICEGeometryPageTester.java | 2 +- .../widgets}/ICEMasterDetailsPageTester.java | 2 +- .../ICEMatrixComponentSectionPartTester.java | 2 +- .../widgets}/ICEResourcePageTester.java | 4 +- .../client/widgets}/ICESectionPageTester.java | 2 +- .../ICETableComponentSectionPartTester.java | 2 +- .../widgets}/IFormWidgetBuilderTest.java | 2 +- ...ComponentColumnPropertyAccessorTester.java | 2 +- .../widgets}/ListComponentNattableTest.java | 2 +- .../tests/client/widgets}/TestListener.java | 2 +- .../geometry/GeometryEditorInputTester.java | 2 +- .../ShapeTreeContentProviderTest.java | 2 +- .../geometry/ShapeTreeLabelProviderTest.java | 2 +- .../tests/client/widgets/grid}/Activator.java | 2 +- .../client/widgets/grid}/CellTester.java | 2 +- .../widgets/grid}/EditPartFactoryTester.java | 2 +- .../client/widgets/grid}/GridDataTester.java | 2 +- .../widgets/grid}/GridEditorInputTester.java | 2 +- .../client/widgets/grid}/GridTester.java | 2 +- .../widgets/grid}/GridViewerLauncher.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../fakeCoreTestFile | 0 .../pom.xml | 2 +- .../client}/ClientExtensionFactoryTester.java | 2 +- .../ice/tests/client}/ClientTester.java | 6 +- .../eclipse/ice/tests/client}/FakeCore.java | 2 +- .../ice/tests/client}/FakeErrorBoxWidget.java | 2 +- .../tests/client}/FakeExtraInfoWidget.java | 2 +- .../ice/tests/client}/FakeFormWidget.java | 2 +- .../ice/tests/client}/FakeItemProcessor.java | 2 +- .../client}/FakeStreamingTextWidget.java | 2 +- .../ice/tests/client}/FakeTextEditor.java | 2 +- .../tests/client}/FakeUIWidgetFactory.java | 2 +- .../ice/tests/client}/IClientTester.java | 2 +- .../tests/client}/IWidgetFactoryTester.java | 2 +- .../tests/client}/ItemProcessorTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../about.html | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 2 +- .../schema/ItemBuilder.exsd | 0 .../ice/tests/core/jaxrs}/JAXRSTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../defaultUser/default/.project | 11 +++ .../pom.xml | 2 +- .../eclipse/ice/tests/core}/CoreTester.java | 2 +- .../tests/core}/FakeCompositeItemBuilder.java | 2 +- .../ice/tests/core}/FakeGeometryBuilder.java | 2 +- .../eclipse/ice/tests/core}/FakeIFile.java | 2 +- .../org/eclipse/ice/tests/core}/FakeItem.java | 2 +- .../ice/tests/core}/FakeModuleBuilder.java | 2 +- .../tests/core}/FakePersistenceProvider.java | 2 +- .../ice/tests/core}/ItemManagerTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../about.html | 0 .../build.properties | 0 .../plugin.xml | 2 +- .../pom.xml | 2 +- .../AdaptiveTreeCompositeTester.java | 2 +- .../datastructures}/DataComponentTester.java | 2 +- .../datastructures}/EMFComponentTester.java | 2 +- .../tests/datastructures}/EMFEntryTester.java | 2 +- .../EMFTreeCompositeTester.java | 2 +- .../FakeJAXBClassProvider.java | 2 +- .../ice/tests/datastructures}/FormTester.java | 2 +- .../GeometryComponentTester.java | 2 +- .../tests/datastructures}/GeometryTester.java | 2 +- .../ICEJAXBClassProviderTester.java | 2 +- .../datastructures}/ICEJAXBHandlerTester.java | 2 +- .../tests/datastructures}/ICEListTester.java | 2 +- .../datastructures}/ICEObjectTester.java | 2 +- .../datastructures}/ICEResourceTester.java | 2 +- .../IJAXBClassProviderTester.java | 2 +- .../datastructures}/ListComponentTester.java | 2 +- .../MasterDetailsPairTester.java | 2 +- .../datastructures}/MasterDetailsTester.java | 2 +- .../datastructures}/MaterialStackTester.java | 2 +- .../tests/datastructures}/MaterialTester.java | 2 +- .../MatrixComponentTester.java | 2 +- .../datastructures}/MeshComponentTester.java | 2 +- .../PainfullySimpleFormTester.java | 2 +- .../ResourceComponentTester.java | 2 +- .../ResourceHandlerTester.java | 2 +- .../datastructures}/SimpleJAXBTestClass.java | 2 +- .../datastructures}/TableComponentTester.java | 2 +- .../TestComponentListener.java | 2 +- .../TestListComponentListener.java | 2 +- .../datastructures}/TestMaterialFactory.java | 2 +- .../tests/datastructures}/TestVisitor.java | 2 +- .../TimeDataComponentTester.java | 2 +- .../TreeCompositeIteratorTester.java | 2 +- .../datastructures}/TreeCompositeTester.java | 2 +- .../datastructures}/VizResourceTester.java | 2 +- .../WrappedGlazedEventListenerTester.java | 2 +- .../entry}/AbstractEntryTester.java | 2 +- .../entry}/ContinuousEntryTester.java | 2 +- .../entry}/DiscreteEntryTester.java | 2 +- .../entry}/FileEntryTester.java | 2 +- .../entry}/StringEntryTester.java | 2 +- .../entry}/TestableAbstractEntry.java | 2 +- .../.project | 2 +- .../.pydevproject | 0 .../Test_ICE_Installer.py | 0 .../__init__.py | 0 .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.io/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../ice/tests/io/csv}/CSVReaderTester.java | 2 +- .../ice/tests/io/csv}/SpaceReaderTester.java | 2 +- .../ice/tests/io/ini}/INIReaderTester.java | 2 +- .../ice/tests/io/ini}/INIWriterTester.java | 2 +- .../ice/tests/io/ips}/IPSReaderTester.java | 2 +- .../ice/tests/io/ips}/IPSWriterTester.java | 2 +- .../io/serializable}/IOServiceTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../ls_stdout_1.txt | 0 .../pom.xml | 2 +- .../tests/item}/messaging/MessageTester.java | 2 +- .../ice/tests/item}/moose/BlockTester.java | 2 +- .../item}/moose/MOOSEFileHandlerTester.java | 2 +- .../tests/item}/moose/ParameterTester.java | 2 +- .../tests/item}/moose/YAMLBlockTester.java | 2 +- .../item}/nuclear/MOOSELauncherTester.java | 4 +- .../nuclear/MOOSEModelBuilderTester.java | 2 +- .../tests/item}/nuclear/MOOSEModelTester.java | 4 +- .../ice/tests/item}/nuclear/MOOSETester.java | 4 +- .../ice/item}/AbstractItemBuilderTester.java | 2 +- .../ice/item}/AbstractModelBuilderTester.java | 2 +- .../eclipse/tests/ice/item}/ActionTester.java | 2 +- .../ice/item}/DockerClientFactoryTester.java | 2 +- .../tests/ice/item}/FakeActionFactory.java | 2 +- .../tests/ice/item}/FakeDataComponent.java | 2 +- .../tests/ice/item}/FakeIOService.java | 2 +- .../eclipse/tests/ice/item}/FakeIWriter.java | 2 +- .../tests/ice/item}/FakeItemBuilder.java | 2 +- .../ice/item}/FakeMaterialsDatabase.java | 2 +- .../eclipse/tests/ice/item}/FakeModel.java | 2 +- .../tests/ice/item}/FakeModelBuilder.java | 2 +- .../item}/GeometryEditorBuilderTester.java | 2 +- .../tests/ice/item}/GeometryEditorTester.java | 2 +- .../ice/item}/ICEActionFactoryTester.java | 2 +- .../tests/ice/item}/ICEDatabaseValidator.java | 2 +- .../ice/item}/ICEDatabaseValidatorTester.java | 2 +- .../tests/ice/item}/ICEJschUIInfoTester.java | 2 +- .../ice/item}/IPersistenceProviderTester.java | 2 +- .../tests/ice/item}/ItemBuilderTester.java | 2 +- .../eclipse/tests/ice/item}/ItemTester.java | 2 +- .../ice/item}/JobLauncherFormTester.java | 2 +- .../tests/ice/item}/JobLauncherTester.java | 2 +- .../ice/item}/JobProfileBuilderTester.java | 2 +- .../tests/ice/item}/JobProfileFormTester.java | 2 +- .../tests/ice/item}/JobProfileTester.java | 2 +- .../tests/ice/item}/LoginInfoFormTester.java | 2 +- .../tests/ice/item}/MultiLauncherTester.java | 2 +- .../tests/ice/item}/ParameterListTester.java | 2 +- .../tests/ice/item}/RegistryTester.java | 2 +- .../item}/SerializedItemBuilderTester.java | 2 +- .../tests/ice/item}/SuiteLauncherTester.java | 2 +- .../item}/TaggedOutputWriterActionTester.java | 2 +- .../eclipse/tests/ice/item}/TestAction.java | 2 +- .../org/eclipse/tests/ice/item}/TestItem.java | 2 +- .../tests/ice/item}/TestItemBuilder.java | 2 +- .../tests/ice/item}/TestJobLauncher.java | 2 +- .../eclipse/tests/ice/item}/YAMLTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../MaterialStackWritableTableFormatTest.java | 2 +- .../MaterialWritableTableFormatTester.java | 2 +- ...ngleMaterialWritableTableFormatTester.java | 2 +- .../tests/materials}/TestMaterialFactory.java | 2 +- .../materials}/XMLMaterialDatabaseTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../tests/mesh}/MeshEditorBuilderTester.java | 2 +- .../ice/tests/mesh}/MeshEditorTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.nek5000/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../tests/nek5000}/NekModelBuilderTester.java | 2 +- .../ice/tests/nek5000}/NekModelTester.java | 2 +- .../ice/tests/nek5000}/NekReaderTester.java | 2 +- .../ice/tests/nek5000}/NekWriterTester.java | 2 +- .../nek5000}/ProblemPropertiesTester.java | 2 +- .../nek5000}/TestNekControllerFactory.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 0 .../pom.xml | 2 +- .../tests/parsergenerator}/GrammarTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../xml}/XMLFormContentDescriberTester.java | 2 +- .../XMLPersistenceExtensionFactoryTester.java | 2 +- .../xml}/XMLPersistenceProviderTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../ItemGenTester.launch | 86 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 0 .../plugin.xml | 2 +- .../pom.xml | 2 +- .../NewICEItemProjectTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.proteus/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../PROTEUSLauncherBuilderTester.java | 2 +- .../tests/proteus}/PROTEUSLauncherTester.java | 2 +- .../proteus}/PROTEUSModelBuilderTester.java | 2 +- .../tests/proteus}/PROTEUSModelTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 org.eclipse.ice.tests.reactor.plant/pom.xml | 18 ++++ .../tests/reactor/plant}/BoundaryTester.java | 2 +- .../tests/reactor/plant}/BranchTester.java | 2 +- .../reactor/plant}/CoreChannelTester.java | 2 +- .../tests/reactor/plant}/DownComerTester.java | 2 +- .../reactor/plant}/FlowJunctionTester.java | 2 +- .../plant}/GeometricalComponentTester.java | 2 +- .../reactor/plant}/HeatExchangerTester.java | 2 +- .../tests/reactor/plant}/IdealPumpTester.java | 2 +- .../ice/tests/reactor/plant}/InletTester.java | 2 +- .../tests/reactor/plant}/JunctionTester.java | 2 +- .../reactor/plant}/MassFlowInletTester.java | 2 +- .../plant}/OneInOneOutJunctionTester.java | 2 +- .../tests/reactor/plant}/OutletTester.java | 2 +- .../ice/tests/reactor/plant}/PipeTester.java | 2 +- .../plant}/PipeToPipeJunctionTester.java | 2 +- .../plant}/PipeWithHeatStructureTester.java | 2 +- .../reactor/plant}/PlantComponentTester.java | 2 +- .../reactor/plant}/PlantCompositeTester.java | 2 +- .../reactor/plant}/PointKineticsTester.java | 2 +- .../ice/tests/reactor/plant}/PumpTester.java | 2 +- .../tests/reactor/plant}/ReactorTester.java | 2 +- .../reactor/plant}/SeparatorDryerTester.java | 2 +- .../tests/reactor/plant}/SolidWallTester.java | 2 +- ...pecifiedDensityAndVelocityInletTester.java | 2 +- .../plant}/SubchannelBranchTester.java | 2 +- .../reactor/plant}/SubchannelTester.java | 2 +- .../ice/tests/reactor/plant}/TDMTester.java | 2 +- .../plant}/TimeDependentJunctionTester.java | 2 +- .../plant}/TimeDependentVolumeTester.java | 2 +- .../tests/reactor/plant}/TurbineTester.java | 2 +- .../ice/tests/reactor/plant}/ValveTester.java | 2 +- .../reactor/plant}/VolumeBranchTester.java | 2 +- .../tests/reactor/plant}/WetWellTester.java | 2 +- .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.reflectivity/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../about.html | 0 .../build.properties | 0 org.eclipse.ice.tests.reflectivity/pom.xml | 18 ++++ .../ReflectivityCalculatorTester.java | 2 +- .../ReflectivityModelBuilderTester.java | 2 +- .../ReflectivityModelTester.java | 2 +- ...ectivityXMLFormContentDescriberTester.java | 4 +- .../.classpath | 0 .../.gitignore | 0 org.eclipse.ice.tests.ui.swtbot/.project | 34 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../MOOSETester.launch | 6 +- .../MaterialsDatabaseTester.launch | 6 +- .../ReflectivityModelTester.launch | 6 +- .../VIBEKeyValuePairTester.launch | 6 +- .../VIBELauncher.launch | 6 +- .../VIBEModel.launch | 6 +- .../build.properties | 0 .../pom.xml | 0 .../ui/swtbot}/FakeMaterialsDatabase.java | 2 +- .../ice/tests/ui/swtbot}/MOOSETester.java | 4 +- .../ui/swtbot}/MaterialsDatabaseTester.java | 4 +- .../ui/swtbot}/ReflectivityModelTester.java | 4 +- .../ice/tests/ui/swtbot}/SWTBotNatTable.java | 2 +- .../ui/swtbot}/VIBEKeyValuePairTester.java | 4 +- .../tests/ui/swtbot}/VIBELauncherTester.java | 4 +- .../ice/tests/ui/swtbot}/VIBEModelTester.java | 4 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../pom.xml | 2 +- .../vibe/kvPair}/VibeKVPairBuilderTester.java | 2 +- .../vibe/kvPair}/VibeKVPairRowTester.java | 2 +- .../tests/vibe/kvPair}/VibeKVPairTester.java | 2 +- .../launcher}/VibeLauncherBuilderTester.java | 2 +- .../vibe/launcher}/VibeLauncherTester.java | 2 +- .../vibe/model}/VibeModelBuilderTester.java | 2 +- .../tests/vibe/model}/VibeModelTester.java | 2 +- org.eclipse.ice.ui.swtbot.test/.project | 34 -------- 455 files changed, 760 insertions(+), 748 deletions(-) delete mode 100644 org.eclipse.ice.io.test/.project delete mode 100644 org.eclipse.ice.nek5000.test/.project delete mode 100644 org.eclipse.ice.persistence.xml.test/.project delete mode 100644 org.eclipse.ice.projectgeneration.test/.project delete mode 100644 org.eclipse.ice.proteus.test/.project delete mode 100644 org.eclipse.ice.reactor.plant.test/.project delete mode 100644 org.eclipse.ice.reactor.plant.test/pom.xml delete mode 100644 org.eclipse.ice.reflectivity.test/.project delete mode 100644 org.eclipse.ice.reflectivity.test/pom.xml rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/.classpath (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/.gitignore (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/.project (94%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/META-INF/MANIFEST.MF (88%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/about.html (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/build.properties (100%) rename {org.eclipse.ice.caebat.batml.test => org.eclipse.ice.tests.caebat.batml}/pom.xml (91%) rename {org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test => org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml}/BatMLModelBuilderTester.java (98%) rename {org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test => org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml}/BatMLModelTester.java (99%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/.classpath (100%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/.gitignore (100%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/.project (93%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client.widgets.moose}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/META-INF/MANIFEST.MF (80%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.moose}/build.properties (100%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.moose}/pom.xml (90%) rename {org.eclipse.ice.client.widgets.moose.test/src/org/eclipse/ice/client/widgets/moose/test => org.eclipse.ice.tests.client.widgets.moose/src/org/eclipse/ice/tests/client/widgets/moose}/MooseXMLFormContentDescriberTester.java (94%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/.classpath (100%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/.gitignore (100%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/.project (89%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.utils}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/META-INF/MANIFEST.MF (76%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets.utils}/build.properties (100%) rename {org.eclipse.ice.client.widgets.moose.test => org.eclipse.ice.tests.client.widgets.utils}/pom.xml (90%) rename {org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets}/utils/AbstractICEUITester.java (96%) rename {org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets}/utils/AbstractSWTTester.java (95%) rename {org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets}/utils/AbstractWorkbenchTester.java (96%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client.widgets}/.classpath (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.client.widgets/.project rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.client.widgets.test.utils => org.eclipse.ice.tests.client.widgets}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client.widgets}/FileSimulationTester.launch (97%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/META-INF/MANIFEST.MF (85%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client.widgets}/about.html (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/build.properties (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client.widgets}/pom.xml (95%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ActionTreeTester.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EMFSectionPageTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EclipseErrorBoxWidgetTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EclipseExtraInfoWidgetTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EclipseFormWidgetTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EclipseTextEditorTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EclipseUIWidgetFactoryTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/EntryCompositeTester.java (92%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ExtraInfoDialogTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/FileSimulationTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEDataComponentSectionPartTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEFormEditorTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEGeometryPageTester.java (97%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEMasterDetailsPageTester.java (99%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEMatrixComponentSectionPartTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICEResourcePageTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICESectionPageTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ICETableComponentSectionPartTester.java (99%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/IFormWidgetBuilderTest.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ListComponentColumnPropertyAccessorTester.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/ListComponentNattableTest.java (99%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/TestListener.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/geometry/GeometryEditorInputTester.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/geometry/ShapeTreeContentProviderTest.java (99%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets}/geometry/ShapeTreeLabelProviderTest.java (98%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/Activator.java (93%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/CellTester.java (95%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/EditPartFactoryTester.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/GridDataTester.java (94%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/GridEditorInputTester.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/GridTester.java (96%) rename {org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test => org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid}/GridViewerLauncher.java (96%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client}/.classpath (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/.gitignore (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/.project (95%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/META-INF/MANIFEST.MF (91%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.client}/about.html (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/build.properties (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/fakeCoreTestFile (100%) rename {org.eclipse.ice.client.test => org.eclipse.ice.tests.client}/pom.xml (95%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/ClientExtensionFactoryTester.java (97%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/ClientTester.java (99%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeCore.java (99%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeErrorBoxWidget.java (98%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeExtraInfoWidget.java (98%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeFormWidget.java (99%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeItemProcessor.java (99%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeStreamingTextWidget.java (98%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeTextEditor.java (98%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/FakeUIWidgetFactory.java (99%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/IClientTester.java (96%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/IWidgetFactoryTester.java (97%) rename {org.eclipse.ice.client.test/src/org/eclipse/ice/client/test => org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client}/ItemProcessorTester.java (99%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/.classpath (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/.gitignore (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/.project (94%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/META-INF/MANIFEST.MF (87%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/about.html (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/build.properties (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/plugin.xml (100%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/pom.xml (91%) rename {org.eclipse.ice.core.jaxrs.test => org.eclipse.ice.tests.core.jaxrs}/schema/ItemBuilder.exsd (100%) rename {org.eclipse.ice.core.jaxrs.test/src/org/eclipse/ice/core/jaxrs/test => org.eclipse.ice.tests.core.jaxrs/src/org/eclipse/ice/tests/core/jaxrs}/JAXRSTester.java (98%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.classpath (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.gitignore (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.project (92%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/META-INF/MANIFEST.MF (90%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/about.html (100%) rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/build.properties (100%) create mode 100644 org.eclipse.ice.tests.core/defaultUser/default/.project rename {org.eclipse.ice.core.test => org.eclipse.ice.tests.core}/pom.xml (92%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/CoreTester.java (99%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakeCompositeItemBuilder.java (98%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakeGeometryBuilder.java (98%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakeIFile.java (99%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakeItem.java (99%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakeModuleBuilder.java (97%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/FakePersistenceProvider.java (99%) rename {org.eclipse.ice.core.test/src/org/eclipse/ice/core/test => org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core}/ItemManagerTester.java (99%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.classpath (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.gitignore (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.project (95%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/META-INF/MANIFEST.MF (88%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/about.html (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/build.properties (100%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/plugin.xml (79%) rename {org.eclipse.ice.datastructures.test => org.eclipse.ice.tests.datastructures}/pom.xml (92%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/AdaptiveTreeCompositeTester.java (96%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/DataComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/EMFComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/EMFEntryTester.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/EMFTreeCompositeTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/FakeJAXBClassProvider.java (96%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/FormTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/GeometryComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/GeometryTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ICEJAXBClassProviderTester.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ICEJAXBHandlerTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ICEListTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ICEObjectTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ICEResourceTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/IJAXBClassProviderTester.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ListComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MasterDetailsPairTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MasterDetailsTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MaterialStackTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MaterialTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MatrixComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/MeshComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/PainfullySimpleFormTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ResourceComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/ResourceHandlerTester.java (96%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/SimpleJAXBTestClass.java (97%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TableComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TestComponentListener.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TestListComponentListener.java (94%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TestMaterialFactory.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TestVisitor.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TimeDataComponentTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TreeCompositeIteratorTester.java (96%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/TreeCompositeTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/VizResourceTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures}/WrappedGlazedEventListenerTester.java (98%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/AbstractEntryTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/ContinuousEntryTester.java (97%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/DiscreteEntryTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/FileEntryTester.java (99%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/StringEntryTester.java (97%) rename {org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test => org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry}/TestableAbstractEntry.java (97%) rename {org.eclipse.ice.installer.test => org.eclipse.ice.tests.installer}/.project (88%) rename {org.eclipse.ice.installer.test => org.eclipse.ice.tests.installer}/.pydevproject (100%) rename {org.eclipse.ice.installer.test => org.eclipse.ice.tests.installer}/Test_ICE_Installer.py (100%) rename {org.eclipse.ice.installer.test => org.eclipse.ice.tests.installer}/__init__.py (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/.classpath (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.io/.project rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/META-INF/MANIFEST.MF (89%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/about.html (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/build.properties (100%) rename {org.eclipse.ice.io.test => org.eclipse.ice.tests.io}/pom.xml (90%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv}/CSVReaderTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv}/SpaceReaderTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini}/INIReaderTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini}/INIWriterTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips}/IPSReaderTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips}/IPSWriterTester.java (99%) rename {org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test => org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/serializable}/IOServiceTester.java (98%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/.classpath (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/.gitignore (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/.project (95%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/META-INF/MANIFEST.MF (94%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/about.html (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/build.properties (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/ls_stdout_1.txt (100%) rename {org.eclipse.ice.item.test => org.eclipse.ice.tests.item}/pom.xml (92%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/messaging/MessageTester.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/moose/BlockTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/moose/MOOSEFileHandlerTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/moose/ParameterTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/moose/YAMLBlockTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/nuclear/MOOSELauncherTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/nuclear/MOOSEModelBuilderTester.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/nuclear/MOOSEModelTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item}/nuclear/MOOSETester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/AbstractItemBuilderTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/AbstractModelBuilderTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ActionTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/DockerClientFactoryTester.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeActionFactory.java (96%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeDataComponent.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeIOService.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeIWriter.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeItemBuilder.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeMaterialsDatabase.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeModel.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/FakeModelBuilder.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/GeometryEditorBuilderTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/GeometryEditorTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ICEActionFactoryTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ICEDatabaseValidator.java (95%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ICEDatabaseValidatorTester.java (96%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ICEJschUIInfoTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/IPersistenceProviderTester.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ItemBuilderTester.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ItemTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/JobLauncherFormTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/JobLauncherTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/JobProfileBuilderTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/JobProfileFormTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/JobProfileTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/LoginInfoFormTester.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/MultiLauncherTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/ParameterListTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/RegistryTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/SerializedItemBuilderTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/SuiteLauncherTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/TaggedOutputWriterActionTester.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/TestAction.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/TestItem.java (99%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/TestItemBuilder.java (97%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/TestJobLauncher.java (98%) rename {org.eclipse.ice.item.test/src/org/eclipse/ice/item/test => org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item}/YAMLTester.java (98%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.classpath (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.gitignore (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.project (94%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/META-INF/MANIFEST.MF (86%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/about.html (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/build.properties (100%) rename {org.eclipse.ice.materials.test => org.eclipse.ice.tests.materials}/pom.xml (91%) rename {org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test => org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials}/MaterialStackWritableTableFormatTest.java (99%) rename {org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test => org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials}/MaterialWritableTableFormatTester.java (99%) rename {org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test => org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials}/SingleMaterialWritableTableFormatTester.java (98%) rename {org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test => org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials}/TestMaterialFactory.java (98%) rename {org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test => org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials}/XMLMaterialDatabaseTester.java (99%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/.classpath (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/.gitignore (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.mesh}/.project (95%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/META-INF/MANIFEST.MF (86%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/about.html (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/build.properties (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.mesh}/pom.xml (92%) rename {org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test => org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh}/MeshEditorBuilderTester.java (97%) rename {org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test => org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh}/MeshEditorTester.java (97%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/.classpath (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.nek5000/.project rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/META-INF/MANIFEST.MF (93%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/about.html (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/build.properties (100%) rename {org.eclipse.ice.nek5000.test => org.eclipse.ice.tests.nek5000}/pom.xml (91%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/NekModelBuilderTester.java (97%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/NekModelTester.java (99%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/NekReaderTester.java (97%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/NekWriterTester.java (96%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/ProblemPropertiesTester.java (95%) rename {org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test => org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000}/TestNekControllerFactory.java (95%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/.classpath (100%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/.gitignore (100%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/.project (92%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/META-INF/MANIFEST.MF (74%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/build.properties (100%) rename {org.eclipse.ice.parsergenerator.test => org.eclipse.ice.tests.parsergenerator}/pom.xml (90%) rename {org.eclipse.ice.parsergenerator.test/src/org/eclipse/ice/parsergenerator/test => org.eclipse.ice.tests.parsergenerator/src/org/eclipse/ice/tests/parsergenerator}/GrammarTester.java (97%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/.classpath (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.persistence.xml/.project rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/META-INF/MANIFEST.MF (81%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/about.html (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/build.properties (100%) rename {org.eclipse.ice.persistence.xml.test => org.eclipse.ice.tests.persistence.xml}/pom.xml (91%) rename {org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test => org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml}/XMLFormContentDescriberTester.java (98%) rename {org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test => org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml}/XMLPersistenceExtensionFactoryTester.java (97%) rename {org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test => org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml}/XMLPersistenceProviderTester.java (99%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/.classpath (100%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.projectgeneration/.project rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/ItemGenTester.launch (99%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/META-INF/MANIFEST.MF (84%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/build.properties (100%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/plugin.xml (84%) rename {org.eclipse.ice.projectgeneration.test => org.eclipse.ice.tests.projectgeneration}/pom.xml (95%) rename {org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test => org.eclipse.ice.tests.projectgeneration/src/org/eclipse/ice/tests/projectgeneration}/NewICEItemProjectTester.java (98%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/.classpath (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.proteus/.project rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/META-INF/MANIFEST.MF (93%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/about.html (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/build.properties (100%) rename {org.eclipse.ice.proteus.test => org.eclipse.ice.tests.proteus}/pom.xml (91%) rename {org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test => org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus}/PROTEUSLauncherBuilderTester.java (95%) rename {org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test => org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus}/PROTEUSLauncherTester.java (96%) rename {org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test => org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus}/PROTEUSModelBuilderTester.java (95%) rename {org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test => org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus}/PROTEUSModelTester.java (96%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/.classpath (100%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/.gitignore (100%) rename {org.eclipse.ice.client.widgets.test => org.eclipse.ice.tests.reactor.plant}/.project (94%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/META-INF/MANIFEST.MF (88%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/about.html (100%) rename {org.eclipse.ice.reactor.plant.test => org.eclipse.ice.tests.reactor.plant}/build.properties (100%) create mode 100644 org.eclipse.ice.tests.reactor.plant/pom.xml rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/BoundaryTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/BranchTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/CoreChannelTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/DownComerTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/FlowJunctionTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/GeometricalComponentTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/HeatExchangerTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/IdealPumpTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/InletTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/JunctionTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/MassFlowInletTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/OneInOneOutJunctionTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/OutletTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PipeTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PipeToPipeJunctionTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PipeWithHeatStructureTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PlantComponentTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PlantCompositeTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PointKineticsTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/PumpTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/ReactorTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/SeparatorDryerTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/SolidWallTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/SpecifiedDensityAndVelocityInletTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/SubchannelBranchTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/SubchannelTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/TDMTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/TimeDependentJunctionTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/TimeDependentVolumeTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/TurbineTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/ValveTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/VolumeBranchTester.java (99%) rename {org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test => org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant}/WetWellTester.java (99%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/.classpath (100%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.reflectivity/.project rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/META-INF/MANIFEST.MF (87%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/about.html (100%) rename {org.eclipse.ice.reflectivity.test => org.eclipse.ice.tests.reflectivity}/build.properties (100%) create mode 100644 org.eclipse.ice.tests.reflectivity/pom.xml rename {org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test => org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity}/ReflectivityCalculatorTester.java (99%) rename {org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test => org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity}/ReflectivityModelBuilderTester.java (98%) rename {org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test => org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity}/ReflectivityModelTester.java (98%) rename {org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test => org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity}/ReflectivityXMLFormContentDescriberTester.java (93%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/.classpath (100%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/.gitignore (100%) create mode 100644 org.eclipse.ice.tests.ui.swtbot/.project rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/META-INF/MANIFEST.MF (89%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/MOOSETester.launch (99%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/MaterialsDatabaseTester.launch (98%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/ReflectivityModelTester.launch (99%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/VIBEKeyValuePairTester.launch (99%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/VIBELauncher.launch (99%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/VIBEModel.launch (99%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/build.properties (100%) rename {org.eclipse.ice.ui.swtbot.test => org.eclipse.ice.tests.ui.swtbot}/pom.xml (100%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/FakeMaterialsDatabase.java (95%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/MOOSETester.java (95%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/MaterialsDatabaseTester.java (96%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/ReflectivityModelTester.java (95%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/SWTBotNatTable.java (95%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/VIBEKeyValuePairTester.java (94%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/VIBELauncherTester.java (93%) rename {org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test => org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot}/VIBEModelTester.java (94%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/.classpath (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/.gitignore (100%) rename {org.eclipse.ice.mesh.test => org.eclipse.ice.tests.vibe}/.project (95%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/META-INF/MANIFEST.MF (85%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/about.html (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/build.properties (100%) rename {org.eclipse.ice.vibe.test => org.eclipse.ice.tests.vibe}/pom.xml (92%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair}/VibeKVPairBuilderTester.java (99%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair}/VibeKVPairRowTester.java (95%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair}/VibeKVPairTester.java (99%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher}/VibeLauncherBuilderTester.java (99%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher}/VibeLauncherTester.java (99%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model}/VibeModelBuilderTester.java (98%) rename {org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test => org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model}/VibeModelTester.java (99%) delete mode 100644 org.eclipse.ice.ui.swtbot.test/.project diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml index 0708790e4..25eb0988b 100644 --- a/org.eclipse.ice.aggregator/pom.xml +++ b/org.eclipse.ice.aggregator/pom.xml @@ -13,49 +13,49 @@ ../org.eclipse.ice.caebat.batml - ../org.eclipse.ice.caebat.batml.test + ../org.eclipse.ice.tests.caebat.batml ../org.eclipse.ice.client ../org.eclipse.ice.client.compatibility ../org.eclipse.ice.client.rcp - ../org.eclipse.ice.client.test + ../org.eclipse.ice.tests.client ../org.eclipse.ice.client.widgets ../org.eclipse.ice.client.widgets.moose - ../org.eclipse.ice.client.widgets.moose.test - ../org.eclipse.ice.client.widgets.test - ../org.eclipse.ice.client.widgets.test.utils + ../org.eclipse.ice.tests.client.widgets.moose + ../org.eclipse.ice.tests.client.widgets + ../org.eclipse.ice.tests.client.widgets.utils ../org.eclipse.ice.core - ../org.eclipse.ice.core.test + ../org.eclipse.ice.tests.core ../org.eclipse.ice.datastructures - ../org.eclipse.ice.datastructures.test + ../org.eclipse.ice.tests.datastructures ../org.eclipse.ice.developer ../org.eclipse.ice.developer.moose ../org.eclipse.ice.io - ../org.eclipse.ice.io.test + ../org.eclipse.ice.tests.io ../org.eclipse.ice.item - ../org.eclipse.ice.item.test + ../org.eclipse.ice.tests.item ../org.eclipse.ice.materials - ../org.eclipse.ice.materials.test + ../org.eclipse.ice.tests.materials ../org.eclipse.ice.materials.ui ../org.eclipse.ice.materials.feature ../org.eclipse.ice.mesh - ../org.eclipse.ice.mesh.test + ../org.eclipse.ice.tests.mesh ../org.eclipse.ice.nek5000 - ../org.eclipse.ice.nek5000.test + ../org.eclipse.ice.tests.nek5000 ../org.eclipse.ice.parent ../org.eclipse.ice.persistence.xml - ../org.eclipse.ice.persistence.xml.test + ../org.eclipse.ice.tests.persistence.xml ../org.eclipse.ice.projectgeneration - ../org.eclipse.ice.projectgeneration.test + ../org.eclipse.ice.tests.projectgeneration ../org.eclipse.ice.proteus - ../org.eclipse.ice.proteus.test + ../org.eclipse.ice.tests.proteus ../org.eclipse.ice.reactor.plant - ../org.eclipse.ice.reactor.plant.test + ../org.eclipse.ice.tests.reactor.plant ../org.eclipse.ice.reflectivity - ../org.eclipse.ice.reflectivity.test + ../org.eclipse.ice.tests.reflectivity ../org.eclipse.ice.reflectivity.ui ../org.eclipse.ice.target.neon ../org.eclipse.ice.vibe - ../org.eclipse.ice.vibe.test + ../org.eclipse.ice.tests.vibe ../org.eclipse.ice.feature ../org.eclipse.ice.repository ../org.eclipse.ice.product diff --git a/org.eclipse.ice.core.test/defaultUser/default/.project b/org.eclipse.ice.core.test/defaultUser/default/.project index 8888d3b45..142048e3d 100644 --- a/org.eclipse.ice.core.test/defaultUser/default/.project +++ b/org.eclipse.ice.core.test/defaultUser/default/.project @@ -1,11 +1,11 @@ - - - default - - - - - - - - + + + default + + + + + + + + diff --git a/org.eclipse.ice.io.test/.project b/org.eclipse.ice.io.test/.project deleted file mode 100644 index 7ea611d88..000000000 --- a/org.eclipse.ice.io.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.io.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.nek5000.test/.project b/org.eclipse.ice.nek5000.test/.project deleted file mode 100644 index 362ef679b..000000000 --- a/org.eclipse.ice.nek5000.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.nek5000.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.persistence.xml.test/.project b/org.eclipse.ice.persistence.xml.test/.project deleted file mode 100644 index af6f14935..000000000 --- a/org.eclipse.ice.persistence.xml.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.persistence.xml.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.projectgeneration.test/.project b/org.eclipse.ice.projectgeneration.test/.project deleted file mode 100644 index 0536b48c0..000000000 --- a/org.eclipse.ice.projectgeneration.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.projectgeneration.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.proteus.test/.project b/org.eclipse.ice.proteus.test/.project deleted file mode 100644 index 19fbb2bca..000000000 --- a/org.eclipse.ice.proteus.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.proteus.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.reactor.plant.test/.project b/org.eclipse.ice.reactor.plant.test/.project deleted file mode 100644 index 4037b8d40..000000000 --- a/org.eclipse.ice.reactor.plant.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.reactor.plant.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.reactor.plant.test/pom.xml b/org.eclipse.ice.reactor.plant.test/pom.xml deleted file mode 100644 index a5b42daf9..000000000 --- a/org.eclipse.ice.reactor.plant.test/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT - ../org.eclipse.ice.parent/pom.xml - - org.eclipse.ice - org.eclipse.ice.reactor.plant.test - eclipse-test-plugin - - true - - diff --git a/org.eclipse.ice.reflectivity.test/.project b/org.eclipse.ice.reflectivity.test/.project deleted file mode 100644 index d3b58df44..000000000 --- a/org.eclipse.ice.reflectivity.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.reflectivity.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.ice.reflectivity.test/pom.xml b/org.eclipse.ice.reflectivity.test/pom.xml deleted file mode 100644 index 9052b790d..000000000 --- a/org.eclipse.ice.reflectivity.test/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT - ../org.eclipse.ice.parent/pom.xml - - org.eclipse.ice - org.eclipse.ice.reflectivity.test - eclipse-test-plugin - - true - - diff --git a/org.eclipse.ice.caebat.batml.test/.classpath b/org.eclipse.ice.tests.caebat.batml/.classpath similarity index 100% rename from org.eclipse.ice.caebat.batml.test/.classpath rename to org.eclipse.ice.tests.caebat.batml/.classpath diff --git a/org.eclipse.ice.caebat.batml.test/.gitignore b/org.eclipse.ice.tests.caebat.batml/.gitignore similarity index 100% rename from org.eclipse.ice.caebat.batml.test/.gitignore rename to org.eclipse.ice.tests.caebat.batml/.gitignore diff --git a/org.eclipse.ice.caebat.batml.test/.project b/org.eclipse.ice.tests.caebat.batml/.project similarity index 94% rename from org.eclipse.ice.caebat.batml.test/.project rename to org.eclipse.ice.tests.caebat.batml/.project index 385ea6f4c..29df0749f 100644 --- a/org.eclipse.ice.caebat.batml.test/.project +++ b/org.eclipse.ice.tests.caebat.batml/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.caebat.batml.test + org.eclipse.ice.tests.caebat.batml diff --git a/org.eclipse.ice.caebat.batml.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.caebat.batml/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.caebat.batml.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.caebat.batml/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.caebat.batml.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.caebat.batml/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.caebat.batml.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.caebat.batml/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.caebat.batml.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF similarity index 88% rename from org.eclipse.ice.caebat.batml.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF index d3daac73d..240c96073 100644 --- a/org.eclipse.ice.caebat.batml.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BatMLTest -Bundle-SymbolicName: org.eclipse.ice.caebat.batml.test +Bundle-SymbolicName: org.eclipse.ice.tests.caebat.batml Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0", diff --git a/org.eclipse.ice.caebat.batml.test/about.html b/org.eclipse.ice.tests.caebat.batml/about.html similarity index 100% rename from org.eclipse.ice.caebat.batml.test/about.html rename to org.eclipse.ice.tests.caebat.batml/about.html diff --git a/org.eclipse.ice.caebat.batml.test/build.properties b/org.eclipse.ice.tests.caebat.batml/build.properties similarity index 100% rename from org.eclipse.ice.caebat.batml.test/build.properties rename to org.eclipse.ice.tests.caebat.batml/build.properties diff --git a/org.eclipse.ice.caebat.batml.test/pom.xml b/org.eclipse.ice.tests.caebat.batml/pom.xml similarity index 91% rename from org.eclipse.ice.caebat.batml.test/pom.xml rename to org.eclipse.ice.tests.caebat.batml/pom.xml index ab29d3324..5d9ebe26e 100644 --- a/org.eclipse.ice.caebat.batml.test/pom.xml +++ b/org.eclipse.ice.tests.caebat.batml/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.caebat.batml.test + org.eclipse.ice.tests.caebat.batml eclipse-test-plugin true diff --git a/org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelBuilderTester.java b/org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelBuilderTester.java similarity index 98% rename from org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelBuilderTester.java rename to org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelBuilderTester.java index 95970ab48..fc63f9305 100644 --- a/org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelBuilderTester.java +++ b/org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.caebat.batml.test; +package org.eclipse.ice.tests.caebat.batml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelTester.java b/org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelTester.java similarity index 99% rename from org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelTester.java rename to org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelTester.java index 603b85235..ae7b8b18e 100644 --- a/org.eclipse.ice.caebat.batml.test/src/org/eclipse/ice/caebat/batml/test/BatMLModelTester.java +++ b/org.eclipse.ice.tests.caebat.batml/src/org/eclipse/ice/tests/caebat/batml/BatMLModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.caebat.batml.test; +package org.eclipse.ice.tests.caebat.batml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.moose.test/.classpath b/org.eclipse.ice.tests.client.widgets.moose/.classpath similarity index 100% rename from org.eclipse.ice.client.widgets.moose.test/.classpath rename to org.eclipse.ice.tests.client.widgets.moose/.classpath diff --git a/org.eclipse.ice.client.widgets.moose.test/.gitignore b/org.eclipse.ice.tests.client.widgets.moose/.gitignore similarity index 100% rename from org.eclipse.ice.client.widgets.moose.test/.gitignore rename to org.eclipse.ice.tests.client.widgets.moose/.gitignore diff --git a/org.eclipse.ice.client.widgets.moose.test/.project b/org.eclipse.ice.tests.client.widgets.moose/.project similarity index 93% rename from org.eclipse.ice.client.widgets.moose.test/.project rename to org.eclipse.ice.tests.client.widgets.moose/.project index 102b0ef44..fcb561834 100644 --- a/org.eclipse.ice.client.widgets.moose.test/.project +++ b/org.eclipse.ice.tests.client.widgets.moose/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.client.widgets.moose.test + org.eclipse.ice.tests.client.widgets.moose diff --git a/org.eclipse.ice.client.widgets.moose.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.moose.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.client.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.client.widgets.moose/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.client.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.client.widgets.moose/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.client.widgets.moose.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF similarity index 80% rename from org.eclipse.ice.client.widgets.moose.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF index a521e2425..f029a63c4 100644 --- a/org.eclipse.ice.client.widgets.moose.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: MOOSE Widgets Test -Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose.test +Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.moose Bundle-Version: 2.2.0.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ice.client.widgets.moose, org.eclipse.ice.datastructures.form, org.eclipse.ice.persistence.xml, - org.eclipse.ice.persistence.xml.test + org.eclipse.ice.tests.persistence.xml Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", org.junit;bundle-version="4.12.0" diff --git a/org.eclipse.ice.client.widgets.moose.test/build.properties b/org.eclipse.ice.tests.client.widgets.moose/build.properties similarity index 100% rename from org.eclipse.ice.client.widgets.moose.test/build.properties rename to org.eclipse.ice.tests.client.widgets.moose/build.properties diff --git a/org.eclipse.ice.client.widgets.test.utils/pom.xml b/org.eclipse.ice.tests.client.widgets.moose/pom.xml similarity index 90% rename from org.eclipse.ice.client.widgets.test.utils/pom.xml rename to org.eclipse.ice.tests.client.widgets.moose/pom.xml index dd23c717a..831130b1c 100644 --- a/org.eclipse.ice.client.widgets.test.utils/pom.xml +++ b/org.eclipse.ice.tests.client.widgets.moose/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.client.widgets.test.utils + org.eclipse.ice.tests.client.widgets.moose eclipse-plugin true diff --git a/org.eclipse.ice.client.widgets.moose.test/src/org/eclipse/ice/client/widgets/moose/test/MooseXMLFormContentDescriberTester.java b/org.eclipse.ice.tests.client.widgets.moose/src/org/eclipse/ice/tests/client/widgets/moose/MooseXMLFormContentDescriberTester.java similarity index 94% rename from org.eclipse.ice.client.widgets.moose.test/src/org/eclipse/ice/client/widgets/moose/test/MooseXMLFormContentDescriberTester.java rename to org.eclipse.ice.tests.client.widgets.moose/src/org/eclipse/ice/tests/client/widgets/moose/MooseXMLFormContentDescriberTester.java index ab87cd315..42e4f7db8 100644 --- a/org.eclipse.ice.client.widgets.moose.test/src/org/eclipse/ice/client/widgets/moose/test/MooseXMLFormContentDescriberTester.java +++ b/org.eclipse.ice.tests.client.widgets.moose/src/org/eclipse/ice/tests/client/widgets/moose/MooseXMLFormContentDescriberTester.java @@ -1,10 +1,10 @@ -package org.eclipse.ice.client.widgets.moose.test; +package org.eclipse.ice.tests.client.widgets.moose; import java.io.ByteArrayInputStream; import java.io.IOException; import org.eclipse.ice.persistence.xml.XMLFormContentDescriber; -import org.eclipse.ice.persistence.xml.test.XMLFormContentDescriberTester; +import org.eclipse.ice.tests.persistence.xml.XMLFormContentDescriberTester; import org.eclipse.ice.client.widgets.moose.MooseXMLFormContentDescriber; /** diff --git a/org.eclipse.ice.client.widgets.test.utils/.classpath b/org.eclipse.ice.tests.client.widgets.utils/.classpath similarity index 100% rename from org.eclipse.ice.client.widgets.test.utils/.classpath rename to org.eclipse.ice.tests.client.widgets.utils/.classpath diff --git a/org.eclipse.ice.client.widgets.test.utils/.gitignore b/org.eclipse.ice.tests.client.widgets.utils/.gitignore similarity index 100% rename from org.eclipse.ice.client.widgets.test.utils/.gitignore rename to org.eclipse.ice.tests.client.widgets.utils/.gitignore diff --git a/org.eclipse.ice.client.widgets.test.utils/.project b/org.eclipse.ice.tests.client.widgets.utils/.project similarity index 89% rename from org.eclipse.ice.client.widgets.test.utils/.project rename to org.eclipse.ice.tests.client.widgets.utils/.project index 60e79e074..a0dabb87d 100644 --- a/org.eclipse.ice.client.widgets.test.utils/.project +++ b/org.eclipse.ice.tests.client.widgets.utils/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.client.widgets.test.utils + org.eclipse.ice.tests.client.widgets.utils diff --git a/org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.client.widgets.utils/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.client.widgets.utils/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.client.widgets.moose.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.client.widgets.utils/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.moose.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.client.widgets.utils/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF similarity index 76% rename from org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF index 7171a13e0..a05296eb1 100644 --- a/org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Client Widget Test Utilities -Bundle-SymbolicName: org.eclipse.ice.client.widgets.test.utils +Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.utils Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ice.datastructures, @@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.ice.datastructures, org.eclipse.swtbot.go Import-Package: org.eclipse.ice.client.widgets, org.eclipse.ice.datastructures.form -Export-Package: org.eclipse.ice.client.widgets.test.utils +Export-Package: org.eclipse.ice.tests.client.widgets.utils diff --git a/org.eclipse.ice.client.widgets.test.utils/build.properties b/org.eclipse.ice.tests.client.widgets.utils/build.properties similarity index 100% rename from org.eclipse.ice.client.widgets.test.utils/build.properties rename to org.eclipse.ice.tests.client.widgets.utils/build.properties diff --git a/org.eclipse.ice.client.widgets.moose.test/pom.xml b/org.eclipse.ice.tests.client.widgets.utils/pom.xml similarity index 90% rename from org.eclipse.ice.client.widgets.moose.test/pom.xml rename to org.eclipse.ice.tests.client.widgets.utils/pom.xml index e7133e5eb..34bca6851 100644 --- a/org.eclipse.ice.client.widgets.moose.test/pom.xml +++ b/org.eclipse.ice.tests.client.widgets.utils/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.client.widgets.moose.test + org.eclipse.ice.tests.client.widgets.utils eclipse-plugin true diff --git a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractICEUITester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java rename to org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractICEUITester.java index 10a101f43..2b09d92a4 100644 --- a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractICEUITester.java @@ -9,7 +9,7 @@ * Jordan Deyton - Initial API and implementation and/or initial documentation * *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.utils; +package org.eclipse.ice.tests.client.widgets.utils; import java.io.BufferedWriter; import java.io.File; diff --git a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractSWTTester.java similarity index 95% rename from org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java rename to org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractSWTTester.java index 764484f48..8a1675f49 100644 --- a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractSWTTester.java @@ -9,7 +9,7 @@ * Jordan Deyton - Initial API and implementation and/or initial documentation * *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.utils; +package org.eclipse.ice.tests.client.widgets.utils; import java.util.concurrent.atomic.AtomicReference; diff --git a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java rename to org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java index 1202476db..17af3b675 100644 --- a/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java @@ -9,7 +9,7 @@ * Jordan Deyton - Initial API and implementation and/or initial documentation * *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.utils; +package org.eclipse.ice.tests.client.widgets.utils; import java.io.File; import java.io.IOException; diff --git a/org.eclipse.ice.client.test/.classpath b/org.eclipse.ice.tests.client.widgets/.classpath similarity index 100% rename from org.eclipse.ice.client.test/.classpath rename to org.eclipse.ice.tests.client.widgets/.classpath diff --git a/org.eclipse.ice.client.widgets.test/.gitignore b/org.eclipse.ice.tests.client.widgets/.gitignore similarity index 100% rename from org.eclipse.ice.client.widgets.test/.gitignore rename to org.eclipse.ice.tests.client.widgets/.gitignore diff --git a/org.eclipse.ice.tests.client.widgets/.project b/org.eclipse.ice.tests.client.widgets/.project new file mode 100644 index 000000000..496f75cf8 --- /dev/null +++ b/org.eclipse.ice.tests.client.widgets/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.client.widgets + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.client.widgets.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.client.widgets.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.client.widgets/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.client.test/FileSimulationTester.launch b/org.eclipse.ice.tests.client.widgets/FileSimulationTester.launch similarity index 97% rename from org.eclipse.ice.client.test/FileSimulationTester.launch rename to org.eclipse.ice.tests.client.widgets/FileSimulationTester.launch index 1558ca61d..aa221e2e2 100644 --- a/org.eclipse.ice.client.test/FileSimulationTester.launch +++ b/org.eclipse.ice.tests.client.widgets/FileSimulationTester.launch @@ -1,41 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF similarity index 85% rename from org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF index f3556ca96..92a65bb31 100644 --- a/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEEclipseWidgetsTest -Bundle-SymbolicName: org.eclipse.ice.client.widgets.test +Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.client.widgets Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -14,7 +14,7 @@ Import-Package: org.eclipse.eavp.viz.modeling, Require-Bundle: org.eclipse.swtbot.eclipse.core, org.eclipse.swtbot.go, org.eclipse.swtbot.swt.finder, - org.eclipse.ice.client.widgets.test.utils, + org.eclipse.ice.tests.client.widgets.utils, org.eclipse.ice.materials, org.eclipse.swt Bundle-Vendor: Oak Ridge National Laboratory diff --git a/org.eclipse.ice.client.test/about.html b/org.eclipse.ice.tests.client.widgets/about.html similarity index 100% rename from org.eclipse.ice.client.test/about.html rename to org.eclipse.ice.tests.client.widgets/about.html diff --git a/org.eclipse.ice.client.widgets.test/build.properties b/org.eclipse.ice.tests.client.widgets/build.properties similarity index 100% rename from org.eclipse.ice.client.widgets.test/build.properties rename to org.eclipse.ice.tests.client.widgets/build.properties diff --git a/org.eclipse.ice.client.widgets.test/pom.xml b/org.eclipse.ice.tests.client.widgets/pom.xml similarity index 95% rename from org.eclipse.ice.client.widgets.test/pom.xml rename to org.eclipse.ice.tests.client.widgets/pom.xml index 4291d4a58..846c7b31f 100644 --- a/org.eclipse.ice.client.widgets.test/pom.xml +++ b/org.eclipse.ice.tests.client.widgets/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.client.widgets.test + org.eclipse.ice.tests.client.widgets eclipse-test-plugin diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ActionTreeTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ActionTreeTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ActionTreeTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ActionTreeTester.java index 0183046c9..9d29e7c9c 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ActionTreeTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ActionTreeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EMFSectionPageTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EMFSectionPageTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EMFSectionPageTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EMFSectionPageTester.java index dd6979c35..141fedc1c 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EMFSectionPageTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EMFSectionPageTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseErrorBoxWidgetTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseErrorBoxWidgetTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseErrorBoxWidgetTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseErrorBoxWidgetTester.java index c14a3e04d..09676311b 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseErrorBoxWidgetTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseErrorBoxWidgetTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseExtraInfoWidgetTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseExtraInfoWidgetTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseExtraInfoWidgetTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseExtraInfoWidgetTester.java index 05f3c39de..209bd3e85 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseExtraInfoWidgetTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseExtraInfoWidgetTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseFormWidgetTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseFormWidgetTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseFormWidgetTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseFormWidgetTester.java index 22106acc1..f6bb988f3 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseFormWidgetTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseFormWidgetTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseTextEditorTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseTextEditorTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseTextEditorTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseTextEditorTester.java index 1b0be486a..895c6f1df 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseTextEditorTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseTextEditorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseUIWidgetFactoryTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseUIWidgetFactoryTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseUIWidgetFactoryTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseUIWidgetFactoryTester.java index e05d04cfb..ff1953685 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EclipseUIWidgetFactoryTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EclipseUIWidgetFactoryTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EntryCompositeTester.java similarity index 92% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EntryCompositeTester.java index 5143b79fd..8372ade07 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/EntryCompositeTester.java @@ -9,13 +9,13 @@ * Jordan Deyton - Initial API and implementation and/or initial documentation * *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import org.eclipse.ice.client.widgets.IEntryComposite; import org.eclipse.ice.client.widgets.StringEntryComposite; -import org.eclipse.ice.client.widgets.test.utils.AbstractSWTTester; import org.eclipse.ice.datastructures.entry.IEntry; import org.eclipse.ice.datastructures.entry.StringEntry; +import org.eclipse.ice.tests.client.widgets.utils.AbstractSWTTester; import org.eclipse.swt.SWT; import org.junit.Test; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ExtraInfoDialogTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ExtraInfoDialogTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ExtraInfoDialogTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ExtraInfoDialogTester.java index 77b8a89e9..283111a63 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ExtraInfoDialogTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ExtraInfoDialogTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/FileSimulationTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/FileSimulationTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/FileSimulationTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/FileSimulationTester.java index f7fc183f3..a339f6b45 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/FileSimulationTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/FileSimulationTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEDataComponentSectionPartTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEDataComponentSectionPartTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEDataComponentSectionPartTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEDataComponentSectionPartTester.java index cd0ea5a9b..9c280efb9 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEDataComponentSectionPartTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEDataComponentSectionPartTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEFormEditorTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEFormEditorTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEFormEditorTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEFormEditorTester.java index 8ffa9836d..8013989c2 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEFormEditorTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEFormEditorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEGeometryPageTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEGeometryPageTester.java similarity index 97% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEGeometryPageTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEGeometryPageTester.java index 5e676e2c6..bdd5e4349 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEGeometryPageTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEGeometryPageTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMasterDetailsPageTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMasterDetailsPageTester.java similarity index 99% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMasterDetailsPageTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMasterDetailsPageTester.java index 4f10869d6..f5084c13f 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMasterDetailsPageTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMasterDetailsPageTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMatrixComponentSectionPartTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMatrixComponentSectionPartTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMatrixComponentSectionPartTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMatrixComponentSectionPartTester.java index 96ad24108..75592f73c 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEMatrixComponentSectionPartTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEMatrixComponentSectionPartTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEResourcePageTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEResourcePageTester.java index f91ebc32d..523c06daa 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICEResourcePageTester.java @@ -11,18 +11,18 @@ * Kasper Gammeltoft - viz series refactor * Jordan Deyton - removed code testing PlotGridComposite usage *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import java.io.File; import java.io.IOException; 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; import org.eclipse.ice.datastructures.resource.ICEResource; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICESectionPageTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICESectionPageTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICESectionPageTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICESectionPageTester.java index 520528826..4d6565862 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICESectionPageTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICESectionPageTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICETableComponentSectionPartTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICETableComponentSectionPartTester.java similarity index 99% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICETableComponentSectionPartTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICETableComponentSectionPartTester.java index 6f8573393..f82016f90 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICETableComponentSectionPartTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ICETableComponentSectionPartTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/IFormWidgetBuilderTest.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/IFormWidgetBuilderTest.java index 8ced4faf1..29c5fc688 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/IFormWidgetBuilderTest.java @@ -8,7 +8,7 @@ * Contributors: * Initial API and implementation and/or initial documentation - Menghan Li *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentColumnPropertyAccessorTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentColumnPropertyAccessorTester.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentColumnPropertyAccessorTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentColumnPropertyAccessorTester.java index d005f3671..1724c03c7 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentColumnPropertyAccessorTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentColumnPropertyAccessorTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentNattableTest.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentNattableTest.java similarity index 99% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentNattableTest.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentNattableTest.java index 3ab7f0a11..f2bb47608 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentNattableTest.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/ListComponentNattableTest.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings, Kasper Gammeltoft *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/TestListener.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/TestListener.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/TestListener.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/TestListener.java index b4b582023..b34bcfc0e 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/TestListener.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/TestListener.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test; +package org.eclipse.ice.tests.client.widgets; import org.eclipse.ice.datastructures.form.Form; import org.eclipse.ice.iclient.uiwidgets.IProcessEventListener; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/GeometryEditorInputTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/GeometryEditorInputTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/GeometryEditorInputTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/GeometryEditorInputTester.java index d5b5bb6f9..b54e0799f 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/GeometryEditorInputTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/GeometryEditorInputTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.geometry; +package org.eclipse.ice.tests.client.widgets.geometry; /** *

diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeContentProviderTest.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeContentProviderTest.java similarity index 99% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeContentProviderTest.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeContentProviderTest.java index f75ba735d..2780dabd0 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeContentProviderTest.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeContentProviderTest.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.geometry; +package org.eclipse.ice.tests.client.widgets.geometry; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeLabelProviderTest.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeLabelProviderTest.java similarity index 98% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeLabelProviderTest.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeLabelProviderTest.java index 450a210f2..72bf3c734 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/geometry/ShapeTreeLabelProviderTest.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/geometry/ShapeTreeLabelProviderTest.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.test.geometry; +package org.eclipse.ice.tests.client.widgets.geometry; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/Activator.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/Activator.java similarity index 93% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/Activator.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/Activator.java index c1d39e18e..9db419253 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/Activator.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/Activator.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/CellTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/CellTester.java similarity index 95% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/CellTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/CellTester.java index f9cf253c5..0b291e573 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/CellTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/CellTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/EditPartFactoryTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/EditPartFactoryTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/EditPartFactoryTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/EditPartFactoryTester.java index 5287ef4c9..e1440caf5 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/EditPartFactoryTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/EditPartFactoryTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridDataTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridDataTester.java similarity index 94% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridDataTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridDataTester.java index 0dbcff568..e58dc6c94 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridDataTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridDataTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridEditorInputTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridEditorInputTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridEditorInputTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridEditorInputTester.java index 912537344..b6a427752 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridEditorInputTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridEditorInputTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridTester.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridTester.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridTester.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridTester.java index ec9db7d76..d577471e4 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridTester.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridViewerLauncher.java b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridViewerLauncher.java similarity index 96% rename from org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridViewerLauncher.java rename to org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridViewerLauncher.java index 8fc2c0ac3..280b85bd3 100644 --- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/grid/test/GridViewerLauncher.java +++ b/org.eclipse.ice.tests.client.widgets/src/org/eclipse/ice/tests/client/widgets/grid/GridViewerLauncher.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.widgets.grid.test; +package org.eclipse.ice.tests.client.widgets.grid; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.ice.client.widgets.test/.classpath b/org.eclipse.ice.tests.client/.classpath similarity index 100% rename from org.eclipse.ice.client.widgets.test/.classpath rename to org.eclipse.ice.tests.client/.classpath diff --git a/org.eclipse.ice.client.test/.gitignore b/org.eclipse.ice.tests.client/.gitignore similarity index 100% rename from org.eclipse.ice.client.test/.gitignore rename to org.eclipse.ice.tests.client/.gitignore diff --git a/org.eclipse.ice.client.test/.project b/org.eclipse.ice.tests.client/.project similarity index 95% rename from org.eclipse.ice.client.test/.project rename to org.eclipse.ice.tests.client/.project index f4caf95ee..945699a94 100644 --- a/org.eclipse.ice.client.test/.project +++ b/org.eclipse.ice.tests.client/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.client.test + org.eclipse.ice.tests.client diff --git a/org.eclipse.ice.client.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.client/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.client.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.client/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.client.widgets.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.client/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.client.widgets.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.client/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.client.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.client/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.client.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.client/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.client.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF similarity index 91% rename from org.eclipse.ice.client.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.client/META-INF/MANIFEST.MF index 25dc81189..b41baf11d 100644 --- a/org.eclipse.ice.client.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ClientTest -Bundle-SymbolicName: org.eclipse.ice.client.test +Bundle-SymbolicName: org.eclipse.ice.tests.client Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.client Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.ice.client.widgets.test/about.html b/org.eclipse.ice.tests.client/about.html similarity index 100% rename from org.eclipse.ice.client.widgets.test/about.html rename to org.eclipse.ice.tests.client/about.html diff --git a/org.eclipse.ice.client.test/build.properties b/org.eclipse.ice.tests.client/build.properties similarity index 100% rename from org.eclipse.ice.client.test/build.properties rename to org.eclipse.ice.tests.client/build.properties diff --git a/org.eclipse.ice.client.test/fakeCoreTestFile b/org.eclipse.ice.tests.client/fakeCoreTestFile similarity index 100% rename from org.eclipse.ice.client.test/fakeCoreTestFile rename to org.eclipse.ice.tests.client/fakeCoreTestFile diff --git a/org.eclipse.ice.client.test/pom.xml b/org.eclipse.ice.tests.client/pom.xml similarity index 95% rename from org.eclipse.ice.client.test/pom.xml rename to org.eclipse.ice.tests.client/pom.xml index 17a4c69ac..20767d1f4 100644 --- a/org.eclipse.ice.client.test/pom.xml +++ b/org.eclipse.ice.tests.client/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.client.test + org.eclipse.ice.tests.client eclipse-test-plugin diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientExtensionFactoryTester.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientExtensionFactoryTester.java similarity index 97% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientExtensionFactoryTester.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientExtensionFactoryTester.java index 2c389b546..a83284f0e 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientExtensionFactoryTester.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientExtensionFactoryTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientTester.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientTester.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientTester.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientTester.java index e7cd9ce2a..d22e4eec6 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ClientTester.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ClientTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -56,8 +56,8 @@ * ClientTester checks the behavior and functionality of Client. It checks for * proper location setting and file system querying from Core. * - * This classes uses both the {@link org.eclipse.ice.client.test.FakeCore} and - * the {@link org.eclipse.ice.client.test.FakeItemProcessor}. + * This classes uses both the {@link org.eclipse.ice.tests.client.FakeCore} and + * the {@link org.eclipse.ice.tests.client.FakeItemProcessor}. * * @author Jay Jay Billings */ diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeCore.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeCore.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeCore.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeCore.java index d9d9c93a1..fc757f7fc 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeCore.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeCore.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import java.io.BufferedWriter; import java.io.File; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeErrorBoxWidget.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeErrorBoxWidget.java similarity index 98% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeErrorBoxWidget.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeErrorBoxWidget.java index cdb0ed388..04f65dfb9 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeErrorBoxWidget.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeErrorBoxWidget.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import org.eclipse.ice.iclient.uiwidgets.IErrorBox; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeExtraInfoWidget.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeExtraInfoWidget.java similarity index 98% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeExtraInfoWidget.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeExtraInfoWidget.java index 7bc227089..2191b8748 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeExtraInfoWidget.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeExtraInfoWidget.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import java.util.ArrayList; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeFormWidget.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeFormWidget.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeFormWidget.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeFormWidget.java index a8bb92b44..ac1785194 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeFormWidget.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeFormWidget.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import java.util.ArrayList; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeItemProcessor.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeItemProcessor.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeItemProcessor.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeItemProcessor.java index 8b7844ef2..a8826ab98 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeItemProcessor.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeItemProcessor.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import java.io.BufferedReader; import java.io.File; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeStreamingTextWidget.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeStreamingTextWidget.java similarity index 98% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeStreamingTextWidget.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeStreamingTextWidget.java index 3d54ee6df..8d4d65a36 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeStreamingTextWidget.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeStreamingTextWidget.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import org.eclipse.ice.iclient.uiwidgets.IStreamingTextWidget; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeTextEditor.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeTextEditor.java similarity index 98% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeTextEditor.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeTextEditor.java index 372159d94..d08842bc3 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeTextEditor.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeTextEditor.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import org.eclipse.ice.datastructures.resource.ICEResource; import org.eclipse.ice.iclient.uiwidgets.ITextEditor; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeUIWidgetFactory.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeUIWidgetFactory.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeUIWidgetFactory.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeUIWidgetFactory.java index 57f8bd958..ac06feeeb 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/FakeUIWidgetFactory.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/FakeUIWidgetFactory.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import org.eclipse.ice.iclient.uiwidgets.IErrorBox; import org.eclipse.ice.iclient.uiwidgets.IExtraInfoWidget; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IClientTester.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IClientTester.java similarity index 96% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IClientTester.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IClientTester.java index 5d201aab0..5947232bd 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IClientTester.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IClientTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IWidgetFactoryTester.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IWidgetFactoryTester.java similarity index 97% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IWidgetFactoryTester.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IWidgetFactoryTester.java index ebb989d70..af1411db4 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/IWidgetFactoryTester.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/IWidgetFactoryTester.java @@ -8,7 +8,7 @@ * Contributors: * Initial API and implementation and/or initial documentation - Menghan Li *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.java b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ItemProcessorTester.java similarity index 99% rename from org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.java rename to org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ItemProcessorTester.java index 015c19ffc..c34992154 100644 --- a/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.java +++ b/org.eclipse.ice.tests.client/src/org/eclipse/ice/tests/client/ItemProcessorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.client.test; +package org.eclipse.ice.tests.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.core.jaxrs.test/.classpath b/org.eclipse.ice.tests.core.jaxrs/.classpath similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/.classpath rename to org.eclipse.ice.tests.core.jaxrs/.classpath diff --git a/org.eclipse.ice.core.jaxrs.test/.gitignore b/org.eclipse.ice.tests.core.jaxrs/.gitignore similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/.gitignore rename to org.eclipse.ice.tests.core.jaxrs/.gitignore diff --git a/org.eclipse.ice.core.jaxrs.test/.project b/org.eclipse.ice.tests.core.jaxrs/.project similarity index 94% rename from org.eclipse.ice.core.jaxrs.test/.project rename to org.eclipse.ice.tests.core.jaxrs/.project index 354becbe0..13e3bf7a2 100644 --- a/org.eclipse.ice.core.jaxrs.test/.project +++ b/org.eclipse.ice.tests.core.jaxrs/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.core.jaxrs.test + org.eclipse.ice.tests.core.jaxrs diff --git a/org.eclipse.ice.core.jaxrs.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.core.jaxrs/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.core.jaxrs/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.core.jaxrs.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.core.jaxrs/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.core.jaxrs/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.core.jaxrs.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.core.jaxrs/META-INF/MANIFEST.MF similarity index 87% rename from org.eclipse.ice.core.jaxrs.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.core.jaxrs/META-INF/MANIFEST.MF index 88338dad0..3257c7653 100644 --- a/org.eclipse.ice.core.jaxrs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.core.jaxrs/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test -Bundle-SymbolicName: org.eclipse.ice.core.jaxrs.test;singleton:=true +Bundle-SymbolicName: org.eclipse.ice.tests.core.jaxrs;singleton:=true Bundle-Version: 1.0.0.qualifier -Export-Package: org.eclipse.ice.core.jaxrs.test +Export-Package: org.eclipse.ice.tests.core.jaxrs Require-Bundle: org.junit, com.sun.jersey;bundle-version="1.17.0" Import-Package: com.sun.jersey.api, diff --git a/org.eclipse.ice.core.jaxrs.test/about.html b/org.eclipse.ice.tests.core.jaxrs/about.html similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/about.html rename to org.eclipse.ice.tests.core.jaxrs/about.html diff --git a/org.eclipse.ice.core.jaxrs.test/build.properties b/org.eclipse.ice.tests.core.jaxrs/build.properties similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/build.properties rename to org.eclipse.ice.tests.core.jaxrs/build.properties diff --git a/org.eclipse.ice.core.jaxrs.test/plugin.xml b/org.eclipse.ice.tests.core.jaxrs/plugin.xml similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/plugin.xml rename to org.eclipse.ice.tests.core.jaxrs/plugin.xml diff --git a/org.eclipse.ice.core.jaxrs.test/pom.xml b/org.eclipse.ice.tests.core.jaxrs/pom.xml similarity index 91% rename from org.eclipse.ice.core.jaxrs.test/pom.xml rename to org.eclipse.ice.tests.core.jaxrs/pom.xml index b4a9cfaf0..78b5dc94c 100644 --- a/org.eclipse.ice.core.jaxrs.test/pom.xml +++ b/org.eclipse.ice.tests.core.jaxrs/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.core.jaxrs.test + org.eclipse.ice.tests.core.jaxrs 2.2.0-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.ice.core.jaxrs.test/schema/ItemBuilder.exsd b/org.eclipse.ice.tests.core.jaxrs/schema/ItemBuilder.exsd similarity index 100% rename from org.eclipse.ice.core.jaxrs.test/schema/ItemBuilder.exsd rename to org.eclipse.ice.tests.core.jaxrs/schema/ItemBuilder.exsd diff --git a/org.eclipse.ice.core.jaxrs.test/src/org/eclipse/ice/core/jaxrs/test/JAXRSTester.java b/org.eclipse.ice.tests.core.jaxrs/src/org/eclipse/ice/tests/core/jaxrs/JAXRSTester.java similarity index 98% rename from org.eclipse.ice.core.jaxrs.test/src/org/eclipse/ice/core/jaxrs/test/JAXRSTester.java rename to org.eclipse.ice.tests.core.jaxrs/src/org/eclipse/ice/tests/core/jaxrs/JAXRSTester.java index 2c98114cd..0b7b9be08 100644 --- a/org.eclipse.ice.core.jaxrs.test/src/org/eclipse/ice/core/jaxrs/test/JAXRSTester.java +++ b/org.eclipse.ice.tests.core.jaxrs/src/org/eclipse/ice/tests/core/jaxrs/JAXRSTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.jaxrs.test; +package org.eclipse.ice.tests.core.jaxrs; import javax.ws.rs.core.MediaType; diff --git a/org.eclipse.ice.core.test/.classpath b/org.eclipse.ice.tests.core/.classpath similarity index 100% rename from org.eclipse.ice.core.test/.classpath rename to org.eclipse.ice.tests.core/.classpath diff --git a/org.eclipse.ice.core.test/.gitignore b/org.eclipse.ice.tests.core/.gitignore similarity index 100% rename from org.eclipse.ice.core.test/.gitignore rename to org.eclipse.ice.tests.core/.gitignore diff --git a/org.eclipse.ice.core.test/.project b/org.eclipse.ice.tests.core/.project similarity index 92% rename from org.eclipse.ice.core.test/.project rename to org.eclipse.ice.tests.core/.project index def134c8d..51f029104 100644 --- a/org.eclipse.ice.core.test/.project +++ b/org.eclipse.ice.tests.core/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.core.test + org.eclipse.ice.tests.core diff --git a/org.eclipse.ice.core.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.core.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.core/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.core.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.core/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.core.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.core/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.core.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.core/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.core.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.core/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.core.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF similarity index 90% rename from org.eclipse.ice.core.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.core/META-INF/MANIFEST.MF index 2e807369c..587de6918 100644 --- a/org.eclipse.ice.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CoreTest -Bundle-SymbolicName: org.eclipse.ice.core.test +Bundle-SymbolicName: org.eclipse.ice.tests.core Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.ice.core.test/about.html b/org.eclipse.ice.tests.core/about.html similarity index 100% rename from org.eclipse.ice.core.test/about.html rename to org.eclipse.ice.tests.core/about.html diff --git a/org.eclipse.ice.core.test/build.properties b/org.eclipse.ice.tests.core/build.properties similarity index 100% rename from org.eclipse.ice.core.test/build.properties rename to org.eclipse.ice.tests.core/build.properties diff --git a/org.eclipse.ice.tests.core/defaultUser/default/.project b/org.eclipse.ice.tests.core/defaultUser/default/.project new file mode 100644 index 000000000..8888d3b45 --- /dev/null +++ b/org.eclipse.ice.tests.core/defaultUser/default/.project @@ -0,0 +1,11 @@ + + + default + + + + + + + + diff --git a/org.eclipse.ice.core.test/pom.xml b/org.eclipse.ice.tests.core/pom.xml similarity index 92% rename from org.eclipse.ice.core.test/pom.xml rename to org.eclipse.ice.tests.core/pom.xml index 611388306..02a434479 100644 --- a/org.eclipse.ice.core.test/pom.xml +++ b/org.eclipse.ice.tests.core/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.core.test + org.eclipse.ice.tests.core 2.2.0-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/CoreTester.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/CoreTester.java similarity index 99% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/CoreTester.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/CoreTester.java index c88ab6e3e..1f65d9521 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/CoreTester.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/CoreTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeCompositeItemBuilder.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeCompositeItemBuilder.java similarity index 98% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeCompositeItemBuilder.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeCompositeItemBuilder.java index 7fc6c1c8c..1a4c5defa 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeCompositeItemBuilder.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeCompositeItemBuilder.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import java.util.ArrayList; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeGeometryBuilder.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeGeometryBuilder.java similarity index 98% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeGeometryBuilder.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeGeometryBuilder.java index afeaa4696..04ff20a1f 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeGeometryBuilder.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeGeometryBuilder.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.Item; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeIFile.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeIFile.java similarity index 99% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeIFile.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeIFile.java index 3e79be589..f9229de68 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeIFile.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeIFile.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import java.io.InputStream; import java.io.Reader; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeItem.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeItem.java similarity index 99% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeItem.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeItem.java index 4be3a1ca5..ceb7daced 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeItem.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeItem.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import org.eclipse.core.resources.IProject; import org.eclipse.ice.datastructures.form.Form; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeModuleBuilder.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeModuleBuilder.java similarity index 97% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeModuleBuilder.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeModuleBuilder.java index a14b4455a..0071e5b58 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakeModuleBuilder.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakeModuleBuilder.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.Item; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakePersistenceProvider.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakePersistenceProvider.java similarity index 99% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakePersistenceProvider.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakePersistenceProvider.java index 730c8268f..45e0d04f5 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/FakePersistenceProvider.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/FakePersistenceProvider.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import java.io.IOException; import java.util.ArrayList; diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/ItemManagerTester.java similarity index 99% rename from org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java rename to org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/ItemManagerTester.java index 0096c43cf..52905f5db 100644 --- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java +++ b/org.eclipse.ice.tests.core/src/org/eclipse/ice/tests/core/ItemManagerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.core.test; +package org.eclipse.ice.tests.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/.classpath b/org.eclipse.ice.tests.datastructures/.classpath similarity index 100% rename from org.eclipse.ice.datastructures.test/.classpath rename to org.eclipse.ice.tests.datastructures/.classpath diff --git a/org.eclipse.ice.datastructures.test/.gitignore b/org.eclipse.ice.tests.datastructures/.gitignore similarity index 100% rename from org.eclipse.ice.datastructures.test/.gitignore rename to org.eclipse.ice.tests.datastructures/.gitignore diff --git a/org.eclipse.ice.datastructures.test/.project b/org.eclipse.ice.tests.datastructures/.project similarity index 95% rename from org.eclipse.ice.datastructures.test/.project rename to org.eclipse.ice.tests.datastructures/.project index 06af6ca37..42ffaad2e 100644 --- a/org.eclipse.ice.datastructures.test/.project +++ b/org.eclipse.ice.tests.datastructures/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.datastructures.test + org.eclipse.ice.tests.datastructures diff --git a/org.eclipse.ice.datastructures.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.datastructures/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.datastructures.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.datastructures/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.datastructures.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.datastructures/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.datastructures.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.datastructures/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.datastructures.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.datastructures/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.datastructures.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.datastructures/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF similarity index 88% rename from org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF index 4ca52266d..38764b3b3 100644 --- a/org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEDataStructuresTest -Bundle-SymbolicName: org.eclipse.ice.datastructures.test;singleton:=true +Bundle-SymbolicName: org.eclipse.ice.tests.datastructures;singleton:=true Bundle-Version: 2.2.0.qualifier Require-Bundle: org.junit;bundle-version="4.8.2", org.eclipse.emf.ecore, @@ -26,6 +26,6 @@ Import-Package: ca.odell.glazedlists, org.osgi.util.tracker;version="1.5.0", org.slf4j;version="1.7.2" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.ice.datastructures.test +Export-Package: org.eclipse.ice.tests.datastructures Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Oak Ridge National Laboratory diff --git a/org.eclipse.ice.datastructures.test/about.html b/org.eclipse.ice.tests.datastructures/about.html similarity index 100% rename from org.eclipse.ice.datastructures.test/about.html rename to org.eclipse.ice.tests.datastructures/about.html diff --git a/org.eclipse.ice.datastructures.test/build.properties b/org.eclipse.ice.tests.datastructures/build.properties similarity index 100% rename from org.eclipse.ice.datastructures.test/build.properties rename to org.eclipse.ice.tests.datastructures/build.properties diff --git a/org.eclipse.ice.datastructures.test/plugin.xml b/org.eclipse.ice.tests.datastructures/plugin.xml similarity index 79% rename from org.eclipse.ice.datastructures.test/plugin.xml rename to org.eclipse.ice.tests.datastructures/plugin.xml index e2ba976e7..46eed8142 100644 --- a/org.eclipse.ice.datastructures.test/plugin.xml +++ b/org.eclipse.ice.tests.datastructures/plugin.xml @@ -6,7 +6,7 @@ name="Fake JAXB Class Provider" point="org.eclipse.ice.datastructures.jaxbClassProvider"> + class="org.eclipse.ice.tests.datastructures.FakeJAXBClassProvider"> diff --git a/org.eclipse.ice.datastructures.test/pom.xml b/org.eclipse.ice.tests.datastructures/pom.xml similarity index 92% rename from org.eclipse.ice.datastructures.test/pom.xml rename to org.eclipse.ice.tests.datastructures/pom.xml index 9396de998..5ef5e0dbd 100644 --- a/org.eclipse.ice.datastructures.test/pom.xml +++ b/org.eclipse.ice.tests.datastructures/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.datastructures.test + org.eclipse.ice.tests.datastructures eclipse-test-plugin true diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/AdaptiveTreeCompositeTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/AdaptiveTreeCompositeTester.java similarity index 96% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/AdaptiveTreeCompositeTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/AdaptiveTreeCompositeTester.java index fb85fa3d1..d5680767f 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/AdaptiveTreeCompositeTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/AdaptiveTreeCompositeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/DataComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/DataComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/DataComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/DataComponentTester.java index 465ce4500..a98984443 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/DataComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/DataComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFComponentTester.java index 60422a538..b63ffa8bd 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFEntryTester.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFEntryTester.java index 78b3790b8..491453654 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFEntryTester.java @@ -9,7 +9,7 @@ * Alex McCaskey (UT-Battelle, LLC.) - initial API and implementation and/or initial documentation * Jay Jay Billings (UT-Battelle, LLC.) - modified to use ICETests directory *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFTreeCompositeTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFTreeCompositeTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFTreeCompositeTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFTreeCompositeTester.java index 7088ba639..55d904589 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFTreeCompositeTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/EMFTreeCompositeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FakeJAXBClassProvider.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FakeJAXBClassProvider.java similarity index 96% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FakeJAXBClassProvider.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FakeJAXBClassProvider.java index 456f7d8c9..f56a0f84d 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FakeJAXBClassProvider.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FakeJAXBClassProvider.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FormTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FormTester.java index d518e531d..09081a99f 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/FormTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryComponentTester.java index 0f8920d39..96e3aa541 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryTester.java index 57cbadb9b..ae67e6c72 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/GeometryTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; /** *

diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBClassProviderTester.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBClassProviderTester.java index 4f33b2d3e..8b9904ed1 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBClassProviderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBHandlerTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBHandlerTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBHandlerTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBHandlerTester.java index 6a724f0f5..a7ccfe0d3 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBHandlerTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEJAXBHandlerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEListTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEListTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEListTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEListTester.java index 0262f5305..8c689e950 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEListTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEListTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEObjectTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEObjectTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEObjectTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEObjectTester.java index cbe333eff..100bc7f36 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEObjectTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEObjectTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEResourceTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEResourceTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEResourceTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEResourceTester.java index 5435d328c..3dd53b189 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEResourceTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ICEResourceTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/IJAXBClassProviderTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/IJAXBClassProviderTester.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/IJAXBClassProviderTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/IJAXBClassProviderTester.java index 1ee6dde6e..bd0eb9b02 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/IJAXBClassProviderTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/IJAXBClassProviderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ListComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ListComponentTester.java index 2c440586f..fe6a3a734 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ListComponentTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - Jay Jay * Billings *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsPairTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsPairTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsPairTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsPairTester.java index e5059e912..872de9d41 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsPairTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsPairTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsTester.java index 8df84d27f..d012e3851 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MasterDetailsTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MasterDetailsTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialStackTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialStackTester.java index 28dfa4639..f33b07f64 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialStackTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings, Kasper Gammeltoft *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialTester.java index 78b5e15fc..295339cf5 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MaterialTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MatrixComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MatrixComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MatrixComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MatrixComponentTester.java index 01908e1ea..16dfae340 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MatrixComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MatrixComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MeshComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MeshComponentTester.java index f7b674f81..bd6372586 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/MeshComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PainfullySimpleFormTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/PainfullySimpleFormTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PainfullySimpleFormTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/PainfullySimpleFormTester.java index 0b0024eb2..432b080b0 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PainfullySimpleFormTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/PainfullySimpleFormTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceComponentTester.java index aae32044c..794204587 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceHandlerTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java similarity index 96% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceHandlerTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java index 513cbbd0d..c82e34eee 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceHandlerTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/SimpleJAXBTestClass.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/SimpleJAXBTestClass.java similarity index 97% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/SimpleJAXBTestClass.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/SimpleJAXBTestClass.java index 8a52b8b87..60ef41c2d 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/SimpleJAXBTestClass.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/SimpleJAXBTestClass.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TableComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TableComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TableComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TableComponentTester.java index 77fba6b9e..7df21032d 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TableComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TableComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestComponentListener.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestComponentListener.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestComponentListener.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestComponentListener.java index c8ff47294..b96afb2d4 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestComponentListener.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestComponentListener.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestListComponentListener.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestListComponentListener.java similarity index 94% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestListComponentListener.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestListComponentListener.java index 47831c8a6..3dc37ba58 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestListComponentListener.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestListComponentListener.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - Jay Jay * Billings *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestMaterialFactory.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestMaterialFactory.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestMaterialFactory.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestMaterialFactory.java index 2542bb898..7bdcc70ce 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestMaterialFactory.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestMaterialFactory.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz, Kasper Gammeltoft *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import org.eclipse.ice.datastructures.form.Material; import org.eclipse.ice.datastructures.form.MaterialStack; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestVisitor.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestVisitor.java index 378877c28..1c3175a37 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TestVisitor.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import org.eclipse.ice.datastructures.ICEObject.ListComponent; import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TimeDataComponentTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TimeDataComponentTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TimeDataComponentTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TimeDataComponentTester.java index 428fb01e9..af332d6db 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TimeDataComponentTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TimeDataComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeIteratorTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeIteratorTester.java similarity index 96% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeIteratorTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeIteratorTester.java index 23bcae262..4950aa95e 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeIteratorTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeIteratorTester.java @@ -9,7 +9,7 @@ * Jordan Deyton (UT-Battelle, LLC.) - initial API and implementation and/or initial documentation * *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeTester.java index 2d15fc412..ac52d88d2 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/TreeCompositeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VizResourceTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/VizResourceTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VizResourceTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/VizResourceTester.java index 5f9814ddd..981a54900 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VizResourceTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/VizResourceTester.java @@ -10,7 +10,7 @@ * * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/WrappedGlazedEventListenerTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/WrappedGlazedEventListenerTester.java similarity index 98% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/WrappedGlazedEventListenerTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/WrappedGlazedEventListenerTester.java index bc58dc2ed..42822669b 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/WrappedGlazedEventListenerTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/WrappedGlazedEventListenerTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - Jay Jay * Billings *******************************************************************************/ -package org.eclipse.ice.datastructures.test; +package org.eclipse.ice.tests.datastructures; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/AbstractEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/AbstractEntryTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/AbstractEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/AbstractEntryTester.java index 0576e016b..f620e2744 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/AbstractEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/AbstractEntryTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/ContinuousEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/ContinuousEntryTester.java similarity index 97% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/ContinuousEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/ContinuousEntryTester.java index ae47fb109..0e508d1f0 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/ContinuousEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/ContinuousEntryTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/DiscreteEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/DiscreteEntryTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/DiscreteEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/DiscreteEntryTester.java index 3c79ede1b..7718c7d46 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/DiscreteEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/DiscreteEntryTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/FileEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/FileEntryTester.java similarity index 99% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/FileEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/FileEntryTester.java index 8e7c39545..18d2e3755 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/FileEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/FileEntryTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/StringEntryTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/StringEntryTester.java similarity index 97% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/StringEntryTester.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/StringEntryTester.java index 73525c66b..49e363a13 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/StringEntryTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/StringEntryTester.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/TestableAbstractEntry.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/TestableAbstractEntry.java similarity index 97% rename from org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/TestableAbstractEntry.java rename to org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/TestableAbstractEntry.java index 80c3adc9c..7cd1dd10f 100644 --- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/entry/test/TestableAbstractEntry.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/entry/TestableAbstractEntry.java @@ -11,7 +11,7 @@ * Claire Saunders, Matthew Wang, Anna Wojtowicz * *******************************************************************************/ -package org.eclipse.ice.datastructures.entry.test; +package org.eclipse.ice.tests.datastructures.entry; import java.util.List; diff --git a/org.eclipse.ice.installer.test/.project b/org.eclipse.ice.tests.installer/.project similarity index 88% rename from org.eclipse.ice.installer.test/.project rename to org.eclipse.ice.tests.installer/.project index be04fa12c..5b115fa69 100644 --- a/org.eclipse.ice.installer.test/.project +++ b/org.eclipse.ice.tests.installer/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.installer.test + org.eclipse.ice.tests.installer diff --git a/org.eclipse.ice.installer.test/.pydevproject b/org.eclipse.ice.tests.installer/.pydevproject similarity index 100% rename from org.eclipse.ice.installer.test/.pydevproject rename to org.eclipse.ice.tests.installer/.pydevproject diff --git a/org.eclipse.ice.installer.test/Test_ICE_Installer.py b/org.eclipse.ice.tests.installer/Test_ICE_Installer.py similarity index 100% rename from org.eclipse.ice.installer.test/Test_ICE_Installer.py rename to org.eclipse.ice.tests.installer/Test_ICE_Installer.py diff --git a/org.eclipse.ice.installer.test/__init__.py b/org.eclipse.ice.tests.installer/__init__.py similarity index 100% rename from org.eclipse.ice.installer.test/__init__.py rename to org.eclipse.ice.tests.installer/__init__.py diff --git a/org.eclipse.ice.io.test/.classpath b/org.eclipse.ice.tests.io/.classpath similarity index 100% rename from org.eclipse.ice.io.test/.classpath rename to org.eclipse.ice.tests.io/.classpath diff --git a/org.eclipse.ice.io.test/.gitignore b/org.eclipse.ice.tests.io/.gitignore similarity index 100% rename from org.eclipse.ice.io.test/.gitignore rename to org.eclipse.ice.tests.io/.gitignore diff --git a/org.eclipse.ice.tests.io/.project b/org.eclipse.ice.tests.io/.project new file mode 100644 index 000000000..aac91f7d7 --- /dev/null +++ b/org.eclipse.ice.tests.io/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.io + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.io.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.io/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.io.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.io/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.io.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.io/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.io.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.io/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.io.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.io/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.io.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.io/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.io.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF similarity index 89% rename from org.eclipse.ice.io.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.io/META-INF/MANIFEST.MF index 0752bbd9f..5081ffab6 100644 --- a/org.eclipse.ice.io.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test -Bundle-SymbolicName: org.eclipse.ice.io.test +Bundle-SymbolicName: org.eclipse.ice.tests.io Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Fragment-Host: org.eclipse.ice.io diff --git a/org.eclipse.ice.io.test/about.html b/org.eclipse.ice.tests.io/about.html similarity index 100% rename from org.eclipse.ice.io.test/about.html rename to org.eclipse.ice.tests.io/about.html diff --git a/org.eclipse.ice.io.test/build.properties b/org.eclipse.ice.tests.io/build.properties similarity index 100% rename from org.eclipse.ice.io.test/build.properties rename to org.eclipse.ice.tests.io/build.properties diff --git a/org.eclipse.ice.io.test/pom.xml b/org.eclipse.ice.tests.io/pom.xml similarity index 90% rename from org.eclipse.ice.io.test/pom.xml rename to org.eclipse.ice.tests.io/pom.xml index 35ca28b23..d46e7d455 100644 --- a/org.eclipse.ice.io.test/pom.xml +++ b/org.eclipse.ice.tests.io/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.io.test + org.eclipse.ice.tests.io eclipse-test-plugin true diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/CSVReaderTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/CSVReaderTester.java index 410e029ac..48d51f45c 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/CSVReaderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.io.csv.test; +package org.eclipse.ice.tests.io.csv; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/SpaceReaderTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/SpaceReaderTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/SpaceReaderTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/SpaceReaderTester.java index ef363884f..41d9b8deb 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/SpaceReaderTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/csv/SpaceReaderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.io.csv.test; +package org.eclipse.ice.tests.io.csv; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIReaderTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIReaderTester.java index 9ce2d3b14..d96f9cf4c 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIReaderTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIReaderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.io.ini.test; +package org.eclipse.ice.tests.io.ini; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIWriterTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIWriterTester.java index 929689982..e5b276526 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ini/test/INIWriterTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ini/INIWriterTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.io.ini.test; +package org.eclipse.ice.tests.io.ini; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSReaderTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSReaderTester.java index cf5b20999..e9846c964 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSReaderTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSReaderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.io.ips.test; +package org.eclipse.ice.tests.io.ips; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSWriterTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSWriterTester.java similarity index 99% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSWriterTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSWriterTester.java index 6add8d2f8..a3217bd20 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/ips/test/IPSWriterTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/ips/IPSWriterTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.io.ips.test; +package org.eclipse.ice.tests.io.ips; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/serializable/IOServiceTester.java similarity index 98% rename from org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java rename to org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/serializable/IOServiceTester.java index aebe270b2..74a9d14e7 100644 --- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java +++ b/org.eclipse.ice.tests.io/src/org/eclipse/ice/tests/io/serializable/IOServiceTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.io.serializable.test; +package org.eclipse.ice.tests.io.serializable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/.classpath b/org.eclipse.ice.tests.item/.classpath similarity index 100% rename from org.eclipse.ice.item.test/.classpath rename to org.eclipse.ice.tests.item/.classpath diff --git a/org.eclipse.ice.item.test/.gitignore b/org.eclipse.ice.tests.item/.gitignore similarity index 100% rename from org.eclipse.ice.item.test/.gitignore rename to org.eclipse.ice.tests.item/.gitignore diff --git a/org.eclipse.ice.item.test/.project b/org.eclipse.ice.tests.item/.project similarity index 95% rename from org.eclipse.ice.item.test/.project rename to org.eclipse.ice.tests.item/.project index fee57453f..16a160a68 100644 --- a/org.eclipse.ice.item.test/.project +++ b/org.eclipse.ice.tests.item/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.item.test + org.eclipse.ice.tests.item diff --git a/org.eclipse.ice.item.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.item/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.item.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.item/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.item.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.item/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.item.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.item/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.item.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF similarity index 94% rename from org.eclipse.ice.item.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.item/META-INF/MANIFEST.MF index b251d0552..03028bc2e 100644 --- a/org.eclipse.ice.item.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEItemTest -Bundle-SymbolicName: org.eclipse.ice.item.test +Bundle-SymbolicName: org.eclipse.ice.tests.item Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.item Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.ice.item.test/about.html b/org.eclipse.ice.tests.item/about.html similarity index 100% rename from org.eclipse.ice.item.test/about.html rename to org.eclipse.ice.tests.item/about.html diff --git a/org.eclipse.ice.item.test/build.properties b/org.eclipse.ice.tests.item/build.properties similarity index 100% rename from org.eclipse.ice.item.test/build.properties rename to org.eclipse.ice.tests.item/build.properties diff --git a/org.eclipse.ice.item.test/ls_stdout_1.txt b/org.eclipse.ice.tests.item/ls_stdout_1.txt similarity index 100% rename from org.eclipse.ice.item.test/ls_stdout_1.txt rename to org.eclipse.ice.tests.item/ls_stdout_1.txt diff --git a/org.eclipse.ice.item.test/pom.xml b/org.eclipse.ice.tests.item/pom.xml similarity index 92% rename from org.eclipse.ice.item.test/pom.xml rename to org.eclipse.ice.tests.item/pom.xml index b2f07de0b..d0e660423 100644 --- a/org.eclipse.ice.item.test/pom.xml +++ b/org.eclipse.ice.tests.item/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.item.test + org.eclipse.ice.tests.item eclipse-test-plugin true diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/messaging/MessageTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/messaging/MessageTester.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/messaging/MessageTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/messaging/MessageTester.java index a459d0599..4bc1e9d59 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/messaging/MessageTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/messaging/MessageTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.messaging; +package org.eclipse.ice.tests.item.messaging; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/BlockTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/BlockTester.java index 2c2bdcc59..ac0ca4180 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/BlockTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.moose; +package org.eclipse.ice.tests.item.moose; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/MOOSEFileHandlerTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/MOOSEFileHandlerTester.java index e61730d1a..7c11d9186 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/MOOSEFileHandlerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.moose; +package org.eclipse.ice.tests.item.moose; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/ParameterTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/ParameterTester.java index ca3a1ea89..b0632d7aa 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/ParameterTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.moose; +package org.eclipse.ice.tests.item.moose; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/YAMLBlockTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/YAMLBlockTester.java index 1f560e4f3..96ae48cc7 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/moose/YAMLBlockTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.moose; +package org.eclipse.ice.tests.item.moose; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSELauncherTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSELauncherTester.java index 49a0bd93e..2fbce9113 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSELauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.nuclear; +package org.eclipse.ice.tests.item.nuclear; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,8 +37,8 @@ import org.eclipse.ice.io.serializable.IIOService; import org.eclipse.ice.item.nuclear.MOOSE; import org.eclipse.ice.item.nuclear.MOOSELauncher; -import org.eclipse.ice.item.test.FakeIOService; import org.eclipse.ice.item.utilities.moose.MOOSEFileHandler; +import org.eclipse.tests.ice.item.FakeIOService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelBuilderTester.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelBuilderTester.java index ccb02853b..76f1afc03 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.nuclear; +package org.eclipse.ice.tests.item.nuclear; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelTester.java index 1e22a2fc8..d93825a69 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSEModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.nuclear; +package org.eclipse.ice.tests.item.nuclear; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -43,8 +43,8 @@ import org.eclipse.ice.io.serializable.IIOService; import org.eclipse.ice.item.nuclear.MOOSE; import org.eclipse.ice.item.nuclear.MOOSEModel; -import org.eclipse.ice.item.test.FakeIOService; import org.eclipse.ice.item.utilities.moose.MOOSEFileHandler; +import org.eclipse.tests.ice.item.FakeIOService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSETester.java b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSETester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSETester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSETester.java index f1c3771fc..fd9d70d11 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSETester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/ice/tests/item/nuclear/MOOSETester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test.nuclear; +package org.eclipse.ice.tests.item.nuclear; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -49,8 +49,8 @@ import org.eclipse.ice.io.serializable.IIOService; import org.eclipse.ice.item.nuclear.MOOSE; import org.eclipse.ice.item.nuclear.MOOSEModel; -import org.eclipse.ice.item.test.FakeIOService; import org.eclipse.ice.item.utilities.moose.MOOSEFileHandler; +import org.eclipse.tests.ice.item.FakeIOService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractItemBuilderTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractItemBuilderTester.java index ca3be1815..821590f14 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractItemBuilderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractModelBuilderTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractModelBuilderTester.java index 7281787a8..fe63868e5 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/AbstractModelBuilderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ActionTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ActionTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ActionTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ActionTester.java index 6c50d7997..39b0be6a2 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ActionTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ActionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/DockerClientFactoryTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/DockerClientFactoryTester.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/DockerClientFactoryTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/DockerClientFactoryTester.java index 2381cd3a8..01f2bc519 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/DockerClientFactoryTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/DockerClientFactoryTester.java @@ -1,4 +1,4 @@ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeActionFactory.java similarity index 96% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeActionFactory.java index fc3a8809c..e87c15b0e 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeActionFactory.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.ice.item.IActionFactory; import org.eclipse.ice.item.action.Action; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeDataComponent.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeDataComponent.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeDataComponent.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeDataComponent.java index 66ea0131d..e04ace8ae 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeDataComponent.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeDataComponent.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.ice.datastructures.form.DataComponent; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIOService.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIOService.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIOService.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIOService.java index 7ef68baf1..c41287d39 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIOService.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIOService.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import java.util.HashMap; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIWriter.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIWriter.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIWriter.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIWriter.java index cc3c1df4c..ce3a5db03 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeIWriter.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeIWriter.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.core.resources.IFile; import org.eclipse.ice.datastructures.form.Form; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeItemBuilder.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeItemBuilder.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeItemBuilder.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeItemBuilder.java index 80c3b85aa..3fb84bbc4 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeItemBuilder.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeItemBuilder.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.AbstractItemBuilder; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeMaterialsDatabase.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeMaterialsDatabase.java index 2deeb1d6a..a90bda2d8 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeMaterialsDatabase.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import java.util.List; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModel.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModel.java index 821128c01..bfc75ae51 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModel.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.IActionFactory; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModelBuilder.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModelBuilder.java index c7b6612b6..063480cd4 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/FakeModelBuilder.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.Item; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorBuilderTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorBuilderTester.java index f7b0e8804..7a6954b24 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorTester.java index 1e40c98ac..51e45ffcc 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/GeometryEditorTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/GeometryEditorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEActionFactoryTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEActionFactoryTester.java index c048a66fb..aa3ff4db6 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEActionFactoryTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings, Alex McCaskey *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidator.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidator.java similarity index 95% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidator.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidator.java index 95aab3f0b..3e790a102 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidator.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidator.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; /** * diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidatorTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidatorTester.java similarity index 96% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidatorTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidatorTester.java index da3ebefa6..f150403f4 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEDatabaseValidatorTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEDatabaseValidatorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.junit.Ignore; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEJschUIInfoTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEJschUIInfoTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEJschUIInfoTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEJschUIInfoTester.java index 1417d2d25..cd6c00273 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEJschUIInfoTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ICEJschUIInfoTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/IPersistenceProviderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/IPersistenceProviderTester.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/IPersistenceProviderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/IPersistenceProviderTester.java index 36e7a8d85..ad8c6764f 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/IPersistenceProviderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/IPersistenceProviderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemBuilderTester.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemBuilderTester.java index 05d71830c..645d92f57 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemBuilderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java index 263ef27b0..f3c00aec7 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherFormTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherFormTester.java index 87bb2199c..ca7b7ffec 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherFormTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherTester.java index d192b1dc1..4a8bf40ec 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobLauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileBuilderTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileBuilderTester.java index 86ac765f6..3d2317907 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileFormTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileFormTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileFormTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileFormTester.java index e107635b6..d5c1239e0 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileFormTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileFormTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileTester.java index 423e69d4e..3d42bfd54 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/JobProfileTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/LoginInfoFormTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/LoginInfoFormTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/LoginInfoFormTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/LoginInfoFormTester.java index 0b4bc26ed..a608af595 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/LoginInfoFormTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/LoginInfoFormTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/MultiLauncherTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/MultiLauncherTester.java index 16d7b4544..230617511 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/MultiLauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ParameterListTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ParameterListTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ParameterListTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ParameterListTester.java index 0e7f6b7d6..b76775fe2 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ParameterListTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ParameterListTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/RegistryTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/RegistryTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/RegistryTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/RegistryTester.java index 3639478d5..0b014446b 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/RegistryTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/RegistryTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SerializedItemBuilderTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SerializedItemBuilderTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SerializedItemBuilderTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SerializedItemBuilderTester.java index 3eea1ffd6..9c98aaa1a 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SerializedItemBuilderTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SerializedItemBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SuiteLauncherTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SuiteLauncherTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SuiteLauncherTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SuiteLauncherTester.java index c046fbdf8..e8a8cefe9 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/SuiteLauncherTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/SuiteLauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TaggedOutputWriterActionTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TaggedOutputWriterActionTester.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TaggedOutputWriterActionTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TaggedOutputWriterActionTester.java index 99d967239..42160b9f0 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TaggedOutputWriterActionTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TaggedOutputWriterActionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestAction.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestAction.java index b40a3c65a..c55db0258 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestAction.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import java.util.Dictionary; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItem.java similarity index 99% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItem.java index ee7251e0d..9462e55e8 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItem.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import java.util.ArrayList; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItemBuilder.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItemBuilder.java similarity index 97% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItemBuilder.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItemBuilder.java index 6fcfe19c3..2b09ef972 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItemBuilder.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestItemBuilder.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import org.eclipse.core.resources.IProject; import org.eclipse.ice.item.Item; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestJobLauncher.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestJobLauncher.java index 57b9cf99b..3c1992e8f 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/TestJobLauncher.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import java.util.ArrayList; diff --git a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/YAMLTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/YAMLTester.java similarity index 98% rename from org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/YAMLTester.java rename to org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/YAMLTester.java index 92549d5e4..dd816feac 100644 --- a/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/YAMLTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/YAMLTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.item.test; +package org.eclipse.tests.ice.item; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.materials.test/.classpath b/org.eclipse.ice.tests.materials/.classpath similarity index 100% rename from org.eclipse.ice.materials.test/.classpath rename to org.eclipse.ice.tests.materials/.classpath diff --git a/org.eclipse.ice.materials.test/.gitignore b/org.eclipse.ice.tests.materials/.gitignore similarity index 100% rename from org.eclipse.ice.materials.test/.gitignore rename to org.eclipse.ice.tests.materials/.gitignore diff --git a/org.eclipse.ice.materials.test/.project b/org.eclipse.ice.tests.materials/.project similarity index 94% rename from org.eclipse.ice.materials.test/.project rename to org.eclipse.ice.tests.materials/.project index 46e632003..5aa79eeea 100644 --- a/org.eclipse.ice.materials.test/.project +++ b/org.eclipse.ice.tests.materials/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.materials.test + org.eclipse.ice.tests.materials diff --git a/org.eclipse.ice.materials.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.materials/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.materials.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.materials/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.materials.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.materials/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.materials.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.materials/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.materials.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.materials/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.materials.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.materials/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF similarity index 86% rename from org.eclipse.ice.materials.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF index 9938b6831..5f14131ab 100644 --- a/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Materials Tests -Bundle-SymbolicName: org.eclipse.ice.materials.test +Bundle-SymbolicName: org.eclipse.ice.tests.materials Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.materials Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.ice.materials.test/about.html b/org.eclipse.ice.tests.materials/about.html similarity index 100% rename from org.eclipse.ice.materials.test/about.html rename to org.eclipse.ice.tests.materials/about.html diff --git a/org.eclipse.ice.materials.test/build.properties b/org.eclipse.ice.tests.materials/build.properties similarity index 100% rename from org.eclipse.ice.materials.test/build.properties rename to org.eclipse.ice.tests.materials/build.properties diff --git a/org.eclipse.ice.materials.test/pom.xml b/org.eclipse.ice.tests.materials/pom.xml similarity index 91% rename from org.eclipse.ice.materials.test/pom.xml rename to org.eclipse.ice.tests.materials/pom.xml index ecd82f3fb..fc00e731b 100644 --- a/org.eclipse.ice.materials.test/pom.xml +++ b/org.eclipse.ice.tests.materials/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.materials.test + org.eclipse.ice.tests.materials eclipse-test-plugin true diff --git a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialStackWritableTableFormatTest.java b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialStackWritableTableFormatTest.java similarity index 99% rename from org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialStackWritableTableFormatTest.java rename to org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialStackWritableTableFormatTest.java index 984edf965..9069614d8 100644 --- a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialStackWritableTableFormatTest.java +++ b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialStackWritableTableFormatTest.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Kasper Gammeltoft *******************************************************************************/ -package org.eclipse.ice.materials.test; +package org.eclipse.ice.tests.materials; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialWritableTableFormatTester.java similarity index 99% rename from org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java rename to org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialWritableTableFormatTester.java index 0a4b221ad..27a95a051 100644 --- a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java +++ b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/MaterialWritableTableFormatTester.java @@ -11,7 +11,7 @@ * Kasper Gammeltoft (added additional testing for implementation in * MaterialWritableTableFormat class) *******************************************************************************/ -package org.eclipse.ice.materials.test; +package org.eclipse.ice.tests.materials; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/SingleMaterialWritableTableFormatTester.java b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/SingleMaterialWritableTableFormatTester.java similarity index 98% rename from org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/SingleMaterialWritableTableFormatTester.java rename to org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/SingleMaterialWritableTableFormatTester.java index dc8fef071..1c7b4618c 100644 --- a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/SingleMaterialWritableTableFormatTester.java +++ b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/SingleMaterialWritableTableFormatTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Kasper Gammeltoft *******************************************************************************/ -package org.eclipse.ice.materials.test; +package org.eclipse.ice.tests.materials; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/TestMaterialFactory.java b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/TestMaterialFactory.java similarity index 98% rename from org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/TestMaterialFactory.java rename to org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/TestMaterialFactory.java index ad51df84b..ba6748ab4 100644 --- a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/TestMaterialFactory.java +++ b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/TestMaterialFactory.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.materials.test; +package org.eclipse.ice.tests.materials; import org.eclipse.ice.datastructures.form.Material; diff --git a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/XMLMaterialDatabaseTester.java similarity index 99% rename from org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java rename to org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/XMLMaterialDatabaseTester.java index 1f46ec965..a2c1a2a29 100644 --- a/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java +++ b/org.eclipse.ice.tests.materials/src/org/eclipse/ice/tests/materials/XMLMaterialDatabaseTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.materials.test; +package org.eclipse.ice.tests.materials; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.mesh.test/.classpath b/org.eclipse.ice.tests.mesh/.classpath similarity index 100% rename from org.eclipse.ice.mesh.test/.classpath rename to org.eclipse.ice.tests.mesh/.classpath diff --git a/org.eclipse.ice.mesh.test/.gitignore b/org.eclipse.ice.tests.mesh/.gitignore similarity index 100% rename from org.eclipse.ice.mesh.test/.gitignore rename to org.eclipse.ice.tests.mesh/.gitignore diff --git a/org.eclipse.ice.vibe.test/.project b/org.eclipse.ice.tests.mesh/.project similarity index 95% rename from org.eclipse.ice.vibe.test/.project rename to org.eclipse.ice.tests.mesh/.project index dc72c4a94..5284bacdd 100644 --- a/org.eclipse.ice.vibe.test/.project +++ b/org.eclipse.ice.tests.mesh/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.vibe.test + org.eclipse.ice.tests.mesh diff --git a/org.eclipse.ice.mesh.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.mesh/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.mesh.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.mesh/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.mesh.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.mesh/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.mesh.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.mesh/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.mesh.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF similarity index 86% rename from org.eclipse.ice.mesh.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF index 0ca52bf4d..5f952034f 100644 --- a/org.eclipse.ice.mesh.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mesh Test -Bundle-SymbolicName: org.eclipse.ice.mesh.test +Bundle-SymbolicName: org.eclipse.ice.tests.mesh Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.mesh Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.ice.mesh.test/about.html b/org.eclipse.ice.tests.mesh/about.html similarity index 100% rename from org.eclipse.ice.mesh.test/about.html rename to org.eclipse.ice.tests.mesh/about.html diff --git a/org.eclipse.ice.mesh.test/build.properties b/org.eclipse.ice.tests.mesh/build.properties similarity index 100% rename from org.eclipse.ice.mesh.test/build.properties rename to org.eclipse.ice.tests.mesh/build.properties diff --git a/org.eclipse.ice.mesh.test/pom.xml b/org.eclipse.ice.tests.mesh/pom.xml similarity index 92% rename from org.eclipse.ice.mesh.test/pom.xml rename to org.eclipse.ice.tests.mesh/pom.xml index f34b590d1..e577ec9e4 100644 --- a/org.eclipse.ice.mesh.test/pom.xml +++ b/org.eclipse.ice.tests.mesh/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.mesh.test + org.eclipse.ice.tests.mesh eclipse-test-plugin true diff --git a/org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorBuilderTester.java b/org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorBuilderTester.java similarity index 97% rename from org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorBuilderTester.java rename to org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorBuilderTester.java index b8890d1a6..bf8c23924 100644 --- a/org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorBuilderTester.java +++ b/org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.mesh.test; +package org.eclipse.ice.tests.mesh; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorTester.java b/org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorTester.java similarity index 97% rename from org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorTester.java rename to org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorTester.java index 52981fa49..bf8c974ee 100644 --- a/org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorTester.java +++ b/org.eclipse.ice.tests.mesh/src/org/eclipse/ice/tests/mesh/MeshEditorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.mesh.test; +package org.eclipse.ice.tests.mesh; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.nek5000.test/.classpath b/org.eclipse.ice.tests.nek5000/.classpath similarity index 100% rename from org.eclipse.ice.nek5000.test/.classpath rename to org.eclipse.ice.tests.nek5000/.classpath diff --git a/org.eclipse.ice.nek5000.test/.gitignore b/org.eclipse.ice.tests.nek5000/.gitignore similarity index 100% rename from org.eclipse.ice.nek5000.test/.gitignore rename to org.eclipse.ice.tests.nek5000/.gitignore diff --git a/org.eclipse.ice.tests.nek5000/.project b/org.eclipse.ice.tests.nek5000/.project new file mode 100644 index 000000000..2001b4c6a --- /dev/null +++ b/org.eclipse.ice.tests.nek5000/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.nek5000 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.nek5000.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.nek5000/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.nek5000.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.nek5000/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.nek5000.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.nek5000/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.nek5000.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.nek5000/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.nek5000.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.nek5000/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.nek5000.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.nek5000/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.nek5000.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF similarity index 93% rename from org.eclipse.ice.nek5000.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF index 73d155172..ac6ae0551 100644 --- a/org.eclipse.ice.nek5000.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.nek5000.test -Bundle-SymbolicName: org.eclipse.ice.nek5000.test +Bundle-SymbolicName: org.eclipse.ice.tests.nek5000 Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.nek5000 Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.ice.nek5000.test/about.html b/org.eclipse.ice.tests.nek5000/about.html similarity index 100% rename from org.eclipse.ice.nek5000.test/about.html rename to org.eclipse.ice.tests.nek5000/about.html diff --git a/org.eclipse.ice.nek5000.test/build.properties b/org.eclipse.ice.tests.nek5000/build.properties similarity index 100% rename from org.eclipse.ice.nek5000.test/build.properties rename to org.eclipse.ice.tests.nek5000/build.properties diff --git a/org.eclipse.ice.nek5000.test/pom.xml b/org.eclipse.ice.tests.nek5000/pom.xml similarity index 91% rename from org.eclipse.ice.nek5000.test/pom.xml rename to org.eclipse.ice.tests.nek5000/pom.xml index 3b48764a0..4c6b836b1 100644 --- a/org.eclipse.ice.nek5000.test/pom.xml +++ b/org.eclipse.ice.tests.nek5000/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.nek5000.test + org.eclipse.ice.tests.nek5000 eclipse-test-plugin true diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelBuilderTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelBuilderTester.java similarity index 97% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelBuilderTester.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelBuilderTester.java index 566882db3..d91ead5c7 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelBuilderTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java similarity index 99% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelTester.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java index 533e44374..314d3d6bb 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekModelTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekReaderTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekReaderTester.java similarity index 97% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekReaderTester.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekReaderTester.java index 167b0dc33..b40b79537 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekReaderTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekReaderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekWriterTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekWriterTester.java similarity index 96% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekWriterTester.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekWriterTester.java index 404e24505..d5172b799 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekWriterTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekWriterTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/ProblemPropertiesTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/ProblemPropertiesTester.java similarity index 95% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/ProblemPropertiesTester.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/ProblemPropertiesTester.java index bc78055cd..0e404bf4f 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/ProblemPropertiesTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/ProblemPropertiesTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/TestNekControllerFactory.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/TestNekControllerFactory.java similarity index 95% rename from org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/TestNekControllerFactory.java rename to org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/TestNekControllerFactory.java index 0ebb2ff11..f78d548e2 100644 --- a/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/TestNekControllerFactory.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/TestNekControllerFactory.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.nek5000.test; +package org.eclipse.ice.tests.nek5000; import org.eclipse.eavp.viz.modeling.base.BasicView; import org.eclipse.eavp.viz.modeling.EdgeController; diff --git a/org.eclipse.ice.parsergenerator.test/.classpath b/org.eclipse.ice.tests.parsergenerator/.classpath similarity index 100% rename from org.eclipse.ice.parsergenerator.test/.classpath rename to org.eclipse.ice.tests.parsergenerator/.classpath diff --git a/org.eclipse.ice.parsergenerator.test/.gitignore b/org.eclipse.ice.tests.parsergenerator/.gitignore similarity index 100% rename from org.eclipse.ice.parsergenerator.test/.gitignore rename to org.eclipse.ice.tests.parsergenerator/.gitignore diff --git a/org.eclipse.ice.parsergenerator.test/.project b/org.eclipse.ice.tests.parsergenerator/.project similarity index 92% rename from org.eclipse.ice.parsergenerator.test/.project rename to org.eclipse.ice.tests.parsergenerator/.project index 580b3430d..44eee779b 100644 --- a/org.eclipse.ice.parsergenerator.test/.project +++ b/org.eclipse.ice.tests.parsergenerator/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.parsergenerator.test + org.eclipse.ice.tests.parsergenerator diff --git a/org.eclipse.ice.parsergenerator.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.parsergenerator/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.parsergenerator.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.parsergenerator/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.parsergenerator.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.parsergenerator/META-INF/MANIFEST.MF similarity index 74% rename from org.eclipse.ice.parsergenerator.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.parsergenerator/META-INF/MANIFEST.MF index 18ea34bff..8aeadb679 100644 --- a/org.eclipse.ice.parsergenerator.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.parsergenerator/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Parser Generator Tester -Bundle-SymbolicName: org.eclipse.ice.parsergenerator.test +Bundle-SymbolicName: org.eclipse.ice.tests.parsergenerator Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.eclipse.ice.parsergenerator.test.Activator +Bundle-Activator: org.eclipse.ice.tests.parsergenerator.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit, diff --git a/org.eclipse.ice.parsergenerator.test/build.properties b/org.eclipse.ice.tests.parsergenerator/build.properties similarity index 100% rename from org.eclipse.ice.parsergenerator.test/build.properties rename to org.eclipse.ice.tests.parsergenerator/build.properties diff --git a/org.eclipse.ice.parsergenerator.test/pom.xml b/org.eclipse.ice.tests.parsergenerator/pom.xml similarity index 90% rename from org.eclipse.ice.parsergenerator.test/pom.xml rename to org.eclipse.ice.tests.parsergenerator/pom.xml index 801ba1604..b3fdbf409 100644 --- a/org.eclipse.ice.parsergenerator.test/pom.xml +++ b/org.eclipse.ice.tests.parsergenerator/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.parsergenerator.test + org.eclipse.ice.tests.parsergenerator eclipse-test-plugin true diff --git a/org.eclipse.ice.parsergenerator.test/src/org/eclipse/ice/parsergenerator/test/GrammarTester.java b/org.eclipse.ice.tests.parsergenerator/src/org/eclipse/ice/tests/parsergenerator/GrammarTester.java similarity index 97% rename from org.eclipse.ice.parsergenerator.test/src/org/eclipse/ice/parsergenerator/test/GrammarTester.java rename to org.eclipse.ice.tests.parsergenerator/src/org/eclipse/ice/tests/parsergenerator/GrammarTester.java index 57308ea33..4f85493fd 100644 --- a/org.eclipse.ice.parsergenerator.test/src/org/eclipse/ice/parsergenerator/test/GrammarTester.java +++ b/org.eclipse.ice.tests.parsergenerator/src/org/eclipse/ice/tests/parsergenerator/GrammarTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.parsergenerator.test; +package org.eclipse.ice.tests.parsergenerator; import org.junit.Test; diff --git a/org.eclipse.ice.persistence.xml.test/.classpath b/org.eclipse.ice.tests.persistence.xml/.classpath similarity index 100% rename from org.eclipse.ice.persistence.xml.test/.classpath rename to org.eclipse.ice.tests.persistence.xml/.classpath diff --git a/org.eclipse.ice.persistence.xml.test/.gitignore b/org.eclipse.ice.tests.persistence.xml/.gitignore similarity index 100% rename from org.eclipse.ice.persistence.xml.test/.gitignore rename to org.eclipse.ice.tests.persistence.xml/.gitignore diff --git a/org.eclipse.ice.tests.persistence.xml/.project b/org.eclipse.ice.tests.persistence.xml/.project new file mode 100644 index 000000000..b76d7698c --- /dev/null +++ b/org.eclipse.ice.tests.persistence.xml/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.persistence.xml + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.persistence.xml.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.persistence.xml/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF similarity index 81% rename from org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF index f9d50b47c..60ac95b1a 100644 --- a/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE XML Persistence Provider Tests -Bundle-SymbolicName: org.eclipse.ice.persistence.xml.test +Bundle-SymbolicName: org.eclipse.ice.tests.persistence.xml Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit, @@ -14,4 +14,4 @@ Import-Package: org.eclipse.ice.vibe.kvPair, org.eclipse.ice.vibe.launcher, org.eclipse.ice.item.nuclear Bundle-Vendor: Oak Ridge National Laboratory -Export-Package: org.eclipse.ice.persistence.xml.test +Export-Package: org.eclipse.ice.tests.persistence.xml diff --git a/org.eclipse.ice.persistence.xml.test/about.html b/org.eclipse.ice.tests.persistence.xml/about.html similarity index 100% rename from org.eclipse.ice.persistence.xml.test/about.html rename to org.eclipse.ice.tests.persistence.xml/about.html diff --git a/org.eclipse.ice.persistence.xml.test/build.properties b/org.eclipse.ice.tests.persistence.xml/build.properties similarity index 100% rename from org.eclipse.ice.persistence.xml.test/build.properties rename to org.eclipse.ice.tests.persistence.xml/build.properties diff --git a/org.eclipse.ice.persistence.xml.test/pom.xml b/org.eclipse.ice.tests.persistence.xml/pom.xml similarity index 91% rename from org.eclipse.ice.persistence.xml.test/pom.xml rename to org.eclipse.ice.tests.persistence.xml/pom.xml index eba58ab69..de3ee6ad3 100644 --- a/org.eclipse.ice.persistence.xml.test/pom.xml +++ b/org.eclipse.ice.tests.persistence.xml/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.persistence.xml.test + org.eclipse.ice.tests.persistence.xml 2.2.0-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLFormContentDescriberTester.java b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLFormContentDescriberTester.java similarity index 98% rename from org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLFormContentDescriberTester.java rename to org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLFormContentDescriberTester.java index a97df01ac..da98c079b 100644 --- a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLFormContentDescriberTester.java +++ b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLFormContentDescriberTester.java @@ -1,7 +1,7 @@ /** * */ -package org.eclipse.ice.persistence.xml.test; +package org.eclipse.ice.tests.persistence.xml; /******************************************************************************* * Copyright (c) 2012, 2014 UT-Battelle, LLC. diff --git a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceExtensionFactoryTester.java b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceExtensionFactoryTester.java similarity index 97% rename from org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceExtensionFactoryTester.java rename to org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceExtensionFactoryTester.java index aec1542c6..098a2cc28 100644 --- a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceExtensionFactoryTester.java +++ b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceExtensionFactoryTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.persistence.xml.test; +package org.eclipse.ice.tests.persistence.xml; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceProviderTester.java similarity index 99% rename from org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java rename to org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceProviderTester.java index 466dedb04..d5bb268af 100644 --- a/org.eclipse.ice.persistence.xml.test/src/org/eclipse/ice/persistence/xml/test/XMLPersistenceProviderTester.java +++ b/org.eclipse.ice.tests.persistence.xml/src/org/eclipse/ice/tests/persistence/xml/XMLPersistenceProviderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.persistence.xml.test; +package org.eclipse.ice.tests.persistence.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.projectgeneration.test/.classpath b/org.eclipse.ice.tests.projectgeneration/.classpath similarity index 100% rename from org.eclipse.ice.projectgeneration.test/.classpath rename to org.eclipse.ice.tests.projectgeneration/.classpath diff --git a/org.eclipse.ice.projectgeneration.test/.gitignore b/org.eclipse.ice.tests.projectgeneration/.gitignore similarity index 100% rename from org.eclipse.ice.projectgeneration.test/.gitignore rename to org.eclipse.ice.tests.projectgeneration/.gitignore diff --git a/org.eclipse.ice.tests.projectgeneration/.project b/org.eclipse.ice.tests.projectgeneration/.project new file mode 100644 index 000000000..c51db8620 --- /dev/null +++ b/org.eclipse.ice.tests.projectgeneration/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.projectgeneration + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.projectgeneration.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.projectgeneration/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.projectgeneration.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.projectgeneration/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.projectgeneration.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.projectgeneration/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.projectgeneration.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.projectgeneration/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.projectgeneration.test/ItemGenTester.launch b/org.eclipse.ice.tests.projectgeneration/ItemGenTester.launch similarity index 99% rename from org.eclipse.ice.projectgeneration.test/ItemGenTester.launch rename to org.eclipse.ice.tests.projectgeneration/ItemGenTester.launch index cb6da92dd..926f49164 100644 --- a/org.eclipse.ice.projectgeneration.test/ItemGenTester.launch +++ b/org.eclipse.ice.tests.projectgeneration/ItemGenTester.launch @@ -1,43 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.projectgeneration.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF similarity index 84% rename from org.eclipse.ice.projectgeneration.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF index 417bea038..2f50164b2 100644 --- a/org.eclipse.ice.projectgeneration.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ProjectGenerationTester -Bundle-SymbolicName: org.eclipse.ice.projectgeneration.test;singleton:=true +Bundle-SymbolicName: org.eclipse.ice.tests.projectgeneration;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.resources, diff --git a/org.eclipse.ice.projectgeneration.test/build.properties b/org.eclipse.ice.tests.projectgeneration/build.properties similarity index 100% rename from org.eclipse.ice.projectgeneration.test/build.properties rename to org.eclipse.ice.tests.projectgeneration/build.properties diff --git a/org.eclipse.ice.projectgeneration.test/plugin.xml b/org.eclipse.ice.tests.projectgeneration/plugin.xml similarity index 84% rename from org.eclipse.ice.projectgeneration.test/plugin.xml rename to org.eclipse.ice.tests.projectgeneration/plugin.xml index 2320d8d1e..e47c15947 100644 --- a/org.eclipse.ice.projectgeneration.test/plugin.xml +++ b/org.eclipse.ice.tests.projectgeneration/plugin.xml @@ -4,7 +4,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.projectgeneration.test + org.eclipse.ice.tests.projectgeneration eclipse-test-plugin diff --git a/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java b/org.eclipse.ice.tests.projectgeneration/src/org/eclipse/ice/tests/projectgeneration/NewICEItemProjectTester.java similarity index 98% rename from org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java rename to org.eclipse.ice.tests.projectgeneration/src/org/eclipse/ice/tests/projectgeneration/NewICEItemProjectTester.java index e85b9ef35..c6baef839 100644 --- a/org.eclipse.ice.projectgeneration.test/src/org/eclipse/ice/projectgeneration/test/NewICEItemProjectTester.java +++ b/org.eclipse.ice.tests.projectgeneration/src/org/eclipse/ice/tests/projectgeneration/NewICEItemProjectTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.projectgeneration.test; +package org.eclipse.ice.tests.projectgeneration; import static org.junit.Assert.*; diff --git a/org.eclipse.ice.proteus.test/.classpath b/org.eclipse.ice.tests.proteus/.classpath similarity index 100% rename from org.eclipse.ice.proteus.test/.classpath rename to org.eclipse.ice.tests.proteus/.classpath diff --git a/org.eclipse.ice.proteus.test/.gitignore b/org.eclipse.ice.tests.proteus/.gitignore similarity index 100% rename from org.eclipse.ice.proteus.test/.gitignore rename to org.eclipse.ice.tests.proteus/.gitignore diff --git a/org.eclipse.ice.tests.proteus/.project b/org.eclipse.ice.tests.proteus/.project new file mode 100644 index 000000000..151f8064f --- /dev/null +++ b/org.eclipse.ice.tests.proteus/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.proteus + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.proteus.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.proteus/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.proteus.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.proteus/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.proteus.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.proteus/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.proteus.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.proteus/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.proteus.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.proteus/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.proteus.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.proteus/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.proteus.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF similarity index 93% rename from org.eclipse.ice.proteus.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF index 7aee0e579..420cf1a59 100644 --- a/org.eclipse.ice.proteus.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PROTEUSModelTester -Bundle-SymbolicName: org.eclipse.ice.proteus.test +Bundle-SymbolicName: org.eclipse.ice.tests.proteus Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.proteus Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.ice.proteus.test/about.html b/org.eclipse.ice.tests.proteus/about.html similarity index 100% rename from org.eclipse.ice.proteus.test/about.html rename to org.eclipse.ice.tests.proteus/about.html diff --git a/org.eclipse.ice.proteus.test/build.properties b/org.eclipse.ice.tests.proteus/build.properties similarity index 100% rename from org.eclipse.ice.proteus.test/build.properties rename to org.eclipse.ice.tests.proteus/build.properties diff --git a/org.eclipse.ice.proteus.test/pom.xml b/org.eclipse.ice.tests.proteus/pom.xml similarity index 91% rename from org.eclipse.ice.proteus.test/pom.xml rename to org.eclipse.ice.tests.proteus/pom.xml index 06aae739f..bbfa92273 100644 --- a/org.eclipse.ice.proteus.test/pom.xml +++ b/org.eclipse.ice.tests.proteus/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.proteus.test + org.eclipse.ice.tests.proteus eclipse-test-plugin true diff --git a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherBuilderTester.java b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherBuilderTester.java similarity index 95% rename from org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherBuilderTester.java rename to org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherBuilderTester.java index f2901ebca..a6bd745c5 100644 --- a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherBuilderTester.java +++ b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.proteus.test; +package org.eclipse.ice.tests.proteus; import static org.junit.Assert.*; diff --git a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherTester.java b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherTester.java similarity index 96% rename from org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherTester.java rename to org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherTester.java index b9e75071d..2f23ad728 100644 --- a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSLauncherTester.java +++ b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSLauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.proteus.test; +package org.eclipse.ice.tests.proteus; import static org.junit.Assert.*; diff --git a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelBuilderTester.java b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelBuilderTester.java similarity index 95% rename from org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelBuilderTester.java rename to org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelBuilderTester.java index 76dff297d..7ebc247f3 100644 --- a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelBuilderTester.java +++ b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.proteus.test; +package org.eclipse.ice.tests.proteus; import static org.junit.Assert.*; diff --git a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelTester.java b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelTester.java similarity index 96% rename from org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelTester.java rename to org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelTester.java index 06737011c..147aa5380 100644 --- a/org.eclipse.ice.proteus.test/src/org/eclipse/ice/proteus/test/PROTEUSModelTester.java +++ b/org.eclipse.ice.tests.proteus/src/org/eclipse/ice/tests/proteus/PROTEUSModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.proteus.test; +package org.eclipse.ice.tests.proteus; import static org.junit.Assert.*; diff --git a/org.eclipse.ice.reactor.plant.test/.classpath b/org.eclipse.ice.tests.reactor.plant/.classpath similarity index 100% rename from org.eclipse.ice.reactor.plant.test/.classpath rename to org.eclipse.ice.tests.reactor.plant/.classpath diff --git a/org.eclipse.ice.reactor.plant.test/.gitignore b/org.eclipse.ice.tests.reactor.plant/.gitignore similarity index 100% rename from org.eclipse.ice.reactor.plant.test/.gitignore rename to org.eclipse.ice.tests.reactor.plant/.gitignore diff --git a/org.eclipse.ice.client.widgets.test/.project b/org.eclipse.ice.tests.reactor.plant/.project similarity index 94% rename from org.eclipse.ice.client.widgets.test/.project rename to org.eclipse.ice.tests.reactor.plant/.project index c7e2403b0..696d21c23 100644 --- a/org.eclipse.ice.client.widgets.test/.project +++ b/org.eclipse.ice.tests.reactor.plant/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.client.widgets.test + org.eclipse.ice.tests.reactor.plant diff --git a/org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.reactor.plant.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.reactor.plant/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.reactor.plant.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF similarity index 88% rename from org.eclipse.ice.reactor.plant.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF index 242633ea6..e1ff38924 100644 --- a/org.eclipse.ice.reactor.plant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.reactor.plant.test -Bundle-SymbolicName: org.eclipse.ice.reactor.plant.test +Bundle-SymbolicName: org.eclipse.ice.tests.reactor.plant Bundle-Version: 2.2.0.qualifier Fragment-Host: org.eclipse.ice.reactor.plant Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.ice.reactor.plant.test/about.html b/org.eclipse.ice.tests.reactor.plant/about.html similarity index 100% rename from org.eclipse.ice.reactor.plant.test/about.html rename to org.eclipse.ice.tests.reactor.plant/about.html diff --git a/org.eclipse.ice.reactor.plant.test/build.properties b/org.eclipse.ice.tests.reactor.plant/build.properties similarity index 100% rename from org.eclipse.ice.reactor.plant.test/build.properties rename to org.eclipse.ice.tests.reactor.plant/build.properties diff --git a/org.eclipse.ice.tests.reactor.plant/pom.xml b/org.eclipse.ice.tests.reactor.plant/pom.xml new file mode 100644 index 000000000..464993c65 --- /dev/null +++ b/org.eclipse.ice.tests.reactor.plant/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + org.eclipse.ice + org.eclipse.ice.build + 2.2.0-SNAPSHOT + ../org.eclipse.ice.parent/pom.xml + + org.eclipse.ice + org.eclipse.ice.tests.reactor.plant + eclipse-test-plugin + + true + + diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BoundaryTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BoundaryTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BoundaryTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BoundaryTester.java index fc3ce5666..715e5c6f5 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BoundaryTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BoundaryTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BranchTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BranchTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BranchTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BranchTester.java index b430a3662..0c430c365 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/BranchTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/BranchTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/CoreChannelTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/CoreChannelTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/CoreChannelTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/CoreChannelTester.java index 9fdfe8d90..ccfe8844a 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/CoreChannelTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/CoreChannelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/DownComerTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/DownComerTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/DownComerTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/DownComerTester.java index 110fc724d..ce35b8517 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/DownComerTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/DownComerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/FlowJunctionTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/FlowJunctionTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/FlowJunctionTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/FlowJunctionTester.java index 89c1d289f..7492955f1 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/FlowJunctionTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/FlowJunctionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/GeometricalComponentTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/GeometricalComponentTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/GeometricalComponentTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/GeometricalComponentTester.java index 30ce56e69..28b7d858f 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/GeometricalComponentTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/GeometricalComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/HeatExchangerTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/HeatExchangerTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/HeatExchangerTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/HeatExchangerTester.java index e15aaa2fa..66612f1f9 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/HeatExchangerTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/HeatExchangerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/IdealPumpTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/IdealPumpTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/IdealPumpTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/IdealPumpTester.java index c6f34731d..6abdf3046 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/IdealPumpTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/IdealPumpTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/InletTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/InletTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/InletTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/InletTester.java index 257cb43fe..b2f2ba937 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/InletTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/InletTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/JunctionTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/JunctionTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/JunctionTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/JunctionTester.java index e40362616..9d0a52768 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/JunctionTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/JunctionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/MassFlowInletTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/MassFlowInletTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/MassFlowInletTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/MassFlowInletTester.java index d335504c7..027ea0ec1 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/MassFlowInletTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/MassFlowInletTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OneInOneOutJunctionTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OneInOneOutJunctionTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OneInOneOutJunctionTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OneInOneOutJunctionTester.java index adfe4e150..9f5b55052 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OneInOneOutJunctionTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OneInOneOutJunctionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OutletTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OutletTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OutletTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OutletTester.java index 78c51c3e7..a1ade499b 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/OutletTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/OutletTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeTester.java index 76a409a06..dbcd31883 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeToPipeJunctionTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeToPipeJunctionTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeToPipeJunctionTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeToPipeJunctionTester.java index 819ee60c5..3cb2140a9 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeToPipeJunctionTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeToPipeJunctionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeWithHeatStructureTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeWithHeatStructureTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeWithHeatStructureTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeWithHeatStructureTester.java index 3147258f6..3dd039374 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PipeWithHeatStructureTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PipeWithHeatStructureTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantComponentTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantComponentTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantComponentTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantComponentTester.java index e60c58bec..d84045320 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantComponentTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantComponentTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantCompositeTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantCompositeTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantCompositeTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantCompositeTester.java index 2a4efb544..b329c4040 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PlantCompositeTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PlantCompositeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PointKineticsTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PointKineticsTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PointKineticsTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PointKineticsTester.java index bb633d2fa..9ad9c16ef 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PointKineticsTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PointKineticsTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PumpTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PumpTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PumpTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PumpTester.java index ebbdd26c1..2de5137eb 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/PumpTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/PumpTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ReactorTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ReactorTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ReactorTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ReactorTester.java index baf8e9076..95cdcc01e 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ReactorTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ReactorTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SeparatorDryerTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SeparatorDryerTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SeparatorDryerTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SeparatorDryerTester.java index 3640c4ba6..1b35f2e5d 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SeparatorDryerTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SeparatorDryerTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SolidWallTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SolidWallTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SolidWallTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SolidWallTester.java index d6d393def..9da05a0bb 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SolidWallTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SolidWallTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SpecifiedDensityAndVelocityInletTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SpecifiedDensityAndVelocityInletTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SpecifiedDensityAndVelocityInletTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SpecifiedDensityAndVelocityInletTester.java index 0d4a8a2ab..924e5b804 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SpecifiedDensityAndVelocityInletTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SpecifiedDensityAndVelocityInletTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelBranchTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelBranchTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelBranchTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelBranchTester.java index 826f97d6a..45c32b1e7 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelBranchTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelBranchTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelTester.java index 9c199cf32..25070892d 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/SubchannelTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/SubchannelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TDMTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TDMTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TDMTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TDMTester.java index 48a7c3db6..96684b801 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TDMTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TDMTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentJunctionTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentJunctionTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentJunctionTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentJunctionTester.java index 67c7d2cfe..aa05a3954 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentJunctionTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentJunctionTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentVolumeTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentVolumeTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentVolumeTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentVolumeTester.java index 8ecc14b42..0a844a1bb 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TimeDependentVolumeTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TimeDependentVolumeTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TurbineTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TurbineTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TurbineTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TurbineTester.java index a0c0b0c1e..c37dee86d 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/TurbineTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/TurbineTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ValveTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ValveTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ValveTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ValveTester.java index 09ca4c6f8..d53bc2c44 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/ValveTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/ValveTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/VolumeBranchTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/VolumeBranchTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/VolumeBranchTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/VolumeBranchTester.java index db896e61b..5ed4638ad 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/VolumeBranchTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/VolumeBranchTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/WetWellTester.java b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/WetWellTester.java similarity index 99% rename from org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/WetWellTester.java rename to org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/WetWellTester.java index c952f8b60..df8073a69 100644 --- a/org.eclipse.ice.reactor.plant.test/src/org/eclipse/ice/reactor/plant/test/WetWellTester.java +++ b/org.eclipse.ice.tests.reactor.plant/src/org/eclipse/ice/tests/reactor/plant/WetWellTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reactor.plant.test; +package org.eclipse.ice.tests.reactor.plant; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/org.eclipse.ice.reflectivity.test/.classpath b/org.eclipse.ice.tests.reflectivity/.classpath similarity index 100% rename from org.eclipse.ice.reflectivity.test/.classpath rename to org.eclipse.ice.tests.reflectivity/.classpath diff --git a/org.eclipse.ice.reflectivity.test/.gitignore b/org.eclipse.ice.tests.reflectivity/.gitignore similarity index 100% rename from org.eclipse.ice.reflectivity.test/.gitignore rename to org.eclipse.ice.tests.reflectivity/.gitignore diff --git a/org.eclipse.ice.tests.reflectivity/.project b/org.eclipse.ice.tests.reflectivity/.project new file mode 100644 index 000000000..66f32e5d9 --- /dev/null +++ b/org.eclipse.ice.tests.reflectivity/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.reflectivity + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.reflectivity.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.reflectivity/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.reflectivity.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.reflectivity/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.reflectivity.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.reflectivity/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.reflectivity.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.reflectivity/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF similarity index 87% rename from org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF index 116ecc6a0..e56319825 100644 --- a/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ReflectivityTest -Bundle-SymbolicName: org.eclipse.ice.reflectivity.test +Bundle-SymbolicName: org.eclipse.ice.tests.reflectivity Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0", @@ -14,8 +14,8 @@ Import-Package: org.apache.commons.math;version="2.1.0", org.eclipse.ice.io.csv, org.eclipse.ice.materials, org.eclipse.ice.persistence.xml, - org.eclipse.ice.persistence.xml.test, org.eclipse.ice.reflectivity, org.eclipse.ice.reflectivity.ui, + org.eclipse.ice.tests.persistence.xml, org.eclipse.ui.forms.widgets Bundle-Vendor: Oak Ridge National Laboratory diff --git a/org.eclipse.ice.reflectivity.test/about.html b/org.eclipse.ice.tests.reflectivity/about.html similarity index 100% rename from org.eclipse.ice.reflectivity.test/about.html rename to org.eclipse.ice.tests.reflectivity/about.html diff --git a/org.eclipse.ice.reflectivity.test/build.properties b/org.eclipse.ice.tests.reflectivity/build.properties similarity index 100% rename from org.eclipse.ice.reflectivity.test/build.properties rename to org.eclipse.ice.tests.reflectivity/build.properties diff --git a/org.eclipse.ice.tests.reflectivity/pom.xml b/org.eclipse.ice.tests.reflectivity/pom.xml new file mode 100644 index 000000000..06aa1cb40 --- /dev/null +++ b/org.eclipse.ice.tests.reflectivity/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + org.eclipse.ice + org.eclipse.ice.build + 2.2.0-SNAPSHOT + ../org.eclipse.ice.parent/pom.xml + + org.eclipse.ice + org.eclipse.ice.tests.reflectivity + eclipse-test-plugin + + true + + diff --git a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityCalculatorTester.java similarity index 99% rename from org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java rename to org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityCalculatorTester.java index bddf38d24..e97f5cc0e 100644 --- a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java +++ b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityCalculatorTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings, John Ankner *******************************************************************************/ -package org.eclipse.ice.reflectivity.test; +package org.eclipse.ice.tests.reflectivity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelBuilderTester.java similarity index 98% rename from org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java rename to org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelBuilderTester.java index 2a9e9fb06..91d14c188 100644 --- a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java +++ b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelBuilderTester.java @@ -9,7 +9,7 @@ * Initial API and implementation and/or initial documentation - * Jay Jay Billings *******************************************************************************/ -package org.eclipse.ice.reflectivity.test; +package org.eclipse.ice.tests.reflectivity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelTester.java similarity index 98% rename from org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java rename to org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelTester.java index 0f17eb63d..682380f46 100644 --- a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java +++ b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.reflectivity.test; +package org.eclipse.ice.tests.reflectivity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityXMLFormContentDescriberTester.java b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityXMLFormContentDescriberTester.java similarity index 93% rename from org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityXMLFormContentDescriberTester.java rename to org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityXMLFormContentDescriberTester.java index 5ad36c6d3..541b120f9 100644 --- a/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityXMLFormContentDescriberTester.java +++ b/org.eclipse.ice.tests.reflectivity/src/org/eclipse/ice/tests/reflectivity/ReflectivityXMLFormContentDescriberTester.java @@ -1,11 +1,11 @@ -package org.eclipse.ice.reflectivity.test; +package org.eclipse.ice.tests.reflectivity; import java.io.ByteArrayInputStream; import java.io.IOException; import org.eclipse.ice.persistence.xml.XMLFormContentDescriber; -import org.eclipse.ice.persistence.xml.test.XMLFormContentDescriberTester; import org.eclipse.ice.reflectivity.ui.ReflectivityXMLFormContentDescriber; +import org.eclipse.ice.tests.persistence.xml.XMLFormContentDescriberTester; /** * This class is responsible for testing diff --git a/org.eclipse.ice.ui.swtbot.test/.classpath b/org.eclipse.ice.tests.ui.swtbot/.classpath similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/.classpath rename to org.eclipse.ice.tests.ui.swtbot/.classpath diff --git a/org.eclipse.ice.ui.swtbot.test/.gitignore b/org.eclipse.ice.tests.ui.swtbot/.gitignore similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/.gitignore rename to org.eclipse.ice.tests.ui.swtbot/.gitignore diff --git a/org.eclipse.ice.tests.ui.swtbot/.project b/org.eclipse.ice.tests.ui.swtbot/.project new file mode 100644 index 000000000..2cbbd77f3 --- /dev/null +++ b/org.eclipse.ice.tests.ui.swtbot/.project @@ -0,0 +1,34 @@ + + + org.eclipse.ice.tests.ui.swtbot + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.ice.ui.swtbot.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.ui.swtbot/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.ui.swtbot/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.ui.swtbot.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.ui.swtbot/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.ui.swtbot/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.ui.swtbot.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF similarity index 89% rename from org.eclipse.ice.ui.swtbot.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF index 0ede358c0..423558682 100644 --- a/org.eclipse.ice.ui.swtbot.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE SWTBot UI Test Bundle -Bundle-SymbolicName: org.eclipse.ice.ui.swtbot.test +Bundle-SymbolicName: org.eclipse.ice.tests.ui.swtbot Bundle-Version: 2.1.7.20150825 Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -9,10 +9,10 @@ Import-Package: ca.odell.glazedlists, ca.odell.glazedlists.gui, org.eclipse.ice.client.common, org.eclipse.ice.client.internal, - org.eclipse.ice.client.widgets.test.utils, org.eclipse.ice.datastructures.form, org.eclipse.ice.materials, org.eclipse.ice.materials.ui, + org.eclipse.ice.tests.client.widgets.utils, org.eclipse.nebula.widgets.nattable;version="1.3.0", org.eclipse.ui.internal.views.properties.tabbed.view, org.slf4j;version="1.7.2" diff --git a/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch b/org.eclipse.ice.tests.ui.swtbot/MOOSETester.launch similarity index 99% rename from org.eclipse.ice.ui.swtbot.test/MOOSETester.launch rename to org.eclipse.ice.tests.ui.swtbot/MOOSETester.launch index d26a74ecc..0c895db5d 100644 --- a/org.eclipse.ice.ui.swtbot.test/MOOSETester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/MOOSETester.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch b/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch similarity index 98% rename from org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch rename to org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch index c5a0c8035..14fb5e5e0 100644 --- a/org.eclipse.ice.ui.swtbot.test/MaterialsDatabaseTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch b/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch similarity index 99% rename from org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch rename to org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch index bc0c389db..016642c86 100644 --- a/org.eclipse.ice.ui.swtbot.test/ReflectivityModelTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch b/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch similarity index 99% rename from org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch rename to org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch index 6b2a6ba5f..1257e9209 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBEKeyValuePairTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch b/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch similarity index 99% rename from org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch rename to org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch index 36701e45e..5a90d1407 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBELauncher.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch b/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch similarity index 99% rename from org.eclipse.ice.ui.swtbot.test/VIBEModel.launch rename to org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch index 2c88ad2d9..5fb652cd7 100644 --- a/org.eclipse.ice.ui.swtbot.test/VIBEModel.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch @@ -15,7 +15,7 @@ - + @@ -25,9 +25,9 @@ - + - + diff --git a/org.eclipse.ice.ui.swtbot.test/build.properties b/org.eclipse.ice.tests.ui.swtbot/build.properties similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/build.properties rename to org.eclipse.ice.tests.ui.swtbot/build.properties diff --git a/org.eclipse.ice.ui.swtbot.test/pom.xml b/org.eclipse.ice.tests.ui.swtbot/pom.xml similarity index 100% rename from org.eclipse.ice.ui.swtbot.test/pom.xml rename to org.eclipse.ice.tests.ui.swtbot/pom.xml diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/FakeMaterialsDatabase.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/FakeMaterialsDatabase.java similarity index 95% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/FakeMaterialsDatabase.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/FakeMaterialsDatabase.java index 5ab144bfb..67fe9913d 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/FakeMaterialsDatabase.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/FakeMaterialsDatabase.java @@ -8,7 +8,7 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; import java.io.File; import java.util.ArrayList; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java similarity index 95% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java index f3ac93b62..7b2a133cc 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MOOSETester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java @@ -8,9 +8,9 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; -import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MaterialsDatabaseTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java similarity index 96% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MaterialsDatabaseTester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java index 0cdde5716..f5e5efb61 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/MaterialsDatabaseTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java @@ -8,13 +8,13 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; -import org.eclipse.ice.client.widgets.test.utils.AbstractSWTTester; import org.eclipse.ice.materials.IMaterialsDatabase; import org.eclipse.ice.materials.ui.MaterialsDatabaseServiceHolder; +import org.eclipse.ice.tests.client.widgets.utils.AbstractSWTTester; import org.eclipse.nebula.widgets.nattable.NatTable; import org.eclipse.swt.widgets.Shell; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java similarity index 95% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java index 1d38533f4..3d8850d9a 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/ReflectivityModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java @@ -8,11 +8,11 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; -import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.nebula.widgets.nattable.NatTable; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/SWTBotNatTable.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/SWTBotNatTable.java similarity index 95% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/SWTBotNatTable.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/SWTBotNatTable.java index ca7bb7c04..b99aa7a0b 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/SWTBotNatTable.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/SWTBotNatTable.java @@ -8,7 +8,7 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; import org.eclipse.nebula.widgets.nattable.NatTable; import org.eclipse.swt.SWT; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java similarity index 94% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java index d6f852d56..355e78c04 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEKeyValuePairTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java @@ -8,9 +8,9 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; -import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.junit.Test; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBELauncherTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java similarity index 93% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBELauncherTester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java index 2bb8c8be0..fc86ca5bf 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBELauncherTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java @@ -8,9 +8,9 @@ * Contributors: * Initial API and implementation and/or initial documentation - Robert Smith *******************************************************************************/ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; -import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.junit.Test; diff --git a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java similarity index 94% rename from org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java rename to org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java index ac232503f..0f3e10466 100644 --- a/org.eclipse.ice.ui.swtbot.test/src/org/eclipse/ice/ui/swtbot/test/VIBEModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java @@ -1,6 +1,6 @@ -package org.eclipse.ice.ui.swtbot.test; +package org.eclipse.ice.tests.ui.swtbot; -import org.eclipse.ice.client.widgets.test.utils.AbstractWorkbenchTester; +import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.junit.Test; diff --git a/org.eclipse.ice.vibe.test/.classpath b/org.eclipse.ice.tests.vibe/.classpath similarity index 100% rename from org.eclipse.ice.vibe.test/.classpath rename to org.eclipse.ice.tests.vibe/.classpath diff --git a/org.eclipse.ice.vibe.test/.gitignore b/org.eclipse.ice.tests.vibe/.gitignore similarity index 100% rename from org.eclipse.ice.vibe.test/.gitignore rename to org.eclipse.ice.tests.vibe/.gitignore diff --git a/org.eclipse.ice.mesh.test/.project b/org.eclipse.ice.tests.vibe/.project similarity index 95% rename from org.eclipse.ice.mesh.test/.project rename to org.eclipse.ice.tests.vibe/.project index a1e5e885f..8e213a666 100644 --- a/org.eclipse.ice.mesh.test/.project +++ b/org.eclipse.ice.tests.vibe/.project @@ -1,6 +1,6 @@ - org.eclipse.ice.mesh.test + org.eclipse.ice.tests.vibe diff --git a/org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.tests.vibe/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.ice.tests.vibe/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.ice.vibe.test/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.tests.vibe/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.ice.vibe.test/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.ice.tests.vibe/.settings/org.eclipse.m2e.core.prefs diff --git a/org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.tests.vibe/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs rename to org.eclipse.ice.tests.vibe/.settings/org.eclipse.pde.core.prefs diff --git a/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF similarity index 85% rename from org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF rename to org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF index 3160d8b17..b8d9e4d1d 100644 --- a/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: VibeTest -Bundle-SymbolicName: org.eclipse.ice.vibe.test +Bundle-SymbolicName: org.eclipse.ice.tests.vibe Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Fragment-Host: org.eclipse.ice.vibe diff --git a/org.eclipse.ice.vibe.test/about.html b/org.eclipse.ice.tests.vibe/about.html similarity index 100% rename from org.eclipse.ice.vibe.test/about.html rename to org.eclipse.ice.tests.vibe/about.html diff --git a/org.eclipse.ice.vibe.test/build.properties b/org.eclipse.ice.tests.vibe/build.properties similarity index 100% rename from org.eclipse.ice.vibe.test/build.properties rename to org.eclipse.ice.tests.vibe/build.properties diff --git a/org.eclipse.ice.vibe.test/pom.xml b/org.eclipse.ice.tests.vibe/pom.xml similarity index 92% rename from org.eclipse.ice.vibe.test/pom.xml rename to org.eclipse.ice.tests.vibe/pom.xml index 18bf7158e..23b605635 100644 --- a/org.eclipse.ice.vibe.test/pom.xml +++ b/org.eclipse.ice.tests.vibe/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.vibe.test + org.eclipse.ice.tests.vibe eclipse-test-plugin true diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairBuilderTester.java similarity index 99% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairBuilderTester.java index ad6c4544d..305a57073 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.kvPair.test; +package org.eclipse.ice.tests.vibe.kvPair; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairRowTester.java similarity index 95% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairRowTester.java index 10331c530..d1161967a 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairRowTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairRowTester.java @@ -8,7 +8,7 @@ * Contributors: * Robert Smith *******************************************************************************/ -package org.eclipse.ice.vibe.kvPair.test; +package org.eclipse.ice.tests.vibe.kvPair; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairTester.java similarity index 99% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairTester.java index 9ea587079..ab819c7ad 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/kvPair/VibeKVPairTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.kvPair.test; +package org.eclipse.ice.tests.vibe.kvPair; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherBuilderTester.java similarity index 99% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherBuilderTester.java index a98b1959f..d9bc22c35 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.launcher.test; +package org.eclipse.ice.tests.vibe.launcher; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherTester.java similarity index 99% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherTester.java index e6a990640..9708c24fb 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/launcher/VibeLauncherTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.launcher.test; +package org.eclipse.ice.tests.vibe.launcher; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelBuilderTester.java similarity index 98% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelBuilderTester.java index 293ed2a35..1f8b25add 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelBuilderTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.model.test; +package org.eclipse.ice.tests.vibe.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelTester.java similarity index 99% rename from org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java rename to org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelTester.java index 05231a2ba..936e3fc2c 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java +++ b/org.eclipse.ice.tests.vibe/src/org/eclipse/ice/tests/vibe/model/VibeModelTester.java @@ -10,7 +10,7 @@ * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, * Claire Saunders, Matthew Wang, Anna Wojtowicz *******************************************************************************/ -package org.eclipse.ice.vibe.model.test; +package org.eclipse.ice.tests.vibe.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.ice.ui.swtbot.test/.project b/org.eclipse.ice.ui.swtbot.test/.project deleted file mode 100644 index 3240c7613..000000000 --- a/org.eclipse.ice.ui.swtbot.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.ice.ui.swtbot.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - From 3526524734bfa10f4cb5bcd05019edf85c3d3215 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 18 Jan 2017 08:25:24 -0500 Subject: [PATCH 43/74] Geometry Editor now keeps Properties View When the Geometry Editor has focus, it now continues to display the associated Properties View that the Shape Tree View, addressing bug #264 Signed-off-by: Robert Smith --- org.eclipse.ice.aggregator/pom.xml | 1 + org.eclipse.ice.feature/feature.xml | 363 +++++++------- org.eclipse.ice.geometry/.classpath | 7 + org.eclipse.ice.geometry/.gitignore | 2 + org.eclipse.ice.geometry/.project | 45 ++ .../.settings/org.eclipse.jdt.core.prefs | 7 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../.settings/org.eclipse.pde.core.prefs | 3 + ....eclipse.wst.common.project.facet.core.xml | 4 + org.eclipse.ice.geometry/META-INF/MANIFEST.MF | 33 ++ org.eclipse.ice.geometry/about.html | 28 ++ org.eclipse.ice.geometry/build.properties | 8 + org.eclipse.ice.geometry/plugin.xml | 53 ++ .../plugin_customization.ini | 1 + org.eclipse.ice.geometry/pom.xml | 16 + .../geometry/GeometryEclipseFormWidget.java | 67 +++ .../ice/geometry/GeometryFormEditor.java | 183 +++++++ .../geometry/GeometryFormWidgetBuilder.java | 57 +++ .../ice.product_WINDOWS.launch | 4 +- org.eclipse.ice.product/ice.runtime.product | 454 +++++++++--------- org.eclipse.ice.product/ice.sdk.product | 454 +++++++++--------- 21 files changed, 1166 insertions(+), 628 deletions(-) create mode 100644 org.eclipse.ice.geometry/.classpath create mode 100644 org.eclipse.ice.geometry/.gitignore create mode 100644 org.eclipse.ice.geometry/.project create mode 100644 org.eclipse.ice.geometry/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.eclipse.ice.geometry/.settings/org.eclipse.m2e.core.prefs create mode 100644 org.eclipse.ice.geometry/.settings/org.eclipse.pde.core.prefs create mode 100644 org.eclipse.ice.geometry/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 org.eclipse.ice.geometry/META-INF/MANIFEST.MF create mode 100644 org.eclipse.ice.geometry/about.html create mode 100644 org.eclipse.ice.geometry/build.properties create mode 100644 org.eclipse.ice.geometry/plugin.xml create mode 100644 org.eclipse.ice.geometry/plugin_customization.ini create mode 100644 org.eclipse.ice.geometry/pom.xml create mode 100644 org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryEclipseFormWidget.java create mode 100644 org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormEditor.java create mode 100644 org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormWidgetBuilder.java diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml index 25eb0988b..0a404635c 100644 --- a/org.eclipse.ice.aggregator/pom.xml +++ b/org.eclipse.ice.aggregator/pom.xml @@ -29,6 +29,7 @@ ../org.eclipse.ice.tests.datastructures ../org.eclipse.ice.developer ../org.eclipse.ice.developer.moose + ../org.eclipse.ice.geometry ../org.eclipse.ice.io ../org.eclipse.ice.tests.io ../org.eclipse.ice.item diff --git a/org.eclipse.ice.feature/feature.xml b/org.eclipse.ice.feature/feature.xml index 3e12accef..e2dc831b0 100644 --- a/org.eclipse.ice.feature/feature.xml +++ b/org.eclipse.ice.feature/feature.xml @@ -1,26 +1,26 @@ - - - - + + + + This feature describes all of the infrastructure components available -in the Eclipse Integrated Computational Environment. - - - +in the Eclipse Integrated Computational Environment. + + + Copyright (c) 2011, 2014 UT-Battelle, LLC. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License -v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - - - +v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html + + + Eclipse Foundation Software User Agreement July 1, 2014 @@ -74,161 +74,168 @@ Cryptography Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.geometry/.classpath b/org.eclipse.ice.geometry/.classpath new file mode 100644 index 000000000..43b986286 --- /dev/null +++ b/org.eclipse.ice.geometry/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.ice.geometry/.gitignore b/org.eclipse.ice.geometry/.gitignore new file mode 100644 index 000000000..0f630157f --- /dev/null +++ b/org.eclipse.ice.geometry/.gitignore @@ -0,0 +1,2 @@ +/target/ +/bin/ diff --git a/org.eclipse.ice.geometry/.project b/org.eclipse.ice.geometry/.project new file mode 100644 index 000000000..90e52cd05 --- /dev/null +++ b/org.eclipse.ice.geometry/.project @@ -0,0 +1,45 @@ + + + org.eclipse.ice.geometry + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.pde.ds.core.builder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/org.eclipse.ice.geometry/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ice.geometry/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..295926d96 --- /dev/null +++ b/org.eclipse.ice.geometry/.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.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/org.eclipse.ice.geometry/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.ice.geometry/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/org.eclipse.ice.geometry/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.ice.geometry/.settings/org.eclipse.pde.core.prefs b/org.eclipse.ice.geometry/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..b1bb1fc6f --- /dev/null +++ b/org.eclipse.ice.geometry/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +pluginProject.extensions=true +resolve.requirebundle=false diff --git a/org.eclipse.ice.geometry/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.ice.geometry/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..940509650 --- /dev/null +++ b/org.eclipse.ice.geometry/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,4 @@ + + + + diff --git a/org.eclipse.ice.geometry/META-INF/MANIFEST.MF b/org.eclipse.ice.geometry/META-INF/MANIFEST.MF new file mode 100644 index 000000000..4751be5e8 --- /dev/null +++ b/org.eclipse.ice.geometry/META-INF/MANIFEST.MF @@ -0,0 +1,33 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Geometry Form +Bundle-SymbolicName: org.eclipse.ice.geometry;singleton:=true +Bundle-Version: 2.2.0.qualifier +Bundle-Vendor: Oak Ridge National Laboratory +Require-Bundle: org.eclipse.ice.datastructures, + org.eclipse.ice.client.compatibility, + org.eclipse.swt, + org.eclipse.core.resources;bundle-version="3.10.0", + org.eclipse.core.runtime;bundle-version="3.11.0", + org.eclipse.eavp.viz.service.geometry;bundle-version="0.1.1" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: org.eclipse.core.runtime;version="3.5.0", + org.eclipse.eavp.geometry.view.model, + org.eclipse.eavp.viz.service, + org.eclipse.eavp.viz.service.geometry.widgets, + org.eclipse.ice.client.widgets, + org.eclipse.ice.iclient, + org.eclipse.ice.iclient.uiwidgets, + org.eclipse.ice.persistence.xml, + org.eclipse.ice.reflectivity, + org.eclipse.nebula.widgets.nattable;version="1.3.0", + org.eclipse.nebula.widgets.nattable.coordinate;version="1.3.0", + org.eclipse.nebula.widgets.nattable.selection;version="1.3.0", + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.forms.editor, + org.eclipse.ui.internal.views.properties.tabbed.view, + org.eclipse.ui.views.properties.tabbed, + org.slf4j;version="1.7.2" +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.ice.geometry diff --git a/org.eclipse.ice.geometry/about.html b/org.eclipse.ice.geometry/about.html new file mode 100644 index 000000000..b47b18406 --- /dev/null +++ b/org.eclipse.ice.geometry/about.html @@ -0,0 +1,28 @@ + + + + +About + + +

About This Content

+ +

July 1, 2014

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + + \ No newline at end of file diff --git a/org.eclipse.ice.geometry/build.properties b/org.eclipse.ice.geometry/build.properties new file mode 100644 index 000000000..0b2a642a5 --- /dev/null +++ b/org.eclipse.ice.geometry/build.properties @@ -0,0 +1,8 @@ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + build.properties,\ + plugin.xml,\ + plugin_customization.ini,\ + about.html +source.. = src/ diff --git a/org.eclipse.ice.geometry/plugin.xml b/org.eclipse.ice.geometry/plugin.xml new file mode 100644 index 000000000..86d06ff9f --- /dev/null +++ b/org.eclipse.ice.geometry/plugin.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.geometry/plugin_customization.ini b/org.eclipse.ice.geometry/plugin_customization.ini new file mode 100644 index 000000000..de7d83664 --- /dev/null +++ b/org.eclipse.ice.geometry/plugin_customization.ini @@ -0,0 +1 @@ +org.eclipse.ui/defaultPerspectiveId=org.eclipse.ice.reflectivity.ReflectivityPerspective \ No newline at end of file diff --git a/org.eclipse.ice.geometry/pom.xml b/org.eclipse.ice.geometry/pom.xml new file mode 100644 index 000000000..d73b447a5 --- /dev/null +++ b/org.eclipse.ice.geometry/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + org.eclipse.ice + org.eclipse.ice.build + ../org.eclipse.ice.parent/pom.xml + 2.2.0-SNAPSHOT + + org.eclipse.ice + org.eclipse.ice.geometry + 2.2.0-SNAPSHOT + eclipse-plugin + diff --git a/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryEclipseFormWidget.java b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryEclipseFormWidget.java new file mode 100644 index 000000000..e1f8dc471 --- /dev/null +++ b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryEclipseFormWidget.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2015 UT-Battelle, LLC. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Initial API and implementation and/or initial documentation - Jay Jay Billings, + * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, + * Claire Saunders, Matthew Wang, Anna Wojtowicz, Kasper Gammeltoft, Robert Smith + *******************************************************************************/ +package org.eclipse.ice.geometry; + +import org.eclipse.ice.client.widgets.EclipseFormWidget; +import org.eclipse.ice.client.widgets.ICEFormEditor; +import org.eclipse.ice.client.widgets.ICEFormInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; + +/** + * A widget which will display a GeometryFormEditor. + * + * @author Kasper Gammeltoft, Jordan H. Deyton, Robert Smith + * + */ +public class GeometryEclipseFormWidget extends EclipseFormWidget { + + /** + * The default constructor. + */ + public GeometryEclipseFormWidget() { + } + + /** + * This operation displays the {@link ReflectivityFormEditor} instead of the + * standard ICEFormEditor. + */ + @Override + public void display() { + + // Local Declarations + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + + // Create the ICEFormInput for the ReflectivityFormBuilder. + ICEFormInput = new ICEFormInput(widgetForm); + + try { + // Use the workbench to open the editor with our input. + IEditorPart formEditor = page.openEditor(ICEFormInput, + GeometryFormEditor.ID); + // Set this editor reference so that listeners can be registered + // later. + ICEFormEditor = (ICEFormEditor) formEditor; + + } catch (PartInitException e) { + // Dump the stacktrace if something happens. + e.printStackTrace(); + } + + return; + } + +} diff --git a/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormEditor.java b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormEditor.java new file mode 100644 index 000000000..af80e0bd9 --- /dev/null +++ b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormEditor.java @@ -0,0 +1,183 @@ +/******************************************************************************* + * Copyright (c) 2017 UT-Battelle, LLC. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Initial API and implementation and/or initial documentation - Robert Smith + *******************************************************************************/ +package org.eclipse.ice.geometry; + +import java.util.Iterator; +import java.util.List; + +import org.eclipse.eavp.geometry.view.model.IRenderElement; +import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView; +import org.eclipse.ice.client.widgets.ICEFormEditor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.viewers.TreePath; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; + +/** + * A custom form editor for the Geometry Editor item, which will have custom + * tabbed properties. + * + * @author Robert Smith + * + */ +public class GeometryFormEditor extends ICEFormEditor + implements ITabbedPropertySheetPageContributor { + + /** + * The ID for use in the extension point. + */ + public static final String ID = "org.eclipse.ice.client.widgets.geometry.GeometryFormEditor"; + + /** + * The constructor. + */ + public GeometryFormEditor() { + super(); + + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.part.MultiPageEditorPart#getAdapter(java.lang.Class) + */ + @Override + public Object getAdapter(Class adapter) { + + // Give the TabbedPropertySheetPage for the IPropertySheetPage + if (adapter == IPropertySheetPage.class) { + return new TabbedPropertySheetPage(this); + } + + // Otherwise delegate to the superclass + else { + return super.getAdapter(adapter); + } + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.views.properties.tabbed. + * ITabbedPropertySheetPageContributor#getContributorId() + */ + @Override + public String getContributorId() { + return getSite().getId(); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ice.client.widgets.ICEFormEditor#createHeaderContents(org. + * eclipse.ui.forms.IManagedForm) + */ + @Override + protected void createHeaderContents(IManagedForm headerForm) { + super.createHeaderContents(headerForm); + + // Create a Selection Provider for this part + getSite().setSelectionProvider(new ISelectionProvider() { + + @Override + public void addSelectionChangedListener( + ISelectionChangedListener listener) { + // TODO Auto-generated method stub + } + + @Override + public ISelection getSelection() { + + // Pull the currently selected shapes from the ShapeTreeView, so + // that the tree view and the geometry editor's selections are + // always in synch + List selection = ((ShapeTreeView) PlatformUI + .getWorkbench().getActiveWorkbenchWindow() + .getActivePage().findView(ShapeTreeView.ID)) + .getSelectedElements(); + + // Create a new selection + return new ITreeSelection() { + + @Override + public Object getFirstElement() { + if (selection.isEmpty()) { + return null; + } else { + return selection.get(0); + } + } + + @Override + public Iterator iterator() { + return selection.iterator(); + } + + @Override + public int size() { + return selection.size(); + } + + @Override + public Object[] toArray() { + return selection.toArray(); + } + + @Override + public List toList() { + return selection; + } + + @Override + public boolean isEmpty() { + return selection.isEmpty(); + } + + @Override + public TreePath[] getPaths() { + TreePath[] paths = new TreePath[selection.size()]; + for (int i = 0; i < selection.size(); i++) { + paths[i] = new TreePath( + new IRenderElement[] { selection.get(i) }); + } + return paths; + } + + @Override + public TreePath[] getPathsFor(Object element) { + return new TreePath[] { + new TreePath(new IRenderElement[] { selection + .get(selection.indexOf(element)) }) }; + } + + }; + } + + @Override + public void removeSelectionChangedListener( + ISelectionChangedListener listener) { + // TODO Auto-generated method stub + } + + @Override + public void setSelection(ISelection selection) { + // TODO Auto-generated method stub + } + }); + } +} diff --git a/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormWidgetBuilder.java b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormWidgetBuilder.java new file mode 100644 index 000000000..b2cb79f24 --- /dev/null +++ b/org.eclipse.ice.geometry/src/org/eclipse/ice/geometry/GeometryFormWidgetBuilder.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2017 UT-Battelle, LLC. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Initial API and implementation and/or initial documentation - Jay Jay Billings, + * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson, + * Claire Saunders, Matthew Wang, Anna Wojtowicz, Kasper Gammeltoft + *******************************************************************************/ +package org.eclipse.ice.geometry; + +import org.eclipse.ice.client.widgets.IFormWidgetBuilder; +import org.eclipse.ice.iclient.uiwidgets.IFormWidget; + +/** + * This class provides the declarative service that registers the Geometry + * FormEditor Widget with ICE's service for dynamically extending the widget + * factory. This lets us tailor the standard ICEFormEditor behavior for Geometry + * Editor Builders. + * + * @author Kasper Gammeltoft, Jordan H. Deyton, Robert Smith + * + */ +public class GeometryFormWidgetBuilder implements IFormWidgetBuilder { + + /** + * The name of the items/forms used to create {@link ReflectivityFormEditor} + * s. This should be the same as the name in the ReflectivityModel item + * class. + */ + public static final String name = "Geometry Editor"; + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.client.widgets.IFormWidgetBuilder#getTargetFormName + * () + */ + @Override + public String getTargetFormName() { + return name; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ice.client.widgets.IFormWidgetBuilder#build() + */ + @Override + public IFormWidget build() { + return new GeometryEclipseFormWidget(); + } + +} diff --git a/org.eclipse.ice.product/ice.product_WINDOWS.launch b/org.eclipse.ice.product/ice.product_WINDOWS.launch index 8ef13a8c0..0c5a7dff5 100644 --- a/org.eclipse.ice.product/ice.product_WINDOWS.launch +++ b/org.eclipse.ice.product/ice.product_WINDOWS.launch @@ -22,8 +22,8 @@ - - + + diff --git a/org.eclipse.ice.product/ice.runtime.product b/org.eclipse.ice.product/ice.runtime.product index 5ac330e2a..ee6232af3 100644 --- a/org.eclipse.ice.product/ice.runtime.product +++ b/org.eclipse.ice.product/ice.runtime.product @@ -1,48 +1,47 @@ - - - - - - - - - - -product org.eclipse.ice.client.rcp.runtime_product --launcher.defaultAction openFile --launcher.appendVmarg_ - - --launcher.GTK_version 2 - - -Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 -Dosgi.framework.extensions=org.eclipse.fx.osgi - - -Dprism.forceGPU=true -Dvisit.binpath=@user.home/visit/bin - - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dvisit.binpath=@user.home/visit/bin - + + + + + + + + + + -product org.eclipse.ice.client.rcp.runtime_product --launcher.defaultAction openFile --launcher.appendVmarg_ + + --launcher.GTK_version 2 + + -Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 -Dosgi.framework.extensions=org.eclipse.fx.osgi + + -Dprism.forceGPU=true -Dvisit.binpath=@user.home/visit/bin + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dvisit.binpath=@user.home/visit/bin + -Dvisit.binpath=C:\PROGRA~1\LLNL\VISIT2~1.2"\r" --Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib"\r" - - - - - - - - - - - - - - - - - - - http://projects.eclipse.org/projects/technology.ice - +-Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib"\r" + + + + + + + + + + + + + + + + + + http://projects.eclipse.org/projects/technology.ice + Eclipse Foundation Software User Agreement July 1, 2014 @@ -96,183 +95,190 @@ Cryptography Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.ice.product/ice.sdk.product b/org.eclipse.ice.product/ice.sdk.product index 3ea96ac61..55e88e0a1 100644 --- a/org.eclipse.ice.product/ice.sdk.product +++ b/org.eclipse.ice.product/ice.sdk.product @@ -1,48 +1,47 @@ - - - - - - - - - - -product org.eclipse.ice.client.rcp.sdk_product --launcher.defaultAction openFile --launcher.appendVmargs - - --launcher.GTK_version 2 - - -Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 -Dosgi.framework.extensions=org.eclipse.fx.osgi - - -Dprism.forceGPU=true -Dvisit.binpath=@user.home/visit/bin - - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dvisit.binpath=@user.home/visit/bin - + + + + + + + + + + -product org.eclipse.ice.client.rcp.sdk_product --launcher.defaultAction openFile --launcher.appendVmargs + + --launcher.GTK_version 2 + + -Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 -Dosgi.framework.extensions=org.eclipse.fx.osgi + + -Dprism.forceGPU=true -Dvisit.binpath=@user.home/visit/bin + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dvisit.binpath=@user.home/visit/bin + -Dvisit.binpath=C:\PROGRA~1\LLNL\VISIT2~1.2"\r" --Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib"\r" - - - - - - - - - - - - - - - - - - - http://projects.eclipse.org/projects/technology.ice - +-Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib"\r" + + + + + + + + + + + + + + + + + + http://projects.eclipse.org/projects/technology.ice + Eclipse Foundation Software User Agreement July 1, 2014 @@ -96,183 +95,190 @@ Cryptography Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1bbe7d74b1a0f70fe600d8c8494491a0263f5453 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 24 Jan 2017 12:44:45 -0500 Subject: [PATCH 44/74] Updated dependencies for EAVP Updated some dependencies for EAVP packages that were moved around. Signed-off-by: Robert Smith --- org.eclipse.ice.demo/META-INF/MANIFEST.MF | 1 + org.eclipse.ice.item/META-INF/MANIFEST.MF | 1 + org.eclipse.ice.mesh/META-INF/MANIFEST.MF | 1 + 3 files changed, 3 insertions(+) diff --git a/org.eclipse.ice.demo/META-INF/MANIFEST.MF b/org.eclipse.ice.demo/META-INF/MANIFEST.MF index 9a82db23b..d377b888c 100644 --- a/org.eclipse.ice.demo/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.demo/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Import-Package: org.eclipse.core.resources, org.eclipse.e4.ui.model.application, org.eclipse.e4.ui.model.application.ui, org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling.base, org.eclipse.eavp.viz.service, diff --git a/org.eclipse.ice.item/META-INF/MANIFEST.MF b/org.eclipse.ice.item/META-INF/MANIFEST.MF index 4b995e1a4..765ec63c3 100644 --- a/org.eclipse.ice.item/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.item/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Import-Package: com.google.common.collect;version="10.0.1", com.spotify.docker.client.messages, org.apache.commons.io, org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling.base, org.eclipse.eavp.viz.service.mesh.datastructures, diff --git a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF index 82959054e..b5ffc8eec 100644 --- a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ice.datastructures Import-Package: org.eclipse.core.resources, org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.service.mesh.datastructures, org.eclipse.ice.item Service-Component: OSGI-INF/meshEditorComponent.xml From 9f258e5fe5a71e5f3f776669d5049c3f90bf53fc Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 7 Feb 2017 18:28:23 -0500 Subject: [PATCH 45/74] Made try/catch statement generic Removed the specification for which exception was thrown in GitCloneHandler, since Maven doesn't recognize that function as throwing the previously given exception. Signed-off-by: Robert Smith --- .../org/eclipse/ice/developer/actions/GitCloneHandler.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java b/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java index 55c7e4a9e..6d7a3ecf3 100644 --- a/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java +++ b/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java @@ -166,11 +166,7 @@ public void run() { cloneOperation = new CloneOperation(new URIish(repo), true, null, cloneLocation, branch, "origin", 100); addPostCloneTasks(); - try { - UserPasswordCredentials credentials = SecureStoreUtils.getCredentials(new URIish(repo)); - } catch (StorageException e) { - e.printStackTrace(); - } + UserPasswordCredentials credentials = SecureStoreUtils.getCredentials(new URIish(repo)); cloneOperation.run(monitor); final RepositoryUtil util = Activator.getDefault().getRepositoryUtil(); util.addConfiguredRepository(cloneOperation.getGitDir()); From 1287e56655b4480dcff58e479681f100d995cbe2 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 10 Feb 2017 10:07:02 -0500 Subject: [PATCH 46/74] Fixed try/catch statement in GitCloneHandler Replaced an accidentally removed try/catch statement in GitCloneHandler. Signed-off-by: Robert Smith --- .../org/eclipse/ice/developer/actions/GitCloneHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java b/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java index 6d7a3ecf3..933ea2b59 100644 --- a/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java +++ b/org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/GitCloneHandler.java @@ -166,7 +166,11 @@ public void run() { cloneOperation = new CloneOperation(new URIish(repo), true, null, cloneLocation, branch, "origin", 100); addPostCloneTasks(); - UserPasswordCredentials credentials = SecureStoreUtils.getCredentials(new URIish(repo)); + try { + UserPasswordCredentials credentials = SecureStoreUtils.getCredentials(new URIish(repo)); + } catch (Exception e) { + e.printStackTrace(); + } cloneOperation.run(monitor); final RepositoryUtil util = Activator.getDefault().getRepositoryUtil(); util.addConfiguredRepository(cloneOperation.getGitDir()); From 47c9b6731fd855b2659f63893a245cfe76e2f550 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Wed, 15 Feb 2017 09:49:41 -0500 Subject: [PATCH 47/74] Addressed #347. This commit shows how to fix all instances of busted DS services for #347. This cases fixes it for the materials database. Signed-off-by: Jay Jay Billings --- .../OSGI-INF/MaterialsUIComponent.xml | 2 +- .../ice/materials/ui/EditMaterialsDatabaseHandler.java | 3 ++- .../ice/materials/ui/MaterialsDatabaseServiceHolder.java | 7 ++++--- org.eclipse.ice.product/ice.product_linux.launch | 2 +- .../ice/tests/ui/swtbot/MaterialsDatabaseTester.java | 8 +++++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/org.eclipse.ice.materials.ui/OSGI-INF/MaterialsUIComponent.xml b/org.eclipse.ice.materials.ui/OSGI-INF/MaterialsUIComponent.xml index 29488f831..295ad001a 100644 --- a/org.eclipse.ice.materials.ui/OSGI-INF/MaterialsUIComponent.xml +++ b/org.eclipse.ice.materials.ui/OSGI-INF/MaterialsUIComponent.xml @@ -1,5 +1,5 @@ - + diff --git a/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/EditMaterialsDatabaseHandler.java b/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/EditMaterialsDatabaseHandler.java index 99bfc9105..a19c2e012 100644 --- a/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/EditMaterialsDatabaseHandler.java +++ b/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/EditMaterialsDatabaseHandler.java @@ -48,7 +48,8 @@ public Object execute(ExecutionEvent event) throws ExecutionException { // Open the editor try { - IMaterialsDatabase database = MaterialsDatabaseServiceHolder.get(); + MaterialsDatabaseServiceHolder serviceHolder = new MaterialsDatabaseServiceHolder(); + IMaterialsDatabase database = serviceHolder.get(); IEditorInput input = new MaterialsDatabaseEditorInput(database); page.openEditor(input, MaterialsDatabaseEditor.ID); } catch (PartInitException e) { diff --git a/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java b/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java index e2c884e8d..84e4a8974 100644 --- a/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java +++ b/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java @@ -20,7 +20,8 @@ /** * This is a simple class that catches the active Materials Database service and - * holds the reference for the Materials UI. It is a singleton. + * holds the reference for the Materials UI. It is a singleton, which is not + * ideal but in this instance convenient. * * This class has no tests because it is a simple bean. * @@ -46,7 +47,7 @@ public class MaterialsDatabaseServiceHolder { * @param database * The database service */ - public static void set(IMaterialsDatabase database) { + public void set(IMaterialsDatabase database) { materialsDB = database; logger.info("MaterialsDatabaseServiceHolder Message: " + "Service Handle Received!"); @@ -57,7 +58,7 @@ public static void set(IMaterialsDatabase database) { * * @return The database service */ - public static IMaterialsDatabase get() { + public IMaterialsDatabase get() { return materialsDB; } diff --git a/org.eclipse.ice.product/ice.product_linux.launch b/org.eclipse.ice.product/ice.product_linux.launch index 8b55c0b49..6b311e138 100644 --- a/org.eclipse.ice.product/ice.product_linux.launch +++ b/org.eclipse.ice.product/ice.product_linux.launch @@ -22,7 +22,7 @@ - + diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java index f5e5efb61..8a5c10166 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java @@ -44,8 +44,9 @@ public void beforeAllTests() { // Don't create a shell or bot for these tests. // Switch the IMaterialsDatabase service to the test database. - realDatabase = MaterialsDatabaseServiceHolder.get(); - MaterialsDatabaseServiceHolder.set(new FakeMaterialsDatabase()); + MaterialsDatabaseServiceHolder serviceHolder = new MaterialsDatabaseServiceHolder(); + realDatabase = serviceHolder.get(); + serviceHolder.set(new FakeMaterialsDatabase()); } @@ -417,7 +418,8 @@ public void checkMaterialsTree() { */ @Override public void afterAllTests() { - MaterialsDatabaseServiceHolder.set(realDatabase); + MaterialsDatabaseServiceHolder serviceHolder = new MaterialsDatabaseServiceHolder(); + serviceHolder.set(realDatabase); } } From b17fcaf06f94471e4f9062cb23eef36edb6ed313 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Wed, 15 Feb 2017 09:51:57 -0500 Subject: [PATCH 48/74] Address #348. This bug removes all the old viz service factory code from the MOOSE and Reflectivity UI bundles. I have not noticed any problems because of this yet, but since EAVP is busted because of the DS changes there may be "unknown unknowns." Or "known unknowns." I'm not sure which but I just Rumsfelded this commit message, whoo! Signed-off-by: Jay Jay Billings --- .../widgets/moose/MOOSEEclipseFormWidget.java | 22 +--------- .../widgets/moose/MOOSEFormWidgetBuilder.java | 35 +--------------- .../ice/client/widgets/ICEFormEditor.java | 2 +- .../ui/ReflectivityEclipseFormWidget.java | 24 ----------- .../ui/ReflectivityFormWidgetBuilder.java | 42 +------------------ 5 files changed, 5 insertions(+), 120 deletions(-) diff --git a/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java b/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java index 3d57108ef..af188703d 100644 --- a/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java +++ b/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java @@ -38,24 +38,6 @@ public class MOOSEEclipseFormWidget extends EclipseFormWidget { private static final Logger logger = LoggerFactory .getLogger(MOOSEEclipseFormWidget.class); - /** - * The visualization service factory provided to MOOSEFormEditors through - * OSGi. - */ - private final IVizServiceFactory vizServiceFactory; - - /** - * The default constructor. - * - * @param factory - * The visualization service factory provided to MOOSEFormEditors - * through OSGi. - */ - public MOOSEEclipseFormWidget(IVizServiceFactory factory) { - // Nothing to do yet. - this.vizServiceFactory = factory; - } - /** * This operation displays the {@link MOOSEFormEditor} instead of the * standard ICEFormEditor. @@ -81,8 +63,8 @@ public void display() { // FIXME Since this is a static method, it should probably be set // from a more general OSGi-referencing service in the main widgets // bundle. - org.eclipse.ice.client.widgets.ICEFormEditor - .setVizServiceFactory(vizServiceFactory); +// org.eclipse.ice.client.widgets.ICEFormEditor +// .setVizServiceFactory(vizServiceFactory); } catch (PartInitException e) { // Dump the stacktrace if something happens. diff --git a/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java b/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java index a52265126..dd4e72232 100644 --- a/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java +++ b/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java @@ -66,40 +66,7 @@ public String getTargetFormName() { */ @Override public IFormWidget build() { - return new MOOSEEclipseFormWidget(vizServiceFactory); + return new MOOSEEclipseFormWidget(); } - /** - * This method is called by the OSGi implementation to bind the - * {@link IVizServiceFactory} (an OSGi service) to this instance. - * - * @param factory - * The factory service available through OSGi. - */ - public void setVizServiceFactory(IVizServiceFactory factory) { - this.vizServiceFactory = factory; - - IConfigurationElement[] elements = Platform.getExtensionRegistry() - .getConfigurationElementsFor("org.eclipse.eavp.viz.service.IVizServiceFactory"); - logger.info("MOOSEFormWidgetBuilder: Available configuration elements"); - for(IConfigurationElement element : elements){ - logger.info(element.getName()); - } - - return; - - } - - /** - * This method is called by the OSGi implementation to unbind the - * {@link IVizServiceFactory} (an OSGi service) from this instance. - * - * @param factory - * The factory service that is no longer available through OSGi. - */ - public void unsetVizServiceFactory(IVizServiceFactory factory) { - if (factory == this.vizServiceFactory) { - this.vizServiceFactory = null; - } - } } diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java index e9f6b3272..20022feb4 100644 --- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java +++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java @@ -237,7 +237,7 @@ public ICEFormEditor() { * The service factory that should be used for generating * visualizations. */ - public static void setVizServiceFactory(IVizServiceFactory factory) { + public void setVizServiceFactory(IVizServiceFactory factory) { vizFactory = factory; Logger staticLogger = LoggerFactory.getLogger(ICEFormEditor.class); staticLogger.info("ICEFormEditor Message: IVizServiceFactory set!"); diff --git a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityEclipseFormWidget.java b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityEclipseFormWidget.java index 45c0cf225..d1b5ed1c7 100644 --- a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityEclipseFormWidget.java +++ b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityEclipseFormWidget.java @@ -30,24 +30,6 @@ */ public class ReflectivityEclipseFormWidget extends EclipseFormWidget { - /** - * The visualization service factory provided to ReflecitvityFormEditors - * through OSGi. - */ - private final IVizServiceFactory vizServiceFactory; - - /** - * The default constructor. - * - * @param factory - * The visualization service factory provided to - * ReflectivityFormEditors through OSGi. - */ - public ReflectivityEclipseFormWidget(IVizServiceFactory factory) { - // Nothing to do yet. - this.vizServiceFactory = factory; - } - /** * This operation displays the {@link ReflectivityFormEditor} instead of the * standard ICEFormEditor. @@ -70,12 +52,6 @@ public void display() { // later. ICEFormEditor = (ICEFormEditor) formEditor; - // FIXME Since this is a static method, it should probably be set - // from a more general OSGi-referencing service in the main widgets - // bundle. - org.eclipse.ice.client.widgets.ICEFormEditor - .setVizServiceFactory(vizServiceFactory); - } catch (PartInitException e) { // Dump the stacktrace if something happens. e.printStackTrace(); diff --git a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormWidgetBuilder.java b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormWidgetBuilder.java index 3ae5d0c5f..e32b8c0b6 100644 --- a/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormWidgetBuilder.java +++ b/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormWidgetBuilder.java @@ -44,12 +44,6 @@ public class ReflectivityFormWidgetBuilder implements IFormWidgetBuilder { */ public static final String name = "Reflectivity Model"; - /** - * This class consumes (references) the {@link IVizServiceFactory} OSGi - * service. The factory should be passed down to the ReflectivityFormEditor. - */ - private IVizServiceFactory vizServiceFactory; - /* * (non-Javadoc) * @@ -68,41 +62,7 @@ public String getTargetFormName() { */ @Override public IFormWidget build() { - return new ReflectivityEclipseFormWidget(vizServiceFactory); - } - - /** - * This method is called by the OSGi implementation to bind the - * {@link IVizServiceFactory} (an OSGi service) to this instance. - * - * @param factory - * The factory service available through OSGi. - */ - public void setVizServiceFactory(IVizServiceFactory factory) { - logger.info("ReflectivityFormWidgetBuilder: Setting Viz Service"); - this.vizServiceFactory = factory; - - IConfigurationElement[] elements = Platform.getExtensionRegistry() - .getConfigurationElementsFor("org.eclipse.eavp.viz.service.IVizServiceFactory"); - logger.info("ReflectivityFormWidgetBuilder: Available configuration elements"); - for(IConfigurationElement element : elements){ - logger.info(element.getName()); - } - - return; - } - - /** - * This method is called by the OSGi implementation to unbind the - * {@link IVizServiceFactory} (an OSGi service) from this instance. - * - * @param factory - * The factory service that is no longer available through OSGi. - */ - public void unsetVizServiceFactory(IVizServiceFactory factory) { - if (factory == this.vizServiceFactory) { - this.vizServiceFactory = null; - } + return new ReflectivityEclipseFormWidget(); } } From 3df3f40d3a20e4baf2ed3aca7b090840d03dfd11 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 15 Feb 2017 11:01:13 -0500 Subject: [PATCH 49/74] Fixed Declaritive Service bindings and updated EAVP references Fixed the Declaritive Services so that bound methods are no longer static for bug #347. Also updated package names for EAVP imports. Signed-off-by: Robert Smith --- org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF | 2 +- .../datastructures/internal/VizServiceFactoryHolder.java | 4 ++-- org.eclipse.ice.demo/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.item/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.mesh/META-INF/MANIFEST.MF | 2 +- .../ice/nek5000/internal/VizServiceFactoryHolder.java | 4 ++-- .../ice/tests/datastructures/ResourceHandlerTester.java | 3 ++- .../src/org/eclipse/tests/ice/item/ItemTester.java | 3 ++- .../src/org/eclipse/ice/tests/nek5000/NekModelTester.java | 6 +----- org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF | 2 +- .../MaterialsDatabaseTester.launch | 5 ++--- .../ice/tests/ui/swtbot/MaterialsDatabaseTester.java | 5 ++++- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF index 02d68ceb9..b68f94ab3 100644 --- a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Import-Package: org.eclipse.e4.ui.model, org.eclipse.e4.ui.model.application, org.eclipse.e4.ui.model.application.ui, - org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.ui, org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling.base, diff --git a/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/internal/VizServiceFactoryHolder.java b/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/internal/VizServiceFactoryHolder.java index efc4b4fa8..e12778eb8 100644 --- a/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/internal/VizServiceFactoryHolder.java +++ b/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/internal/VizServiceFactoryHolder.java @@ -39,7 +39,7 @@ public static IVizServiceFactory getFactory() { * @param input * the VizServiceFactory to hold */ - public static void setVizServiceFactory(IVizServiceFactory input) { + public void setVizServiceFactory(IVizServiceFactory input) { VizServiceFactoryHolder.factory = input; return; @@ -51,7 +51,7 @@ public static void setVizServiceFactory(IVizServiceFactory input) { * * @input A VizServiceFactory to remove. */ - public static void unsetVizServiceFactory(IVizServiceFactory input) { + public void unsetVizServiceFactory(IVizServiceFactory input) { if (input == factory) { factory = null; } diff --git a/org.eclipse.ice.demo/META-INF/MANIFEST.MF b/org.eclipse.ice.demo/META-INF/MANIFEST.MF index d377b888c..0d26f1619 100644 --- a/org.eclipse.ice.demo/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.demo/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Import-Package: org.eclipse.core.resources, org.eclipse.e4.core.di.annotations, org.eclipse.e4.ui.model.application, org.eclipse.e4.ui.model.application.ui, - org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.ui, org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling.base, diff --git a/org.eclipse.ice.item/META-INF/MANIFEST.MF b/org.eclipse.ice.item/META-INF/MANIFEST.MF index 972b69ee5..7873f4c6f 100644 --- a/org.eclipse.ice.item/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.item/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Import-Package: com.google.common.collect;version="10.0.1", com.spotify.docker.client, com.spotify.docker.client.messages, org.apache.commons.io, - org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.ui, org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling.base, diff --git a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF index b5ffc8eec..258cc2315 100644 --- a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ice.datastructures Import-Package: org.eclipse.core.resources, - org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.ui, org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.service.mesh.datastructures, org.eclipse.ice.item diff --git a/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/internal/VizServiceFactoryHolder.java b/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/internal/VizServiceFactoryHolder.java index 8bbca4505..2f29035fe 100644 --- a/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/internal/VizServiceFactoryHolder.java +++ b/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/internal/VizServiceFactoryHolder.java @@ -43,7 +43,7 @@ public static IVizServiceFactory getFactory() { * @param input * the VizServiceFactory to hold */ - public static void setVizServiceFactory(IVizServiceFactory input) { + public void setVizServiceFactory(IVizServiceFactory input) { VizServiceFactoryHolder.factory = input; Logger staticLogger = LoggerFactory .getLogger(VizServiceFactoryHolder.class); @@ -65,7 +65,7 @@ public static void setVizServiceFactory(IVizServiceFactory input) { * * @input A VizServiceFactory to remove. */ - public static void unsetVizServiceFactory(IVizServiceFactory input) { + public void unsetVizServiceFactory(IVizServiceFactory input) { if (input == factory) { factory = null; } diff --git a/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java index c82e34eee..11c817c4b 100644 --- a/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java +++ b/org.eclipse.ice.tests.datastructures/src/org/eclipse/ice/tests/datastructures/ResourceHandlerTester.java @@ -24,6 +24,7 @@ import org.eclipse.eavp.viz.service.IVizService; import org.eclipse.eavp.viz.service.IVizServiceFactory; import org.eclipse.eavp.viz.service.csv.CSVVizService; +import org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder; import org.eclipse.ice.datastructures.resource.ICEResource; import org.eclipse.ice.datastructures.resource.ResourceHandler; import org.eclipse.ice.datastructures.resource.VizResource; @@ -54,7 +55,7 @@ public void checkGettingResource() throws IOException { // Set up a basic factory with a CSVVizService for the test IVizServiceFactory factory = new TestVizServiceFactory(); factory.register(new CSVVizService()); - org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder + new VizServiceFactoryHolder() .setVizServiceFactory(factory); // First try get the resources with invalid file paths diff --git a/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java index f3c00aec7..a220f3d28 100644 --- a/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java +++ b/org.eclipse.ice.tests.item/src/org/eclipse/tests/ice/item/ItemTester.java @@ -50,6 +50,7 @@ import org.eclipse.ice.datastructures.form.DataComponent; import org.eclipse.ice.datastructures.form.Form; import org.eclipse.ice.datastructures.form.FormStatus; +import org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder; import org.eclipse.ice.datastructures.jaxbclassprovider.ICEJAXBClassProvider; import org.eclipse.ice.datastructures.resource.ICEResource; import org.eclipse.ice.datastructures.resource.VizResource; @@ -980,7 +981,7 @@ public void checkGettingResources() { // Set up a basic factory with a CSVVizService for the test IVizServiceFactory factory = new TestVizServiceFactory(); factory.register(new CSVVizService()); - org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder + new VizServiceFactoryHolder() .setVizServiceFactory(factory); // Setup the project diff --git a/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java index 314d3d6bb..c98e36e3b 100644 --- a/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java +++ b/org.eclipse.ice.tests.nek5000/src/org/eclipse/ice/tests/nek5000/NekModelTester.java @@ -17,7 +17,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.awt.Polygon; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -38,11 +37,8 @@ import org.eclipse.eavp.viz.modeling.Edge; import org.eclipse.eavp.viz.modeling.EdgeController; import org.eclipse.eavp.viz.modeling.Face; -import org.eclipse.eavp.viz.modeling.FaceController; import org.eclipse.eavp.viz.modeling.Vertex; import org.eclipse.eavp.viz.modeling.VertexController; -import org.eclipse.eavp.viz.modeling.base.BasicController; -import org.eclipse.eavp.viz.modeling.base.BasicMesh; import org.eclipse.eavp.viz.modeling.base.BasicView; import org.eclipse.eavp.viz.modeling.base.IController; import org.eclipse.eavp.viz.modeling.base.IMesh; @@ -237,7 +233,7 @@ private NekModel setupNekItem() { IVizService service = new FakeVizService(); IVizServiceFactory factory = new BasicVizServiceFactory(); factory.register(service); - VizServiceFactoryHolder.setVizServiceFactory(factory); + new VizServiceFactoryHolder().setVizServiceFactory(factory); // Local Declarations NekModel model = new NekModel(projectSpace, diff --git a/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF index e1ff38924..ef5a49b77 100644 --- a/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0" Bundle-Vendor: Oak Ridge National Laboratory Import-Package: ca.odell.glazedlists.gui, - org.eclipse.eavp.viz.datastructures, + org.eclipse.eavp.viz.datastructures.ui, org.eclipse.eavp.viz.service.mesh.datastructures diff --git a/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch b/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch index 14fb5e5e0..f0bfca76a 100644 --- a/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/MaterialsDatabaseTester.launch @@ -11,7 +11,6 @@ - @@ -31,8 +30,8 @@ - - + + diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java index 8a5c10166..156918826 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java @@ -58,6 +58,9 @@ public void checkMaterialsTree() { // before ICE's UI has had time to properly update. SWTBotPreferences.PLAYBACK_DELAY = 50; + //Close the welcome view + bot.viewByTitle("Welcome").close(); + // Open the ICE perspective bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); @@ -363,7 +366,7 @@ public void checkMaterialsTree() { // Search for the custom material and open it bot.text(1).typeText("Custom"); - bot.tree().select(0); + bot.tree().select(5); // Check the property name for the first data row. cellName = (String) realTable.getDataValueByPosition(1, 1); From bdf258a4f4dc5664c33f75a0fd553ec2c0c9b1cb Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Sat, 18 Feb 2017 19:55:32 -0500 Subject: [PATCH 50/74] Set release name in parent pom. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index 27f7d54cb..f2620ba3c 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - next + 2.2.1RC2 0.26.0 ${tycho-version} 1.1.3 From b9fbc4fc8bc41a8f40a73524caf4b92f7d36fee0 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 20 Feb 2017 10:55:57 -0500 Subject: [PATCH 51/74] Changed build info URL Changed the facade URL from the next branch's eclipse.org/eavp/builds/next to ...builds/2.2.1 Signed-off-by: Robert Smith --- org.eclipse.ice.repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index 323f324f3..cdb9bac1e 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -76,7 +76,7 @@ siteTemplateFolder/ - http://download.eclipse.org/eavp/builds/next + http://download.eclipse.org/eavp/builds/2.2.1 From 9ca79b580d2285ea72789afd6d9bf41eba5ca5b7 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 20 Feb 2017 11:32:25 -0500 Subject: [PATCH 52/74] Updated repository Eclipse version Changed the repository pom file's plugins to target Oxygen instead of Neon Signed-off-by: Robert Smith --- org.eclipse.ice.repository/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index cdb9bac1e..415bb07ce 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -35,7 +35,7 @@ ${unqualifiedVersion} ${unqualifiedVersion}.${buildQualifier} http://download.eclipse.org/ice/builds/${releaseName} - Neon + Oxygen @@ -76,7 +76,7 @@ siteTemplateFolder/ - http://download.eclipse.org/eavp/builds/2.2.1 + http://download.eclipse.org/eavp/builds/next From a7b0b102452df4c18328c7281c9b5a0fe6abf101 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 20 Feb 2017 12:45:58 -0500 Subject: [PATCH 53/74] Explicitly set product version for repository Set the product's version to 2.2.1 instead of using a variable, to try to prevent there from being null values set to the json object during facade creation. Signed-off-by: Robert Smith --- org.eclipse.ice.repository/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index 415bb07ce..ede011282 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -32,8 +32,8 @@ ICE Nightly Build - ${unqualifiedVersion} - ${unqualifiedVersion}.${buildQualifier} + 2.2.1 + 2.2.1.${buildQualifier} http://download.eclipse.org/ice/builds/${releaseName} Oxygen From ecab20fde120a9e7d5947a2e5f2c594ed9b5e961 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 20 Feb 2017 21:17:01 -0500 Subject: [PATCH 54/74] Disable jboss repository-utils for now --- org.eclipse.ice.repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index ede011282..94d646867 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -53,7 +53,6 @@ org.jboss.tools.tycho-plugins repository-utils @@ -82,6 +81,7 @@ + --> From 2d92f1a9c0564cf1887baab06c5326154ae301d5 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 21 Feb 2017 07:42:02 -0500 Subject: [PATCH 55/74] Revert "Explicitly set product version for repository" This reverts commit a7b0b102452df4c18328c7281c9b5a0fe6abf101. --- org.eclipse.ice.repository/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index ede011282..415bb07ce 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -32,8 +32,8 @@ ICE Nightly Build - 2.2.1 - 2.2.1.${buildQualifier} + ${unqualifiedVersion} + ${unqualifiedVersion}.${buildQualifier} http://download.eclipse.org/ice/builds/${releaseName} Oxygen From 502349d1751e15bffa121649b1f461ebd204910c Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 21 Feb 2017 07:43:10 -0500 Subject: [PATCH 56/74] Revert "Updated repository Eclipse version" This reverts commit 9ca79b580d2285ea72789afd6d9bf41eba5ca5b7. --- org.eclipse.ice.repository/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index 415bb07ce..cdb9bac1e 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -35,7 +35,7 @@ ${unqualifiedVersion} ${unqualifiedVersion}.${buildQualifier} http://download.eclipse.org/ice/builds/${releaseName} - Oxygen + Neon @@ -76,7 +76,7 @@ siteTemplateFolder/ - http://download.eclipse.org/eavp/builds/next + http://download.eclipse.org/eavp/builds/2.2.1 From 7af35d227f8b00bae5c07bb4d62884ecbc0c188b Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 21 Feb 2017 07:43:45 -0500 Subject: [PATCH 57/74] Revert "Changed build info URL" This reverts commit b9fbc4fc8bc41a8f40a73524caf4b92f7d36fee0. --- org.eclipse.ice.repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index cdb9bac1e..323f324f3 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -76,7 +76,7 @@ siteTemplateFolder/ - http://download.eclipse.org/eavp/builds/2.2.1 + http://download.eclipse.org/eavp/builds/next From 9a3d1c19e7017a9ff1689565edf69f79730f5280 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 21 Feb 2017 07:44:10 -0500 Subject: [PATCH 58/74] Revert "Set release name in parent pom." This reverts commit bdf258a4f4dc5664c33f75a0fd553ec2c0c9b1cb. --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index f2620ba3c..27f7d54cb 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - 2.2.1RC2 + next 0.26.0 ${tycho-version} 1.1.3 From ab346f6c9cd4df32b0697d468c560a367fbc7d42 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 23 Feb 2017 09:26:19 -0500 Subject: [PATCH 59/74] Try to fix jboss problem. This may break the build, but it will only be temporary. --- org.eclipse.ice.repository/pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index 87494ed09..8477db575 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -53,10 +53,11 @@ org.jboss.tools.tycho-plugins repository-utils - 0.23.3 + 0.26.1 generate-facade @@ -74,14 +75,10 @@ ${target.eclipse.version} siteTemplateFolder/ - - http://download.eclipse.org/eavp/builds/next - - --> From b46a70316c65d1c0ff3d7f03f2ce1c7854883600 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 24 Feb 2017 09:35:36 -0500 Subject: [PATCH 60/74] Revert "Revert "Set release name in parent pom."" This reverts commit 9a3d1c19e7017a9ff1689565edf69f79730f5280. --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index 27f7d54cb..f2620ba3c 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - next + 2.2.1RC2 0.26.0 ${tycho-version} 1.1.3 From 18d3d06a114f83e2b22405e9e30b68510945e6fd Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 28 Feb 2017 15:49:10 -0500 Subject: [PATCH 61/74] Added SWTBot UI test maven build Added org.eclipse.ice.aggregator.swtbot which contains a pom for a Maven build which will run all our SWTBot integration tests. Signed-off-by: Robert Smith --- org.eclipse.ice.aggregator.swtbot/.project | 17 +++ org.eclipse.ice.aggregator.swtbot/pom.xml | 44 ++++++++ .../META-INF/MANIFEST.MF | 3 + org.eclipse.ice.mesh/META-INF/MANIFEST.MF | 1 + .../utils/AbstractWorkbenchTester.java | 2 +- .../META-INF/MANIFEST.MF | 93 +++++++++++++++- .../ReflectivityModelTester.launch | 5 +- .../VIBEKeyValuePairTester.launch | 4 +- .../VIBELauncher.launch | 4 +- .../VIBEModel.launch | 5 +- org.eclipse.ice.tests.ui.swtbot/pom.xml | 2 +- .../ui/swtbot/MaterialsDatabaseTester.java | 2 + .../ui/swtbot/ReflectivityModelTester.java | 25 +++-- .../ui/swtbot/VIBEKeyValuePairTester.java | 52 ++++----- .../tests/ui/swtbot/VIBELauncherTester.java | 20 ++-- .../ice/tests/ui/swtbot/VIBEModelTester.java | 104 +++++++++--------- 16 files changed, 271 insertions(+), 112 deletions(-) create mode 100644 org.eclipse.ice.aggregator.swtbot/.project create mode 100644 org.eclipse.ice.aggregator.swtbot/pom.xml diff --git a/org.eclipse.ice.aggregator.swtbot/.project b/org.eclipse.ice.aggregator.swtbot/.project new file mode 100644 index 000000000..85ab97738 --- /dev/null +++ b/org.eclipse.ice.aggregator.swtbot/.project @@ -0,0 +1,17 @@ + + + org.eclipse.ice.aggregator.swtbot + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/org.eclipse.ice.aggregator.swtbot/pom.xml b/org.eclipse.ice.aggregator.swtbot/pom.xml new file mode 100644 index 000000000..2e390fa28 --- /dev/null +++ b/org.eclipse.ice.aggregator.swtbot/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + org.eclipse.ice.aggregator + org.eclipse.ice.aggregator + pom + Eclipse ICE SWTBot UI Integration Tests Aggregator + Aggregator Bundle for running the SWTBot UI tests for Eclipse ICE + + org.eclipse.ice + org.eclipse.ice.build + 2.2.0-SNAPSHOT + ../org.eclipse.ice.parent/pom.xml + + + ../org.eclipse.ice.tests.ui.swtbot + ../org.eclipse.ice.caebat.batml + ../org.eclipse.ice.client + ../org.eclipse.ice.client.compatibility + ../org.eclipse.ice.client.rcp + ../org.eclipse.ice.client.widgets + ../org.eclipse.ice.client.widgets.moose + ../org.eclipse.ice.core + ../org.eclipse.ice.datastructures + ../org.eclipse.ice.developer + ../org.eclipse.ice.developer.moose + ../org.eclipse.ice.geometry + ../org.eclipse.ice.io + ../org.eclipse.ice.item + ../org.eclipse.ice.materials + ../org.eclipse.ice.materials.ui + ../org.eclipse.ice.materials.feature + ../org.eclipse.ice.mesh + ../org.eclipse.ice.nek5000 + ../org.eclipse.ice.parent + ../org.eclipse.ice.persistence.xml + ../org.eclipse.ice.projectgeneration + ../org.eclipse.ice.proteus + ../org.eclipse.ice.reactor.plant + ../org.eclipse.ice.reflectivity + ../org.eclipse.ice.reflectivity.ui + ../org.eclipse.ice.target.oxygen + ../org.eclipse.ice.vibe + + \ No newline at end of file diff --git a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF index c55ea6a10..af0c86e79 100644 --- a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF @@ -36,3 +36,6 @@ Require-Bundle: org.eclipse.cdt;bundle-version="8.7.0", org.eclipse.egit;bundle-version="4.0.0", org.eclipse.ice.developer, org.eclipse.ui +Export-Package: org.eclipse.ice.developer.moose.actions, + org.eclipse.ice.developer.moose.nature, + org.eclipse.ice.developer.moose.wizards diff --git a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF index 258cc2315..c3af07d01 100644 --- a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Import-Package: org.eclipse.core.resources, org.eclipse.ice.item Service-Component: OSGI-INF/meshEditorComponent.xml Bundle-Vendor: Oak Ridge National Laboratory +Export-Package: org.eclipse.ice.mesh.editor diff --git a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java index 17af3b675..603d876dc 100644 --- a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java @@ -149,7 +149,7 @@ public void afterEachTest() { @Override public void afterAllTests() { // Dispose static or otherwise shared resources here. - // Nothing to do yet. + bot.resetWorkbench(); // Proceed with the default post-tests cleanup. super.afterAllTests(); diff --git a/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF index 423558682..81e7bbdc1 100644 --- a/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF @@ -2,19 +2,106 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE SWTBot UI Test Bundle Bundle-SymbolicName: org.eclipse.ice.tests.ui.swtbot -Bundle-Version: 2.1.7.20150825 +Bundle-Version: 2.2.0.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: ca.odell.glazedlists, ca.odell.glazedlists.gui, - org.eclipse.ice.client.common, - org.eclipse.ice.client.internal, + org.eclipse.e4.ui.workbench.addons.swt, + org.eclipse.eavp.viz, + org.eclipse.eavp.viz.service, + org.eclipse.eavp.viz.service.geometry.properties, + org.eclipse.eavp.viz.service.geometry.widgets, + org.eclipse.eavp.viz.service.javafx.geometry, + org.eclipse.eavp.viz.service.javafx.geometry.datatypes, + org.eclipse.eavp.viz.service.javafx.geometry.plant, + org.eclipse.eavp.viz.service.javafx.mesh, + org.eclipse.eavp.viz.service.javafx.mesh.datatypes, + org.eclipse.eavp.viz.service.paraview, + org.eclipse.eavp.viz.service.paraview.proxy, + org.eclipse.eavp.viz.service.paraview.web, + org.eclipse.eavp.viz.service.visit, + org.eclipse.equinox.http.jetty;version="1.4.0", + org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0", + org.eclipse.ice.caebat.batml, + org.eclipse.ice.client.widgets, + org.eclipse.ice.client.widgets.analysis, + org.eclipse.ice.client.widgets.grid, + org.eclipse.ice.client.widgets.moose, + org.eclipse.ice.client.widgets.providers, + org.eclipse.ice.client.widgets.providers.Default, + org.eclipse.ice.datastructures.ICEObject, + org.eclipse.ice.datastructures.componentVisitor, + org.eclipse.ice.datastructures.entry, org.eclipse.ice.datastructures.form, + org.eclipse.ice.datastructures.form.emf, + org.eclipse.ice.datastructures.form.iterator, + org.eclipse.ice.datastructures.form.painfullySimpleForm, + org.eclipse.ice.datastructures.internal, + org.eclipse.ice.datastructures.jaxbclassprovider, + org.eclipse.ice.datastructures.resource, + org.eclipse.ice.developer.actions, + org.eclipse.ice.developer.moose.actions, + org.eclipse.ice.developer.moose.nature, + org.eclipse.ice.developer.moose.wizards, + org.eclipse.ice.geometry, + org.eclipse.ice.io.csv, + org.eclipse.ice.io.ini, + org.eclipse.ice.io.ips, + org.eclipse.ice.io.serializable, + org.eclipse.ice.item, + org.eclipse.ice.item.action, + org.eclipse.ice.item.jobLauncher, + org.eclipse.ice.item.jobprofile, + org.eclipse.ice.item.messaging, + org.eclipse.ice.item.model, + org.eclipse.ice.item.nuclear, + org.eclipse.ice.item.persistence, org.eclipse.ice.materials, org.eclipse.ice.materials.ui, + org.eclipse.ice.materials.ui.perspectives, + org.eclipse.ice.mesh.editor, + org.eclipse.ice.nek5000, + org.eclipse.ice.proteus, + org.eclipse.ice.reactor.plant, + org.eclipse.ice.reflectivity, + org.eclipse.ice.reflectivity.ui, org.eclipse.ice.tests.client.widgets.utils, + org.eclipse.ice.vibe.kvPair, + org.eclipse.ice.vibe.launcher, + org.eclipse.ice.vibe.model, + org.eclipse.january.geometry, + org.eclipse.january.geometry.model.importer, + org.eclipse.january.geometry.xtext.obj.importer, + org.eclipse.january.geometry.xtext.obj.ui.internal, + org.eclipse.january.geometry.xtext.vtk.importer, + org.eclipse.january.geometry.xtext.vtk.ui.internal, org.eclipse.nebula.widgets.nattable;version="1.3.0", + org.eclipse.osgi.framework.console;version="1.1.0", + org.eclipse.osgi.framework.eventmgr;version="1.2.0", + org.eclipse.osgi.framework.log;version="1.1.0", + org.eclipse.osgi.report.resolution;version="1.0.0", + org.eclipse.osgi.service.datalocation;version="1.3.0", + org.eclipse.osgi.service.debug;version="1.2.0", + org.eclipse.osgi.service.environment;version="1.3.0", + org.eclipse.osgi.service.localization;version="1.1.0", + org.eclipse.osgi.service.runnable;version="1.1.0", + org.eclipse.osgi.service.urlconversion;version="1.0.0", + org.eclipse.osgi.storagemanager;version="1.0.0", + org.eclipse.osgi.util;version="1.1.0", + org.eclipse.platform.internal, + org.eclipse.ui, + org.eclipse.ui.forms, + org.eclipse.ui.forms.editor, + org.eclipse.ui.forms.events, + org.eclipse.ui.forms.widgets, org.eclipse.ui.internal.views.properties.tabbed.view, + org.eclipse.ui.intro.config, + org.eclipse.ui.intro.contentproviders, + org.eclipse.ui.intro.quicklinks;version="1.0.0", + org.eclipse.ui.intro.universal, + org.eclipse.ui.views.properties.tabbed, + org.eclipse.update.configurator, org.slf4j;version="1.7.2" Require-Bundle: org.junit, org.eclipse.swtbot.eclipse.core;bundle-version="2.2.1", diff --git a/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch b/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch index 016642c86..f0bc6ba15 100644 --- a/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/ReflectivityModelTester.launch @@ -11,7 +11,6 @@ - @@ -31,8 +30,8 @@ - - + + diff --git a/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch b/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch index 1257e9209..a3aaed6d6 100644 --- a/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBEKeyValuePairTester.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch b/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch index 5a90d1407..96a6b1c9e 100644 --- a/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBELauncher.launch @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch b/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch index 5fb652cd7..bc623bacc 100644 --- a/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch +++ b/org.eclipse.ice.tests.ui.swtbot/VIBEModel.launch @@ -11,7 +11,6 @@ - @@ -31,8 +30,8 @@ - - + + diff --git a/org.eclipse.ice.tests.ui.swtbot/pom.xml b/org.eclipse.ice.tests.ui.swtbot/pom.xml index 24fb7b6c7..2bd699a0b 100644 --- a/org.eclipse.ice.tests.ui.swtbot/pom.xml +++ b/org.eclipse.ice.tests.ui.swtbot/pom.xml @@ -10,7 +10,7 @@ ../org.eclipse.ice.parent/pom.xml org.eclipse.ice - org.eclipse.ice.ui.swtbot.test + org.eclipse.ice.tests.ui.swtbot eclipse-test-plugin diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java index 156918826..4f3b7df9e 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java @@ -410,6 +410,8 @@ public void checkMaterialsTree() { assertTrue("Abs xs".equals(cellName)); cellValue = (double) realTable.getDataValueByPosition(2, 1); assertEquals(0.231, cellValue); + + bot.resetWorkbench(); } /* diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java index 3d8850d9a..5e5d3a291 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java @@ -92,7 +92,7 @@ public void checkReflectivityModel() { // Check that the cancel button is working assertTrue(bot.button("Cancel").isEnabled()); - + // Get the nattable NatTable realTable = bot.widget(widgetOfType(NatTable.class)); SWTBotNatTable table = new SWTBotNatTable(realTable); @@ -120,26 +120,28 @@ public void checkReflectivityModel() { assertEquals(6, table.rowCount()); // Select the new row and try to move it down a row. This shouldn't do - // anything. + // anything. Type the cell's current value into it to reset the focus table.selectCell(bot, 0, 5); - bot.button("v").click(); + bot.button(5).click(); cellName = (String) realTable.getDataValueByPosition(1, 6); assertTrue("107Ag".equals(cellName)); // Move it up two rows table.selectCell(bot, 0, 5); - bot.button("^").click(); - bot.button("^").click(); + bot.text().typeText("107Ag"); + bot.button(4).click(); + bot.button(4).click(); cellName = (String) realTable.getDataValueByPosition(1, 4); assertTrue("107Ag".equals(cellName)); // Move it up five times. This should let it reach the top of the table // then stop. - bot.button("^").click(); - bot.button("^").click(); - bot.button("^").click(); - bot.button("^").click(); - bot.button("^").click(); + bot.button(4).click(); + bot.button(4).click(); + bot.button(4).click(); + bot.button(4).click(); + bot.button(4).click(); + cellName = (String) realTable.getDataValueByPosition(1, 1); assertTrue("107Ag".equals(cellName)); @@ -150,7 +152,7 @@ public void checkReflectivityModel() { assertTrue("Air".equals(cellName)); cellName = (String) realTable.getDataValueByPosition(1, 5); assertTrue("Si".equals(cellName)); - + // Check that the wave vector file brows button is enabled bot.viewByPartName("Properties").setFocus(); assertTrue(bot.button("Browse...").isEnabled()); @@ -162,6 +164,7 @@ public void checkReflectivityModel() { enterText("deltaQ1ByQ:", "invalid input"); enterText("Wave Length:", "invalid input"); + } /** diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java index 355e78c04..3a41c9078 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java @@ -65,16 +65,22 @@ public void checkVIBEKeyValuePair() { // Check that the cancel button is enabled assertTrue(bot.button("Cancel").isEnabled()); + //The table should be empty at the start + assertEquals(0, bot.table().rowCount()); + + //Set the table to the NTG template + bot.radio(1).click(); + // Check the table's values for the default settings - assertTrue("ELECTRICAL".equals(bot.table(1).cell(0, 0))); + assertTrue("ELECTRICAL".equals(bot.table().cell(0, 0))); // Change the first row's value to two - bot.table(1).click(0, 1); + bot.table().click(0, 1); bot.text("1 ", 0).setText("2"); - bot.table(1).click(0, 0); + bot.table().click(0, 0); // Check that the cell was set - assertTrue("2".equals(bot.table(1).cell(0, 1))); + assertTrue("2".equals(bot.table().cell(0, 1))); // Makes sure the form registers that it is dirty assertTrue("There are unsaved changes on the form." @@ -85,55 +91,49 @@ public void checkVIBEKeyValuePair() { assertTrue(bot.clabel(0).getText().equals("Ready to process.")); // Make sure there are 21 rows - assertEquals(21, bot.table(1).rowCount()); + assertEquals(21, bot.table().rowCount()); // Add a row and check that it is there. bot.button("+").click(); - assertEquals(22, bot.table(1).rowCount()); + assertEquals(22, bot.table().rowCount()); // Remove the second from last row and test that there are one fewer // rows and that the last row is empty. - bot.table(1).click(20, 0); + bot.table().click(20, 0); bot.button("-").click(); - assertEquals(21, bot.table(1).rowCount()); - System.out.println(bot.table(1).cell(20, 0)); - assertTrue("".equals(bot.table(1).cell(20, 0))); + assertEquals(21, bot.table().rowCount()); + System.out.println(bot.table().cell(20, 0)); + assertTrue("".equals(bot.table().cell(20, 0))); // Check that the form reports the job as complete after performing it. bot.button("Go!").click(); assertTrue(bot.clabel(0).getText().equals("Done!")); // Set the template to DualFoil - bot.radio(1).click(); + bot.radio(2).click(); // Check that a couple of the DualFoil's rows are set up correctly - assertTrue("NUMSEG".equals(bot.table(1).cell(14, 0))); - assertTrue("CUTOFFL".equals(bot.table(1).cell(17, 0))); - assertTrue("2.0,2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); + assertTrue("NUMSEG".equals(bot.table().cell(14, 0))); + assertTrue("CUTOFFL".equals(bot.table().cell(17, 0))); + assertTrue("2.0,2.0,2.0,2.0,2.0".equals(bot.table().cell(17, 1))); // Set the NUMSEG key to 8. - bot.table(1).click(14, 1); + bot.table().click(14, 1); bot.text("5", 0).setText("8"); - bot.table(1).click(14, 0); + bot.table().click(14, 0); // CUTOFFL should have had its vector increased in size to account for // the new NUMSEG value assertTrue("2.0,2.0,2.0,2.0,2.0,0.0,0.0,0.0" - .equals(bot.table(1).cell(17, 1))); + .equals(bot.table().cell(17, 1))); // Set NUMSEG to 4 - bot.table(1).click(14, 1); + bot.table().click(14, 1); bot.text("8", 0).setText("4"); - bot.table(1).click(14, 0); + bot.table().click(14, 0); // CUTOFFL should have been reduced to only 4 numbers - assertTrue("2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); - - // Set the template back to NTG - bot.radio(0).click(); - - // Check one of the rows to ensure that the NTG template has been loaded - assertTrue("CUTOFF".equals(bot.table(1).cell(15, 0))); + assertTrue("2.0,2.0,2.0,2.0".equals(bot.table().cell(17, 1))); } } diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java index fc86ca5bf..6de9be64f 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java @@ -86,24 +86,24 @@ public void checkVIBELauncher() { assertTrue(bot.button("Browse...", 1).isEnabled()); //Check the host table's initial contents - assertTrue("localhost".equals(bot.table(1).cell(0, 0))); - assertEquals(1, bot.table(1).rowCount()); + assertTrue("localhost".equals(bot.table().cell(0, 0))); + assertEquals(1, bot.table().rowCount()); //Add a row and check that it was added correctly bot.button("+").click(); - assertEquals(2, bot.table(1).rowCount()); - assertTrue("".equals(bot.table(1).cell(1, 0))); + assertEquals(2, bot.table().rowCount()); + assertTrue("".equals(bot.table().cell(1, 0))); //Try editing the table and ensure the change was accepted - bot.table(1).click(1, 0); + bot.table().click(1, 0); bot.text("").typeText("8.8.8.8"); - bot.table(1).click(0, 0); - assertTrue("8.8.8.8".equals(bot.table(1).cell(1, 0))); + bot.table().click(0, 0); + assertTrue("8.8.8.8".equals(bot.table().cell(1, 0))); //Remove a row from the table and check that it is gone bot.button("-").click(); - assertEquals(1, bot.table(1).rowCount()); - assertTrue("8.8.8.8".equals(bot.table(1).cell(0, 0))); + assertEquals(1, bot.table().rowCount()); + assertTrue("8.8.8.8".equals(bot.table().cell(0, 0))); //Remove rows until the table is empty and remove another. Nothing should happen. bot.button("-").click(); @@ -111,5 +111,7 @@ public void checkVIBELauncher() { // See if the tab can be changed bot.cTabItem("Output Files and Data").activate(); + + } } diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java index 0f3e10466..cbf8197ad 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java @@ -2,6 +2,7 @@ import org.eclipse.ice.tests.client.widgets.utils.AbstractWorkbenchTester; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.junit.Test; @@ -53,29 +54,29 @@ public void checkVIBELauncher() { // Save after each one to reset the header. bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(1).click(0, 0); - bot.table(1).click(1, 0); + bot.table(0).click(0, 0); + bot.table(0).click(1, 0); bot.comboBox().setSelection(1); bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(1).click(0, 0); - bot.table(1).click(1, 0); + bot.table(0).click(0, 0); + bot.table(0).click(1, 0); bot.comboBox().setSelection(2); bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(1).click(0, 0); - bot.table(1).click(1, 0); + bot.table(0).click(0, 0); + bot.table(0).click(1, 0); // Try editing the global configuration table and ensure the change // was accepted - bot.table(1).click(1, 0); - bot.text(7).typeText("Edited name"); + bot.table(0).click(1, 0); + bot.text(5).typeText("Edited name"); // bot.text().setText("Edited name"); - bot.table(1).click(0, 0); - assertTrue("Edited name".equals(bot.table(1).cell(1, 0))); + bot.table(0).click(0, 0); + assertTrue("Edited name".equals(bot.table(0).cell(1, 0))); // Check that this made the form dirty assertTrue("There are unsaved changes on the form." @@ -86,18 +87,18 @@ public void checkVIBELauncher() { assertTrue(bot.clabel(0).getText().equals("Ready to process.")); // Check the global configuration table's initial contents - assertEquals(20, bot.table(1).rowCount()); + assertEquals(20, bot.table(0).rowCount()); // Add a row and check that it was added correctly bot.button("+").click(); - assertEquals(21, bot.table(1).rowCount()); - assertTrue("".equals(bot.table(1).cell(20, 0))); + assertEquals(21, bot.table(0).rowCount()); + assertTrue("".equals(bot.table(0).cell(20, 0))); // Remove a row from the table and check that it is gone - bot.table(1).click(0, 0); + bot.table(0).click(0, 0); bot.button("-").click(); - assertEquals(20, bot.table(1).rowCount()); - assertTrue("".equals(bot.table(1).cell(19, 0))); + assertEquals(20, bot.table(0).rowCount()); + assertTrue("".equals(bot.table(0).cell(19, 0))); // Remove rows until the table is empty and remove another. Nothing // should happen. @@ -106,25 +107,24 @@ public void checkVIBELauncher() { } // Try editing the table and ensure the change was accepted - bot.table(2).click(1, 0); - + bot.table(1).click(1, 0); bot.text("DRIVER").typeText("Edited port"); - bot.table(2).click(0, 0); - assertTrue("Edited port".equals(bot.table(2).cell(1, 0))); + bot.table(1).click(0, 0); + assertTrue("Edited port".equals(bot.table(1).cell(1, 0))); // Check the ports table's initial contents - assertEquals(5, bot.table(2).rowCount()); + assertEquals(5, bot.table(1).rowCount()); // Add a row and check that it was added correctly bot.button("+", 1).click(); - assertEquals(6, bot.table(2).rowCount()); - assertTrue("".equals(bot.table(2).cell(5, 0))); + assertEquals(6, bot.table(1).rowCount()); + assertTrue("".equals(bot.table(1).cell(5, 0))); // Remove a row from the table and check that it is gone - bot.table(2).click(0, 0); + bot.table(1).click(0, 0); bot.button("-", 1).click(); - assertEquals(5, bot.table(2).rowCount()); - assertTrue("".equals(bot.table(2).cell(4, 0))); + assertEquals(5, bot.table(1).rowCount()); + assertTrue("".equals(bot.table(1).cell(4, 0))); // Remove rows until the table is empty and remove another. Nothing // should happen. @@ -142,48 +142,48 @@ public void checkVIBELauncher() { // Test each of the default options, making sure they have at least the // correct number of text fields enabled. - bot.table(1).select(0); + bot.table(0).select(0); + bot.text(9).typeText("Test"); + bot.table(0).select(1); + bot.text(11).typeText("Test"); + bot.table(0).select(2); + bot.text(11).typeText("Test"); + bot.table(0).select(3); + bot.text(11).typeText("Test"); + bot.table(0).select(4); bot.text(11).typeText("Test"); - bot.table(1).select(1); - bot.text(13).typeText("Test"); - bot.table(1).select(2); - bot.text(13).typeText("Test"); - bot.table(1).select(3); - bot.text(13).typeText("Test"); - bot.table(1).select(4); - bot.text(13).typeText("Test"); // Check each of the port types available in the menu and check the // number of text fields they display. bot.button(2).click(); bot.table().select("INIT_STATE"); bot.button("OK").click(); - bot.table(1).select(5); - bot.text(13).typeText("Test"); + bot.table(0).select(5); + bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("AMPERES_THERMAL"); bot.button("OK").click(); - bot.table(1).select(6); - bot.text(13).typeText("Test"); + bot.table(0).select(6); + bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("AMPERES_ELECTRICAL"); bot.button("OK").click(); - bot.table(1).select(7); - bot.text(13).typeText("Test"); + bot.table(0).select(7); + bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("CHARTRAN_ELECTRICAL_THERMAL_DRIVER"); bot.button("OK").click(); - bot.table(1).select(8); - bot.text(12).typeText("Test"); + bot.table(0).select(8); + bot.text(9).typeText("Test"); bot.button(2).click(); bot.table().select("NTG"); bot.button("OK").click(); - bot.table(1).select(9); - bot.text(14).typeText("Test"); + bot.table(0).select(9); + bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("DUALFOIL"); @@ -191,23 +191,25 @@ public void checkVIBELauncher() { // Dualfoil doesn't have any text boxes, count the number of rows in the // table to see if it was added instead. - assertEquals(11, bot.table(1).rowCount()); + assertEquals(11, bot.table(0).rowCount()); bot.button(2).click(); bot.table().select("AMPERES"); bot.button("OK").click(); - bot.table(1).select(11); - bot.text(14).typeText("Test"); + bot.table(0).select(11); + bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("CHARTRAN_THERMAL_DRIVER"); bot.button("OK").click(); - bot.table(1).select(12); - bot.text(10).typeText("Test"); + bot.table(0).select(12); + bot.text(8).typeText("Test"); // Delete a row and make sure it's gone bot.table().select(0); bot.button("Delete").click(); - assertTrue("11 DUALFOIL".equals(bot.table(1).cell(10, 0))); + assertTrue("11 DUALFOIL".equals(bot.table(0).cell(9, 0))); + + } } From 7f0d9d9ea82f77221f4213e532884e2d00190127 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 3 Mar 2017 08:20:52 -0500 Subject: [PATCH 62/74] Added missing plugin to SWTBot build Added a required plugin that was missing from the SWTBot aggregator pom file. Signed-off-by: Robert Smith --- org.eclipse.ice.aggregator.swtbot/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.ice.aggregator.swtbot/pom.xml b/org.eclipse.ice.aggregator.swtbot/pom.xml index 2e390fa28..139260827 100644 --- a/org.eclipse.ice.aggregator.swtbot/pom.xml +++ b/org.eclipse.ice.aggregator.swtbot/pom.xml @@ -13,6 +13,7 @@ ../org.eclipse.ice.tests.ui.swtbot + ../org.eclipse.ice.tests.client.widgets.utils ../org.eclipse.ice.caebat.batml ../org.eclipse.ice.client ../org.eclipse.ice.client.compatibility From 63970f26df6529d11d780f37b5a3f711d605b5f1 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 3 Apr 2017 11:03:54 -0400 Subject: [PATCH 63/74] Updated swtbot tests Updated the swtbot integration tests. Signed-off-by: Robert Smith --- .../ui/swtbot/VIBEKeyValuePairTester.java | 40 +++++----- .../tests/ui/swtbot/VIBELauncherTester.java | 18 ++--- .../ice/tests/ui/swtbot/VIBEModelTester.java | 78 +++++++++---------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java index 3a41c9078..94c2f123d 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java @@ -66,21 +66,21 @@ public void checkVIBEKeyValuePair() { assertTrue(bot.button("Cancel").isEnabled()); //The table should be empty at the start - assertEquals(0, bot.table().rowCount()); + assertEquals(0, bot.table(1).rowCount()); //Set the table to the NTG template bot.radio(1).click(); // Check the table's values for the default settings - assertTrue("ELECTRICAL".equals(bot.table().cell(0, 0))); + assertTrue("ELECTRICAL".equals(bot.table(1).cell(0, 0))); // Change the first row's value to two - bot.table().click(0, 1); + bot.table(1).click(0, 1); bot.text("1 ", 0).setText("2"); - bot.table().click(0, 0); + bot.table(1).click(0, 0); // Check that the cell was set - assertTrue("2".equals(bot.table().cell(0, 1))); + assertTrue("2".equals(bot.table(1).cell(0, 1))); // Makes sure the form registers that it is dirty assertTrue("There are unsaved changes on the form." @@ -91,19 +91,19 @@ public void checkVIBEKeyValuePair() { assertTrue(bot.clabel(0).getText().equals("Ready to process.")); // Make sure there are 21 rows - assertEquals(21, bot.table().rowCount()); + assertEquals(21, bot.table(1).rowCount()); // Add a row and check that it is there. bot.button("+").click(); - assertEquals(22, bot.table().rowCount()); + assertEquals(22, bot.table(1).rowCount()); // Remove the second from last row and test that there are one fewer // rows and that the last row is empty. - bot.table().click(20, 0); + bot.table(1).click(20, 0); bot.button("-").click(); - assertEquals(21, bot.table().rowCount()); - System.out.println(bot.table().cell(20, 0)); - assertTrue("".equals(bot.table().cell(20, 0))); + assertEquals(21, bot.table(1).rowCount()); + System.out.println(bot.table(1).cell(20, 0)); + assertTrue("".equals(bot.table(1).cell(20, 0))); // Check that the form reports the job as complete after performing it. bot.button("Go!").click(); @@ -113,27 +113,27 @@ public void checkVIBEKeyValuePair() { bot.radio(2).click(); // Check that a couple of the DualFoil's rows are set up correctly - assertTrue("NUMSEG".equals(bot.table().cell(14, 0))); - assertTrue("CUTOFFL".equals(bot.table().cell(17, 0))); - assertTrue("2.0,2.0,2.0,2.0,2.0".equals(bot.table().cell(17, 1))); + assertTrue("NUMSEG".equals(bot.table(1).cell(14, 0))); + assertTrue("CUTOFFL".equals(bot.table(1).cell(17, 0))); + assertTrue("2.0,2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); // Set the NUMSEG key to 8. - bot.table().click(14, 1); + bot.table(1).click(14, 1); bot.text("5", 0).setText("8"); - bot.table().click(14, 0); + bot.table(1).click(14, 0); // CUTOFFL should have had its vector increased in size to account for // the new NUMSEG value assertTrue("2.0,2.0,2.0,2.0,2.0,0.0,0.0,0.0" - .equals(bot.table().cell(17, 1))); + .equals(bot.table(1).cell(17, 1))); // Set NUMSEG to 4 - bot.table().click(14, 1); + bot.table(1).click(14, 1); bot.text("8", 0).setText("4"); - bot.table().click(14, 0); + bot.table(1).click(14, 0); // CUTOFFL should have been reduced to only 4 numbers - assertTrue("2.0,2.0,2.0,2.0".equals(bot.table().cell(17, 1))); + assertTrue("2.0,2.0,2.0,2.0".equals(bot.table(1).cell(17, 1))); } } diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java index 6de9be64f..e13115de7 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java @@ -86,24 +86,24 @@ public void checkVIBELauncher() { assertTrue(bot.button("Browse...", 1).isEnabled()); //Check the host table's initial contents - assertTrue("localhost".equals(bot.table().cell(0, 0))); - assertEquals(1, bot.table().rowCount()); + assertTrue("localhost".equals(bot.table(1).cell(0, 0))); + assertEquals(1, bot.table(1).rowCount()); //Add a row and check that it was added correctly bot.button("+").click(); - assertEquals(2, bot.table().rowCount()); - assertTrue("".equals(bot.table().cell(1, 0))); + assertEquals(2, bot.table(1).rowCount()); + assertTrue("".equals(bot.table(1).cell(1, 0))); //Try editing the table and ensure the change was accepted - bot.table().click(1, 0); + bot.table(1).click(1, 0); bot.text("").typeText("8.8.8.8"); - bot.table().click(0, 0); - assertTrue("8.8.8.8".equals(bot.table().cell(1, 0))); + bot.table(1).click(0, 0); + assertTrue("8.8.8.8".equals(bot.table(1).cell(1, 0))); //Remove a row from the table and check that it is gone bot.button("-").click(); - assertEquals(1, bot.table().rowCount()); - assertTrue("8.8.8.8".equals(bot.table().cell(0, 0))); + assertEquals(1, bot.table(1).rowCount()); + assertTrue("8.8.8.8".equals(bot.table(1).cell(0, 0))); //Remove rows until the table is empty and remove another. Nothing should happen. bot.button("-").click(); diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java index cbf8197ad..176bbd0c1 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java @@ -54,29 +54,29 @@ public void checkVIBELauncher() { // Save after each one to reset the header. bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(0).click(0, 0); - bot.table(0).click(1, 0); + bot.table(1).click(0, 0); + bot.table(1).click(1, 0); bot.comboBox().setSelection(1); bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(0).click(0, 0); - bot.table(0).click(1, 0); + bot.table(1).click(0, 0); + bot.table(1).click(1, 0); bot.comboBox().setSelection(2); bot.button("Go!").click(); assertTrue("Done!".equals(bot.clabel(0).getText())); - bot.table(0).click(0, 0); - bot.table(0).click(1, 0); + bot.table(1).click(0, 0); + bot.table(1).click(1, 0); // Try editing the global configuration table and ensure the change // was accepted - bot.table(0).click(1, 0); + bot.table(1).click(1, 0); bot.text(5).typeText("Edited name"); // bot.text().setText("Edited name"); - bot.table(0).click(0, 0); - assertTrue("Edited name".equals(bot.table(0).cell(1, 0))); + bot.table(1).click(0, 0); + assertTrue("Edited name".equals(bot.table(1).cell(1, 0))); // Check that this made the form dirty assertTrue("There are unsaved changes on the form." @@ -87,18 +87,18 @@ public void checkVIBELauncher() { assertTrue(bot.clabel(0).getText().equals("Ready to process.")); // Check the global configuration table's initial contents - assertEquals(20, bot.table(0).rowCount()); + assertEquals(20, bot.table(1).rowCount()); // Add a row and check that it was added correctly bot.button("+").click(); - assertEquals(21, bot.table(0).rowCount()); - assertTrue("".equals(bot.table(0).cell(20, 0))); + assertEquals(21, bot.table(1).rowCount()); + assertTrue("".equals(bot.table(1).cell(20, 0))); // Remove a row from the table and check that it is gone - bot.table(0).click(0, 0); + bot.table(1).click(0, 0); bot.button("-").click(); - assertEquals(20, bot.table(0).rowCount()); - assertTrue("".equals(bot.table(0).cell(19, 0))); + assertEquals(20, bot.table(1).rowCount()); + assertTrue("".equals(bot.table(1).cell(19, 0))); // Remove rows until the table is empty and remove another. Nothing // should happen. @@ -107,24 +107,24 @@ public void checkVIBELauncher() { } // Try editing the table and ensure the change was accepted - bot.table(1).click(1, 0); + bot.table(2).click(1, 0); bot.text("DRIVER").typeText("Edited port"); - bot.table(1).click(0, 0); - assertTrue("Edited port".equals(bot.table(1).cell(1, 0))); + bot.table(2).click(0, 0); + assertTrue("Edited port".equals(bot.table(2).cell(1, 0))); // Check the ports table's initial contents - assertEquals(5, bot.table(1).rowCount()); + assertEquals(5, bot.table(2).rowCount()); // Add a row and check that it was added correctly bot.button("+", 1).click(); - assertEquals(6, bot.table(1).rowCount()); - assertTrue("".equals(bot.table(1).cell(5, 0))); + assertEquals(6, bot.table(2).rowCount()); + assertTrue("".equals(bot.table(2).cell(5, 0))); // Remove a row from the table and check that it is gone - bot.table(1).click(0, 0); + bot.table(2).click(0, 0); bot.button("-", 1).click(); - assertEquals(5, bot.table(1).rowCount()); - assertTrue("".equals(bot.table(1).cell(4, 0))); + assertEquals(5, bot.table(2).rowCount()); + assertTrue("".equals(bot.table(2).cell(4, 0))); // Remove rows until the table is empty and remove another. Nothing // should happen. @@ -142,15 +142,15 @@ public void checkVIBELauncher() { // Test each of the default options, making sure they have at least the // correct number of text fields enabled. - bot.table(0).select(0); + bot.table(1).select(0); bot.text(9).typeText("Test"); - bot.table(0).select(1); + bot.table(1).select(1); bot.text(11).typeText("Test"); - bot.table(0).select(2); + bot.table(1).select(2); bot.text(11).typeText("Test"); - bot.table(0).select(3); + bot.table(1).select(3); bot.text(11).typeText("Test"); - bot.table(0).select(4); + bot.table(1).select(4); bot.text(11).typeText("Test"); // Check each of the port types available in the menu and check the @@ -158,31 +158,31 @@ public void checkVIBELauncher() { bot.button(2).click(); bot.table().select("INIT_STATE"); bot.button("OK").click(); - bot.table(0).select(5); + bot.table(1).select(5); bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("AMPERES_THERMAL"); bot.button("OK").click(); - bot.table(0).select(6); + bot.table(1).select(6); bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("AMPERES_ELECTRICAL"); bot.button("OK").click(); - bot.table(0).select(7); + bot.table(1).select(7); bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("CHARTRAN_ELECTRICAL_THERMAL_DRIVER"); bot.button("OK").click(); - bot.table(0).select(8); + bot.table(1).select(8); bot.text(9).typeText("Test"); bot.button(2).click(); bot.table().select("NTG"); bot.button("OK").click(); - bot.table(0).select(9); + bot.table(1).select(9); bot.text(11).typeText("Test"); bot.button(2).click(); @@ -191,24 +191,24 @@ public void checkVIBELauncher() { // Dualfoil doesn't have any text boxes, count the number of rows in the // table to see if it was added instead. - assertEquals(11, bot.table(0).rowCount()); + assertEquals(11, bot.table(1).rowCount()); bot.button(2).click(); bot.table().select("AMPERES"); bot.button("OK").click(); - bot.table(0).select(11); + bot.table(1).select(11); bot.text(11).typeText("Test"); bot.button(2).click(); bot.table().select("CHARTRAN_THERMAL_DRIVER"); bot.button("OK").click(); - bot.table(0).select(12); + bot.table(1).select(12); bot.text(8).typeText("Test"); // Delete a row and make sure it's gone bot.table().select(0); - bot.button("Delete").click(); - assertTrue("11 DUALFOIL".equals(bot.table(0).cell(9, 0))); + bot.button(3).click(); + assertTrue("11 DUALFOIL".equals(bot.table(1).cell(9, 0))); } From e9574f833c779a17aacfa3306351b6ef3953e612 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 5 May 2017 22:17:21 -0400 Subject: [PATCH 64/74] Updated version numbers. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.aggregator.swtbot/pom.xml | 2 +- org.eclipse.ice.aggregator/pom.xml | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.caebat.batml/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.client.compatibility/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.client.rcp/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.client.widgets.moose/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.client.widgets/pom.xml | 4 ++-- org.eclipse.ice.client/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.client/pom.xml | 4 ++-- org.eclipse.ice.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.core/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.datastructures/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.developer.moose/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.developer/pom.xml | 6 +++--- org.eclipse.ice.feature/feature.xml | 2 +- org.eclipse.ice.feature/pom.xml | 4 ++-- org.eclipse.ice.filesimulation/pom.xml | 2 +- org.eclipse.ice.geometry/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.geometry/pom.xml | 6 +++--- org.eclipse.ice.io/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.io/pom.xml | 4 ++-- org.eclipse.ice.item/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.item/pom.xml | 4 ++-- org.eclipse.ice.materials.feature/feature.xml | 2 +- org.eclipse.ice.materials.feature/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.materials.ui/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.materials/pom.xml | 6 +++--- org.eclipse.ice.mesh/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.mesh/pom.xml | 4 ++-- org.eclipse.ice.nek5000/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.nek5000/pom.xml | 4 ++-- org.eclipse.ice.parent/pom.xml | 4 ++-- org.eclipse.ice.parsergenerator/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.persistence.xml/pom.xml | 6 +++--- org.eclipse.ice.product/ice.runtime.product | 2 +- org.eclipse.ice.product/ice.sdk.product | 2 +- org.eclipse.ice.product/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.projectgeneration/pom.xml | 4 ++-- org.eclipse.ice.proteus/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.proteus/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.reactor.plant/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.reflectivity.ui/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.reflectivity/pom.xml | 4 ++-- org.eclipse.ice.repository/pom.xml | 4 ++-- org.eclipse.ice.servicetester/pom.xml | 2 +- org.eclipse.ice.tablecomponenttester/pom.xml | 2 +- org.eclipse.ice.target.mars/pom.xml | 2 +- org.eclipse.ice.target.neon/pom.xml | 2 +- org.eclipse.ice.target.oxygen/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.caebat.batml/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.client.widgets/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.client/pom.xml | 4 ++-- org.eclipse.ice.tests.core.jaxrs/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.core/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.datastructures/pom.xml | 4 ++-- org.eclipse.ice.tests.io/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.io/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.item/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.materials/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.mesh/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.nek5000/pom.xml | 4 ++-- org.eclipse.ice.tests.parsergenerator/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.persistence.xml/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.proteus/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.reactor.plant/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.reflectivity/pom.xml | 4 ++-- org.eclipse.ice.tests.ui.swtbot/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.tests.vibe/pom.xml | 4 ++-- org.eclipse.ice.vibe/META-INF/MANIFEST.MF | 2 +- org.eclipse.ice.vibe/pom.xml | 4 ++-- utils/ICEDocCleaner/bin/ICEDocCleaner.class | Bin 3831 -> 3831 bytes 106 files changed, 166 insertions(+), 166 deletions(-) diff --git a/org.eclipse.ice.aggregator.swtbot/pom.xml b/org.eclipse.ice.aggregator.swtbot/pom.xml index 139260827..e8641d651 100644 --- a/org.eclipse.ice.aggregator.swtbot/pom.xml +++ b/org.eclipse.ice.aggregator.swtbot/pom.xml @@ -7,7 +7,7 @@ Aggregator Bundle for running the SWTBot UI tests for Eclipse ICE org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml index 7712d75b5..f343d7b79 100644 --- a/org.eclipse.ice.aggregator/pom.xml +++ b/org.eclipse.ice.aggregator/pom.xml @@ -7,11 +7,12 @@ Aggregator Bundle for building Eclipse ICE org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml + ../org.eclipse.ice.parent ../org.eclipse.ice.caebat.batml ../org.eclipse.ice.tests.caebat.batml ../org.eclipse.ice.client @@ -42,7 +43,6 @@ ../org.eclipse.ice.tests.mesh ../org.eclipse.ice.nek5000 ../org.eclipse.ice.tests.nek5000 - ../org.eclipse.ice.parent ../org.eclipse.ice.persistence.xml ../org.eclipse.ice.tests.persistence.xml ../org.eclipse.ice.projectgeneration @@ -61,4 +61,4 @@ ../org.eclipse.ice.repository ../org.eclipse.ice.product - \ No newline at end of file + diff --git a/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF b/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF index b5323c6b0..8207c28be 100644 --- a/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BatteryML Bundle-SymbolicName: org.eclipse.ice.caebat.batml;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Service-Component: OSGI-INF/xsdcomponent.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.core.filesystem, diff --git a/org.eclipse.ice.caebat.batml/pom.xml b/org.eclipse.ice.caebat.batml/pom.xml index 64096c5c3..bcb047c04 100644 --- a/org.eclipse.ice.caebat.batml/pom.xml +++ b/org.eclipse.ice.caebat.batml/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.caebat.batml - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF b/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF index a839f7728..55153e934 100644 --- a/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Compability Bundle for Eclipse RCP/RAP Bundle-SymbolicName: org.eclipse.ice.client.compatibility -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.jface.action, org.eclipse.jface.databinding.swt, diff --git a/org.eclipse.ice.client.compatibility/pom.xml b/org.eclipse.ice.client.compatibility/pom.xml index bbf6efd78..65df9959f 100644 --- a/org.eclipse.ice.client.compatibility/pom.xml +++ b/org.eclipse.ice.client.compatibility/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF b/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF index 746c9743a..54f41c258 100644 --- a/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Bundle-SymbolicName: org.eclipse.ice.client.rcp;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.sun.jersey.api.client, com.sun.jersey.api.client.filter, diff --git a/org.eclipse.ice.client.rcp/pom.xml b/org.eclipse.ice.client.rcp/pom.xml index 44ed87bb7..8297eecf4 100644 --- a/org.eclipse.ice.client.rcp/pom.xml +++ b/org.eclipse.ice.client.rcp/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF index efbca46be..86bd0a909 100644 --- a/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Moose Widgets Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.commons.io, org.eclipse.cdt.core.model, diff --git a/org.eclipse.ice.client.widgets.moose/pom.xml b/org.eclipse.ice.client.widgets.moose/pom.xml index e1c4672f3..8c201981c 100644 --- a/org.eclipse.ice.client.widgets.moose/pom.xml +++ b/org.eclipse.ice.client.widgets.moose/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF index b68f94ab3..a860ddae3 100644 --- a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEEclipseWidgets Bundle-SymbolicName: org.eclipse.ice.client.widgets;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ice.datastructures, org.eclipse.ice.client.compatibility, diff --git a/org.eclipse.ice.client.widgets/pom.xml b/org.eclipse.ice.client.widgets/pom.xml index 558f93138..0490ac0a5 100644 --- a/org.eclipse.ice.client.widgets/pom.xml +++ b/org.eclipse.ice.client.widgets/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.client/META-INF/MANIFEST.MF b/org.eclipse.ice.client/META-INF/MANIFEST.MF index d9bc4733d..5274c92ca 100644 --- a/org.eclipse.ice.client/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.client/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Client Bundle-SymbolicName: org.eclipse.ice.client;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ice.client.common, org.eclipse.ice.client.common.internal, diff --git a/org.eclipse.ice.client/pom.xml b/org.eclipse.ice.client/pom.xml index 9301375c3..6cf0d1219 100644 --- a/org.eclipse.ice.client/pom.xml +++ b/org.eclipse.ice.client/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.core/META-INF/MANIFEST.MF b/org.eclipse.ice.core/META-INF/MANIFEST.MF index 565e9bc4c..c3fff81a2 100644 --- a/org.eclipse.ice.core/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Bundle-SymbolicName: org.eclipse.ice.core;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ice.core.iCore, org.eclipse.ice.core.launcher diff --git a/org.eclipse.ice.core/pom.xml b/org.eclipse.ice.core/pom.xml index 74f6a2964..2c32bd393 100644 --- a/org.eclipse.ice.core/pom.xml +++ b/org.eclipse.ice.core/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF b/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF index f9cfc6d09..74c132ef3 100644 --- a/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEDataStructures Bundle-SymbolicName: org.eclipse.ice.datastructures;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Meta-Persistence: META-INF/persistence.xml diff --git a/org.eclipse.ice.datastructures/pom.xml b/org.eclipse.ice.datastructures/pom.xml index 332b49d7b..c52de60fe 100644 --- a/org.eclipse.ice.datastructures/pom.xml +++ b/org.eclipse.ice.datastructures/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.datastructures - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF index af0c86e79..57bbcbd34 100644 --- a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: MOOSE Developer Bundle-SymbolicName: org.eclipse.ice.developer.moose;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.cdt.core.settings.model, diff --git a/org.eclipse.ice.developer.moose/pom.xml b/org.eclipse.ice.developer.moose/pom.xml index 8de4f5cc4..ef12f110a 100644 --- a/org.eclipse.ice.developer.moose/pom.xml +++ b/org.eclipse.ice.developer.moose/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.developer.moose - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.developer/META-INF/MANIFEST.MF b/org.eclipse.ice.developer/META-INF/MANIFEST.MF index 7a85294fc..45a3e9a28 100644 --- a/org.eclipse.ice.developer/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.developer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Developer Bundle-SymbolicName: org.eclipse.ice.developer;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", diff --git a/org.eclipse.ice.developer/pom.xml b/org.eclipse.ice.developer/pom.xml index 8e7493599..84ec5e9b8 100644 --- a/org.eclipse.ice.developer/pom.xml +++ b/org.eclipse.ice.developer/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.developer - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.feature/feature.xml b/org.eclipse.ice.feature/feature.xml index e2dc831b0..182150023 100644 --- a/org.eclipse.ice.feature/feature.xml +++ b/org.eclipse.ice.feature/feature.xml @@ -2,7 +2,7 @@ eclipse-feature org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.filesimulation/pom.xml b/org.eclipse.ice.filesimulation/pom.xml index eacd24c5b..7c2b0a69d 100644 --- a/org.eclipse.ice.filesimulation/pom.xml +++ b/org.eclipse.ice.filesimulation/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.geometry/META-INF/MANIFEST.MF b/org.eclipse.ice.geometry/META-INF/MANIFEST.MF index 4751be5e8..a3448b60d 100644 --- a/org.eclipse.ice.geometry/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.geometry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Geometry Form Bundle-SymbolicName: org.eclipse.ice.geometry;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Require-Bundle: org.eclipse.ice.datastructures, org.eclipse.ice.client.compatibility, diff --git a/org.eclipse.ice.geometry/pom.xml b/org.eclipse.ice.geometry/pom.xml index d73b447a5..d4907c0e5 100644 --- a/org.eclipse.ice.geometry/pom.xml +++ b/org.eclipse.ice.geometry/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent ../org.eclipse.ice.parent/pom.xml - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT org.eclipse.ice org.eclipse.ice.geometry - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.io/META-INF/MANIFEST.MF b/org.eclipse.ice.io/META-INF/MANIFEST.MF index b1bf20abe..be54a628a 100644 --- a/org.eclipse.ice.io/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.io/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.io Bundle-SymbolicName: org.eclipse.ice.io;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Require-Bundle: org.eclipse.ice.datastructures diff --git a/org.eclipse.ice.io/pom.xml b/org.eclipse.ice.io/pom.xml index 24e1d15d7..669b41991 100644 --- a/org.eclipse.ice.io/pom.xml +++ b/org.eclipse.ice.io/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.item/META-INF/MANIFEST.MF b/org.eclipse.ice.item/META-INF/MANIFEST.MF index 7873f4c6f..e0f3d8f7a 100644 --- a/org.eclipse.ice.item/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.item/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEItem Bundle-SymbolicName: org.eclipse.ice.item;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.collect;version="10.0.1", com.google.common.net;version="15.0.0", diff --git a/org.eclipse.ice.item/pom.xml b/org.eclipse.ice.item/pom.xml index a1132d558..83165e741 100644 --- a/org.eclipse.ice.item/pom.xml +++ b/org.eclipse.ice.item/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.materials.feature/feature.xml b/org.eclipse.ice.materials.feature/feature.xml index 261f6f648..2d739860d 100644 --- a/org.eclipse.ice.materials.feature/feature.xml +++ b/org.eclipse.ice.materials.feature/feature.xml @@ -2,7 +2,7 @@ eclipse-feature - org.eclipse.ice.build + org.eclipse.ice.parent org.eclipse.ice - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.materials.ui/META-INF/MANIFEST.MF b/org.eclipse.ice.materials.ui/META-INF/MANIFEST.MF index b5ccd7006..e9077ab6d 100644 --- a/org.eclipse.ice.materials.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.materials.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Materials UI Bundle-SymbolicName: org.eclipse.ice.materials.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.0.1.v20131118-1956", org.eclipse.e4.core.di;bundle-version="1.3.0", diff --git a/org.eclipse.ice.materials.ui/pom.xml b/org.eclipse.ice.materials.ui/pom.xml index 0876d0a86..d7c526303 100644 --- a/org.eclipse.ice.materials.ui/pom.xml +++ b/org.eclipse.ice.materials.ui/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.materials/META-INF/MANIFEST.MF b/org.eclipse.ice.materials/META-INF/MANIFEST.MF index d375a9642..5dcc3c949 100644 --- a/org.eclipse.ice.materials/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.materials/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Materials Bundle-SymbolicName: org.eclipse.ice.materials;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: ca.odell.glazedlists, diff --git a/org.eclipse.ice.materials/pom.xml b/org.eclipse.ice.materials/pom.xml index 468a213f6..6ad0fc8ef 100644 --- a/org.eclipse.ice.materials/pom.xml +++ b/org.eclipse.ice.materials/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.materials - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF index c3af07d01..9ba46802a 100644 --- a/org.eclipse.ice.mesh/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.mesh/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mesh Bundle-SymbolicName: org.eclipse.ice.mesh;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ice.datastructures Import-Package: org.eclipse.core.resources, diff --git a/org.eclipse.ice.mesh/pom.xml b/org.eclipse.ice.mesh/pom.xml index ba2f8b95d..f6bac6738 100644 --- a/org.eclipse.ice.mesh/pom.xml +++ b/org.eclipse.ice.mesh/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF b/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF index 4c9442d38..1f58cd9b6 100644 --- a/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Nek5000 ICE Plug-in Bundle-SymbolicName: org.eclipse.ice.nek5000;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, diff --git a/org.eclipse.ice.nek5000/pom.xml b/org.eclipse.ice.nek5000/pom.xml index 496be651b..41a869820 100644 --- a/org.eclipse.ice.nek5000/pom.xml +++ b/org.eclipse.ice.nek5000/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index f2620ba3c..10f933b15 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -24,8 +24,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT pom diff --git a/org.eclipse.ice.parsergenerator/pom.xml b/org.eclipse.ice.parsergenerator/pom.xml index 0d5954f40..579d08d09 100644 --- a/org.eclipse.ice.parsergenerator/pom.xml +++ b/org.eclipse.ice.parsergenerator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 0.1.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.persistence.xml/META-INF/MANIFEST.MF b/org.eclipse.ice.persistence.xml/META-INF/MANIFEST.MF index 67a1dd1a0..77bd48843 100644 --- a/org.eclipse.ice.persistence.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.persistence.xml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE XML Persistence Provider Bundle-SymbolicName: org.eclipse.ice.persistence.xml;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ice.core.iCore, org.eclipse.ice.datastructures.ICEObject, diff --git a/org.eclipse.ice.persistence.xml/pom.xml b/org.eclipse.ice.persistence.xml/pom.xml index 38c76e761..1e05ef906 100644 --- a/org.eclipse.ice.persistence.xml/pom.xml +++ b/org.eclipse.ice.persistence.xml/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.persistence.xml - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.product/ice.runtime.product b/org.eclipse.ice.product/ice.runtime.product index 8ede45ced..ba2b0bca1 100644 --- a/org.eclipse.ice.product/ice.runtime.product +++ b/org.eclipse.ice.product/ice.runtime.product @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.ice.product/ice.sdk.product b/org.eclipse.ice.product/ice.sdk.product index a681a3b6f..9d4f7ba01 100644 --- a/org.eclipse.ice.product/ice.sdk.product +++ b/org.eclipse.ice.product/ice.sdk.product @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.ice.product/pom.xml b/org.eclipse.ice.product/pom.xml index afcfdfb82..5280fe02c 100644 --- a/org.eclipse.ice.product/pom.xml +++ b/org.eclipse.ice.product/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF b/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF index 641f4ab8e..c756972d3 100644 --- a/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.projectgeneration/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Project Generation Bundle-SymbolicName: org.eclipse.ice.projectgeneration;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ice.projectgeneration;uses:="org.eclipse.core.resources", org.eclipse.ice.projectgeneration.templates; diff --git a/org.eclipse.ice.projectgeneration/pom.xml b/org.eclipse.ice.projectgeneration/pom.xml index 5d5ee4e9e..77acbe8c7 100644 --- a/org.eclipse.ice.projectgeneration/pom.xml +++ b/org.eclipse.ice.projectgeneration/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.proteus/META-INF/MANIFEST.MF b/org.eclipse.ice.proteus/META-INF/MANIFEST.MF index 60858cf50..494c32fef 100644 --- a/org.eclipse.ice.proteus/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.proteus/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PROTEUS Bundle-SymbolicName: org.eclipse.ice.proteus;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Service-Component: OSGI-INF/*.xml Import-Package: org.eclipse.ice.datastructures.form, diff --git a/org.eclipse.ice.proteus/pom.xml b/org.eclipse.ice.proteus/pom.xml index dc759bb8e..04601f7ec 100644 --- a/org.eclipse.ice.proteus/pom.xml +++ b/org.eclipse.ice.proteus/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF b/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF index 6b8f0384c..35fb4722b 100644 --- a/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.reactor.plant Bundle-SymbolicName: org.eclipse.ice.reactor.plant;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.modeling, diff --git a/org.eclipse.ice.reactor.plant/pom.xml b/org.eclipse.ice.reactor.plant/pom.xml index 1c6ddd7a6..9e4c4ce18 100644 --- a/org.eclipse.ice.reactor.plant/pom.xml +++ b/org.eclipse.ice.reactor.plant/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.reflectivity.ui/META-INF/MANIFEST.MF b/org.eclipse.ice.reflectivity.ui/META-INF/MANIFEST.MF index 88f697415..1839118f2 100644 --- a/org.eclipse.ice.reflectivity.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.reflectivity.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Reflectivity Widgets Bundle-SymbolicName: org.eclipse.ice.reflectivity.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Export-Package: org.eclipse.ice.reflectivity.ui Require-Bundle: org.eclipse.ice.datastructures, diff --git a/org.eclipse.ice.reflectivity.ui/pom.xml b/org.eclipse.ice.reflectivity.ui/pom.xml index e4257bdc6..8526744d0 100644 --- a/org.eclipse.ice.reflectivity.ui/pom.xml +++ b/org.eclipse.ice.reflectivity.ui/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent ../org.eclipse.ice.parent/pom.xml - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT org.eclipse.ice org.eclipse.ice.reflectivity.ui - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF b/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF index d2751abdd..70e57106c 100644 --- a/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Reflectivity Bundle-SymbolicName: org.eclipse.ice.reflectivity;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Service-Component: OSGI-INF/ReflectivityModelComponent.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.commons.math;version="2.1.0", diff --git a/org.eclipse.ice.reflectivity/pom.xml b/org.eclipse.ice.reflectivity/pom.xml index 5d340862c..78d24aeed 100644 --- a/org.eclipse.ice.reflectivity/pom.xml +++ b/org.eclipse.ice.reflectivity/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.repository/pom.xml b/org.eclipse.ice.repository/pom.xml index 8477db575..e6fe4a42a 100644 --- a/org.eclipse.ice.repository/pom.xml +++ b/org.eclipse.ice.repository/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.servicetester/pom.xml b/org.eclipse.ice.servicetester/pom.xml index db85ec533..bb523023b 100644 --- a/org.eclipse.ice.servicetester/pom.xml +++ b/org.eclipse.ice.servicetester/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.tablecomponenttester/pom.xml b/org.eclipse.ice.tablecomponenttester/pom.xml index 1ec74e6ff..bdd5506ee 100644 --- a/org.eclipse.ice.tablecomponenttester/pom.xml +++ b/org.eclipse.ice.tablecomponenttester/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.target.mars/pom.xml b/org.eclipse.ice.target.mars/pom.xml index f6659c744..64889be50 100644 --- a/org.eclipse.ice.target.mars/pom.xml +++ b/org.eclipse.ice.target.mars/pom.xml @@ -6,7 +6,7 @@ org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.target.neon/pom.xml b/org.eclipse.ice.target.neon/pom.xml index a7e87b137..0544aaa13 100644 --- a/org.eclipse.ice.target.neon/pom.xml +++ b/org.eclipse.ice.target.neon/pom.xml @@ -6,7 +6,7 @@ org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.target.oxygen/pom.xml b/org.eclipse.ice.target.oxygen/pom.xml index ac7449814..9938b49b8 100644 --- a/org.eclipse.ice.target.oxygen/pom.xml +++ b/org.eclipse.ice.target.oxygen/pom.xml @@ -6,8 +6,8 @@ org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF index 240c96073..9ded140d0 100644 --- a/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.caebat.batml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BatMLTest Bundle-SymbolicName: org.eclipse.ice.tests.caebat.batml -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.ice.datastructures, diff --git a/org.eclipse.ice.tests.caebat.batml/pom.xml b/org.eclipse.ice.tests.caebat.batml/pom.xml index 5d9ebe26e..89d94202d 100644 --- a/org.eclipse.ice.tests.caebat.batml/pom.xml +++ b/org.eclipse.ice.tests.caebat.batml/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF index f029a63c4..f3c1be1fb 100644 --- a/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets.moose/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: MOOSE Widgets Test Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.moose -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Oak Ridge National Laboratory Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ice.client.widgets.moose, diff --git a/org.eclipse.ice.tests.client.widgets.moose/pom.xml b/org.eclipse.ice.tests.client.widgets.moose/pom.xml index 831130b1c..64b322b5e 100644 --- a/org.eclipse.ice.tests.client.widgets.moose/pom.xml +++ b/org.eclipse.ice.tests.client.widgets.moose/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF index a05296eb1..0ea161f4d 100644 --- a/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets.utils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE Client Widget Test Utilities Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.utils -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ice.datastructures, org.eclipse.ice.client.compatibility, diff --git a/org.eclipse.ice.tests.client.widgets.utils/pom.xml b/org.eclipse.ice.tests.client.widgets.utils/pom.xml index 34bca6851..93710de3d 100644 --- a/org.eclipse.ice.tests.client.widgets.utils/pom.xml +++ b/org.eclipse.ice.tests.client.widgets.utils/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF index 92a65bb31..fb4594990 100644 --- a/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client.widgets/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEEclipseWidgetsTest Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.client.widgets Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.eavp.viz.modeling, diff --git a/org.eclipse.ice.tests.client.widgets/pom.xml b/org.eclipse.ice.tests.client.widgets/pom.xml index 846c7b31f..5c3cacda2 100644 --- a/org.eclipse.ice.tests.client.widgets/pom.xml +++ b/org.eclipse.ice.tests.client.widgets/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF index b41baf11d..4c88edebd 100644 --- a/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.client/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ClientTest Bundle-SymbolicName: org.eclipse.ice.tests.client -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.client Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ice.client.internal, diff --git a/org.eclipse.ice.tests.client/pom.xml b/org.eclipse.ice.tests.client/pom.xml index 20767d1f4..0b6b8ba7f 100644 --- a/org.eclipse.ice.tests.client/pom.xml +++ b/org.eclipse.ice.tests.client/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.core.jaxrs/pom.xml b/org.eclipse.ice.tests.core.jaxrs/pom.xml index 78b5dc94c..9dfa24ab9 100644 --- a/org.eclipse.ice.tests.core.jaxrs/pom.xml +++ b/org.eclipse.ice.tests.core.jaxrs/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF index 587de6918..462f86ab4 100644 --- a/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CoreTest Bundle-SymbolicName: org.eclipse.ice.tests.core -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.runtime.content, diff --git a/org.eclipse.ice.tests.core/pom.xml b/org.eclipse.ice.tests.core/pom.xml index 02a434479..935381097 100644 --- a/org.eclipse.ice.tests.core/pom.xml +++ b/org.eclipse.ice.tests.core/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.tests.core - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF index 38764b3b3..97f41d202 100644 --- a/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.datastructures/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEDataStructuresTest Bundle-SymbolicName: org.eclipse.ice.tests.datastructures;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Require-Bundle: org.junit;bundle-version="4.8.2", org.eclipse.emf.ecore, org.eclipse.ice.datastructures, diff --git a/org.eclipse.ice.tests.datastructures/pom.xml b/org.eclipse.ice.tests.datastructures/pom.xml index 5ef5e0dbd..6b90d5e33 100644 --- a/org.eclipse.ice.tests.datastructures/pom.xml +++ b/org.eclipse.ice.tests.datastructures/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF index 5081ffab6..318befaf3 100644 --- a/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.io/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: org.eclipse.ice.tests.io -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Fragment-Host: org.eclipse.ice.io Require-Bundle: org.junit;bundle-version="4.8.2", diff --git a/org.eclipse.ice.tests.io/pom.xml b/org.eclipse.ice.tests.io/pom.xml index d46e7d455..1124357c8 100644 --- a/org.eclipse.ice.tests.io/pom.xml +++ b/org.eclipse.ice.tests.io/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF index 03028bc2e..44d670ef7 100644 --- a/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.item/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICEItemTest Bundle-SymbolicName: org.eclipse.ice.tests.item -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.item Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.spotify.docker.client, diff --git a/org.eclipse.ice.tests.item/pom.xml b/org.eclipse.ice.tests.item/pom.xml index d0e660423..8b15df64d 100644 --- a/org.eclipse.ice.tests.item/pom.xml +++ b/org.eclipse.ice.tests.item/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF index 5f14131ab..216f181b9 100644 --- a/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.materials/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Materials Tests Bundle-SymbolicName: org.eclipse.ice.tests.materials -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.materials Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit diff --git a/org.eclipse.ice.tests.materials/pom.xml b/org.eclipse.ice.tests.materials/pom.xml index fc00e731b..e307ddf44 100644 --- a/org.eclipse.ice.tests.materials/pom.xml +++ b/org.eclipse.ice.tests.materials/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF index 5f952034f..99a510230 100644 --- a/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.mesh/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mesh Test Bundle-SymbolicName: org.eclipse.ice.tests.mesh -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.mesh Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit diff --git a/org.eclipse.ice.tests.mesh/pom.xml b/org.eclipse.ice.tests.mesh/pom.xml index e577ec9e4..9da816b9c 100644 --- a/org.eclipse.ice.tests.mesh/pom.xml +++ b/org.eclipse.ice.tests.mesh/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF index ac6ae0551..d9e6c37f3 100644 --- a/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.nek5000/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.nek5000.test Bundle-SymbolicName: org.eclipse.ice.tests.nek5000 -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.nek5000 Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.eavp.viz.datastructures.VizObject, diff --git a/org.eclipse.ice.tests.nek5000/pom.xml b/org.eclipse.ice.tests.nek5000/pom.xml index 4c6b836b1..e0389f31a 100644 --- a/org.eclipse.ice.tests.nek5000/pom.xml +++ b/org.eclipse.ice.tests.nek5000/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.parsergenerator/pom.xml b/org.eclipse.ice.tests.parsergenerator/pom.xml index b3fdbf409..100eace3e 100644 --- a/org.eclipse.ice.tests.parsergenerator/pom.xml +++ b/org.eclipse.ice.tests.parsergenerator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 0.1.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF index 60ac95b1a..a1bc1e2f2 100644 --- a/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.persistence.xml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ICE XML Persistence Provider Tests Bundle-SymbolicName: org.eclipse.ice.tests.persistence.xml -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit, org.eclipse.ice.persistence.xml, diff --git a/org.eclipse.ice.tests.persistence.xml/pom.xml b/org.eclipse.ice.tests.persistence.xml/pom.xml index de3ee6ad3..eb95d4bef 100644 --- a/org.eclipse.ice.tests.persistence.xml/pom.xml +++ b/org.eclipse.ice.tests.persistence.xml/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice org.eclipse.ice.tests.persistence.xml - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT eclipse-test-plugin true diff --git a/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF index 2f50164b2..340304fa5 100644 --- a/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.projectgeneration/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ProjectGenerationTester Bundle-SymbolicName: org.eclipse.ice.tests.projectgeneration;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.resources, org.eclipse.equinox.common, diff --git a/org.eclipse.ice.tests.projectgeneration/pom.xml b/org.eclipse.ice.tests.projectgeneration/pom.xml index 73b2c49a9..57268b452 100644 --- a/org.eclipse.ice.tests.projectgeneration/pom.xml +++ b/org.eclipse.ice.tests.projectgeneration/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF index 420cf1a59..09875c4ea 100644 --- a/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.proteus/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PROTEUSModelTester Bundle-SymbolicName: org.eclipse.ice.tests.proteus -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.proteus Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.8.2", diff --git a/org.eclipse.ice.tests.proteus/pom.xml b/org.eclipse.ice.tests.proteus/pom.xml index bbfa92273..190761fb1 100644 --- a/org.eclipse.ice.tests.proteus/pom.xml +++ b/org.eclipse.ice.tests.proteus/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF index ef5a49b77..9825755bc 100644 --- a/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.reactor.plant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.ice.reactor.plant.test Bundle-SymbolicName: org.eclipse.ice.tests.reactor.plant -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Fragment-Host: org.eclipse.ice.reactor.plant Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0" diff --git a/org.eclipse.ice.tests.reactor.plant/pom.xml b/org.eclipse.ice.tests.reactor.plant/pom.xml index 464993c65..2837ecced 100644 --- a/org.eclipse.ice.tests.reactor.plant/pom.xml +++ b/org.eclipse.ice.tests.reactor.plant/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF index e56319825..6dbe08d8a 100644 --- a/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.reflectivity/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ReflectivityTest Bundle-SymbolicName: org.eclipse.ice.tests.reflectivity -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.ice.item, diff --git a/org.eclipse.ice.tests.reflectivity/pom.xml b/org.eclipse.ice.tests.reflectivity/pom.xml index 06aa1cb40..29e984f6a 100644 --- a/org.eclipse.ice.tests.reflectivity/pom.xml +++ b/org.eclipse.ice.tests.reflectivity/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.tests.ui.swtbot/pom.xml b/org.eclipse.ice.tests.ui.swtbot/pom.xml index 2bd699a0b..b8c403cc8 100644 --- a/org.eclipse.ice.tests.ui.swtbot/pom.xml +++ b/org.eclipse.ice.tests.ui.swtbot/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build + org.eclipse.ice.parent 2.2.0-SNAPSHOT ../org.eclipse.ice.parent/pom.xml diff --git a/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF index b8d9e4d1d..c558cb579 100644 --- a/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.tests.vibe/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: VibeTest Bundle-SymbolicName: org.eclipse.ice.tests.vibe -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Fragment-Host: org.eclipse.ice.vibe Require-Bundle: org.junit;bundle-version="4.8.1" diff --git a/org.eclipse.ice.tests.vibe/pom.xml b/org.eclipse.ice.tests.vibe/pom.xml index 23b605635..e4c1edb1f 100644 --- a/org.eclipse.ice.tests.vibe/pom.xml +++ b/org.eclipse.ice.tests.vibe/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/org.eclipse.ice.vibe/META-INF/MANIFEST.MF b/org.eclipse.ice.vibe/META-INF/MANIFEST.MF index b0b08f224..8a7e400e7 100644 --- a/org.eclipse.ice.vibe/META-INF/MANIFEST.MF +++ b/org.eclipse.ice.vibe/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Vibe Bundle-SymbolicName: org.eclipse.ice.vibe;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.ice.io.serializable, org.eclipse.jface.dialogs, diff --git a/org.eclipse.ice.vibe/pom.xml b/org.eclipse.ice.vibe/pom.xml index e2fa16d7d..981d6c242 100644 --- a/org.eclipse.ice.vibe/pom.xml +++ b/org.eclipse.ice.vibe/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.eclipse.ice - org.eclipse.ice.build - 2.2.0-SNAPSHOT + org.eclipse.ice.parent + 2.2.1-SNAPSHOT ../org.eclipse.ice.parent/pom.xml org.eclipse.ice diff --git a/utils/ICEDocCleaner/bin/ICEDocCleaner.class b/utils/ICEDocCleaner/bin/ICEDocCleaner.class index 8076224ea0c75543222f68c6ca36d5033373e48b..cf9c3343eb2674f3c3ee217e95df5a4663be0d4d 100644 GIT binary patch delta 17 Zcmew^`(2jf)W2Q(7#J8#Hgde@0{}|j2U`FD delta 17 Zcmew^`(2jf)W2Q(7#J9gH*&n^0{}|e2U-9C From 265528ed4481b90bbb5459ddf2b4093f0e1fc201 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 5 May 2017 22:21:52 -0400 Subject: [PATCH 65/74] Removed a bin directory. Signed-off-by: Jay Jay Billings --- utils/ICEDocCleaner/.gitignore | 1 + utils/ICEDocCleaner/bin/ICEDocCleaner.class | Bin 3831 -> 0 bytes 2 files changed, 1 insertion(+) create mode 100644 utils/ICEDocCleaner/.gitignore delete mode 100644 utils/ICEDocCleaner/bin/ICEDocCleaner.class diff --git a/utils/ICEDocCleaner/.gitignore b/utils/ICEDocCleaner/.gitignore new file mode 100644 index 000000000..e660fd93d --- /dev/null +++ b/utils/ICEDocCleaner/.gitignore @@ -0,0 +1 @@ +bin/ diff --git a/utils/ICEDocCleaner/bin/ICEDocCleaner.class b/utils/ICEDocCleaner/bin/ICEDocCleaner.class deleted file mode 100644 index cf9c3343eb2674f3c3ee217e95df5a4663be0d4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3831 zcma)9YjhlC8GgQY)0y2)Ti8;{mI9lCkfhl}ODVWpV(B)ufm~|Rq-<%elif)&?Pg}# zoo&-n6)UYM-tVcXAZQh}kgA(XgsNyk5XB2#P|!bmj{fi$$3H6Zd1p7t#;hJs&YAtb z_kF+je#^73J^mzsjrgO6MGDJ0lI`2vbTVt1j+NICP`K!TdB|+dn$B=*&)@+o?I|qT zY&*8srm(o7aX=xEbTd{6ixD(Xhb0OtI&H`5E{+ab`CaB<)=~&}x@j{zVCHSPSAYR; z#4ZT+JfR6P95ro6;nIdXI_HGJZsdzYFtL;-6CySRTja=JIUXp6w4e<=vYHkyW?5;=uk16jSksaD`$Em z@n{HZaixYUs>D{kG;kH73R+H>Wog8!hFUggSV#M2)ZSVg8nW_Mrq?nv;`M73A~U!S zCs(X!RYr?p*BZDE4GN3IO>-7h(I!H;8ch<9^$M3&bPx~Cv7;+Ps7FkQT4>E2QCUz0 z|9S&&zy<}Kj>$-16)tILTxgVzjf|W%W_uxQ!c7`(obP%+dSgeb${t%Sl^_#yuJ~D;P7L*v=4ykU*O#%rGRd#lS7t%6z2Mf=6b|$324BW}w|i z*adl|1Zt0MzjQI zuYrAdD>HS}^wJ|1omVqc_vm<=Lh}D){J-St7*x2Dj9Odgsa7ml`B<7AgeV;uR`-@+ zi@q~GE2CpbVJVf5dT#Vq_94-H#DI+h)clZ{Em}RKxVAcn%1tU!BSXbeZ8}C3R7lRQ zfgJ8+`k1*Ky`&JU<}=f87DT1uc2?K`3I;sCI6SvZFJV4p;IL%h(h;-JZH;+SGy*?j z;HXdRRDe2;DJgG2(>ahdI4ZK@AZ(Ta;7JOmH zr4CLSc#lZbhAnR=yO)ml()bqf;(Z3*j}K5r)+~4(PR1G&Pu9$V4x#^$fe+&&3c*5g zu;ACSH0X|w8h+OCF?NFegXTeb_z8LVNnu@!RqS%x^e={vS0X?5jc&nX!!EXNSLLS?!Xjz1Ye~?($q^K zRmrhg8sCopkm18B!*7;wPT85{o<;feI=-$DPqIyW(%1&g^ubs$=T9y+w`jv*n{%w} z;;8FH3&nKWDik=~qSCY*LmD2fF_U)ZZ4N;V6CC2c6X}03s|*j}G29ly8GKV(+qdRT zkurrpMb2Q-z&RO=b%%wYj>i?&_8hYEausdeyv>emmIp1>6`sd+Ji)HIGw+I`(X>07 zll-WcoH=jcyOQum*`OY$oi^zBK8I7%EoL)O$MtBslPTLDg2E3BEXN84!psk|-L0&# zTyUZe=9y6CaM05ElUY`ioS%;21zmwSUHl`yVNuU=kUMcp?YY6r={^r#Jp)*)h4Sp6 zhGnYifkIA;3hbj51`CIQsF?MKv@t}2-WAuTFp!$W?eQh2(Hqgi zsS@rug&jQY_fKs+nf_@bPie|Ng(jXXUkg6EB0}y1sfczC!;?4|&X(Ymkmq-Iq^^YG zIF`%rSSqePJ^i3)b{91h(AzIyo&S42u15kFz)uP9iqy%8=zAji`C4Gwcp`jn3GdtF z>n_*DtF#h6SW)1k6fHo3eY~tpTo-3Wbb2cuj0DA3@P9wGo0O*naw_lyK9^d277z5D z!LSjOwgeif1M<8VJ ziVW-G=MY$^UzL za07Zdrux}b_G2@$xS3l)8;)QLj$tcKBFXu+4X3zKK8)>bOC6X%H=ZN@6~6p4U;d4o zz^h2%@7RlfU>}opzpCTj6ynOW40~0Wu+@aEC9EEnYUWxqfDvWFRt$f}dvOCCT@ zO>iTbLS8+Ef_es?dLD<>ix^Wc;i!5Ucd0*dXZQ>5_G{rNtAJUKAL0USU87#W(|CrS zxJo^TAK_Wn#Rhebn*NwR=~4ILdHjS`(yQ*pPw@iFu3w$N&+v0rOAhzo7kr^nw=?)9 zUgT+juwN0TQ_my#HMs<-T_b*j-_pY`QR1Um@h>!LsMoM*n!eCA{H}b{z|p)zLzf2b z#+&#LW+Xg~RnTfuKxz2>G))TDMia|YpQb(k Date: Fri, 5 May 2017 22:33:25 -0400 Subject: [PATCH 66/74] Updated remaining version numbers Signed-off-by: Jay Jay Billings --- org.eclipse.ice.parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index 10f933b15..133f60e78 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - 2.2.1RC2 + 2.2.1RC3 0.26.0 ${tycho-version} 1.1.3 @@ -241,7 +241,7 @@ org.eclipse.ice org.eclipse.ice.target.oxygen - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT oxygen From 055e0aaf978b4814a037431c62362ab5de9818ca Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 9 May 2017 09:01:32 -0400 Subject: [PATCH 67/74] Updated SWTBot test Fixed the VIBE Model UI test to get it running again. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java index 176bbd0c1..ac2c3d9c0 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java @@ -206,7 +206,8 @@ public void checkVIBELauncher() { bot.text(8).typeText("Test"); // Delete a row and make sure it's gone - bot.table().select(0); + bot.table(1).select(0); + bot.text(1).selectAll(); bot.button(3).click(); assertTrue("11 DUALFOIL".equals(bot.table(1).cell(9, 0))); From 1214ec849f4bef18ba5e1b3f0927f58d47d9c6e0 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Fri, 12 May 2017 08:25:53 -0400 Subject: [PATCH 68/74] Added some updates to the feature file to try to fix the marketplace. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.feature/feature.xml | 377 ++++++++++++++-------------- 1 file changed, 192 insertions(+), 185 deletions(-) diff --git a/org.eclipse.ice.feature/feature.xml b/org.eclipse.ice.feature/feature.xml index 182150023..f299f98ec 100644 --- a/org.eclipse.ice.feature/feature.xml +++ b/org.eclipse.ice.feature/feature.xml @@ -1,26 +1,26 @@ - - - - + + + + This feature describes all of the infrastructure components available -in the Eclipse Integrated Computational Environment. - - - +in the Eclipse Integrated Computational Environment. + + + Copyright (c) 2011, 2014 UT-Battelle, LLC. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License -v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - - - +v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html + + + Eclipse Foundation Software User Agreement July 1, 2014 @@ -74,168 +74,175 @@ Cryptography Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2d57f98faefce6c250262aa0a0ea63398c93a12c Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Thu, 18 May 2017 15:07:12 -0400 Subject: [PATCH 69/74] Updated Windows launch configuration Updated the Windows launch configuration to include ICE's current set of dependencies. Signed-off-by: Robert Smith --- org.eclipse.ice.product/ice.product_WINDOWS.launch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.ice.product/ice.product_WINDOWS.launch b/org.eclipse.ice.product/ice.product_WINDOWS.launch index 0c5a7dff5..63c6cfa3d 100644 --- a/org.eclipse.ice.product/ice.product_WINDOWS.launch +++ b/org.eclipse.ice.product/ice.product_WINDOWS.launch @@ -18,11 +18,11 @@ - + - + From 49f7786992101d97dd3cae4d4a83bb228a1cd2dc Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 23 May 2017 09:05:46 -0400 Subject: [PATCH 70/74] Fixed Mac launch configuration Fixed the Mac run configuration file to work properly with the latest ICE updates. Signed-off-by: Robert Smith --- org.eclipse.ice.product/ice.macosx_product.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.product/ice.macosx_product.launch b/org.eclipse.ice.product/ice.macosx_product.launch index a95cc4d5f..52e85eb2a 100644 --- a/org.eclipse.ice.product/ice.macosx_product.launch +++ b/org.eclipse.ice.product/ice.macosx_product.launch @@ -22,7 +22,7 @@ - + From a9f4e1cc55efa19d74efadbd396c3e7d6798aaa4 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 23 May 2017 12:48:24 -0400 Subject: [PATCH 71/74] Updated AbstractWorkbenchTester Updated the AbstractWorkbenchTester to get the SWTBot commands working with the current version. Signed-off-by: Robert Smith --- .../client/widgets/utils/AbstractWorkbenchTester.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java index 603d876dc..0144e964e 100644 --- a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java @@ -58,8 +58,8 @@ * @author Jordan Deyton * */ -public abstract class AbstractWorkbenchTester extends - AbstractICEUITester { +public abstract class AbstractWorkbenchTester + extends AbstractICEUITester { /** * The {@code SWTBot} for this test class instance. This bot is to aid in @@ -243,7 +243,8 @@ protected IEditorReference openICEFormEditor(ICEFormInput input) { * The Eclipse editor's ID as defined in the plug-in extensions. * @return The opened editor, or {@code null} if it could not be opened. */ - protected IEditorReference openICEFormEditor(ICEFormInput input, String id) { + protected IEditorReference openICEFormEditor(ICEFormInput input, + String id) { return openEditor(input, id); } @@ -271,13 +272,15 @@ protected SWTBotView openView(String category, String name) { SWTWorkbenchBot bot = getBot(); // Open "Window" > "Show View" > "Other..." + bot.menu("Window").click(); + bot.menu("Window").menu("Show View").click(); bot.menu("Window").menu("Show View").menu("Other...").click(); // To pick from the dialog, we must activate it. bot.shell("Show View").activate(); // Select "category" > "name" bot.tree().expandNode(category, false).select(name); // Close the dialog by clicking OK. - bot.button("OK").click(); + bot.button().click(); // Return the view itself. return bot.viewByTitle(name); } From 27a0577bcb51b3896423058b5a85871da6a172e4 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Tue, 23 May 2017 14:30:37 -0400 Subject: [PATCH 72/74] Removed return value from openView() AbstractWorbenchTester's openView() no longer returns a reference to the opened view, to avoid a bug where SWTBot could not obtain that reference. Signed-off-by: Robert Smith --- .../tests/client/widgets/utils/AbstractWorkbenchTester.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java index 0144e964e..a7c9c4fce 100644 --- a/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java +++ b/org.eclipse.ice.tests.client.widgets.utils/src/org/eclipse/ice/tests/client/widgets/utils/AbstractWorkbenchTester.java @@ -22,7 +22,6 @@ import org.eclipse.ice.datastructures.resource.VizResource; import org.eclipse.swt.widgets.Display; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.eclipse.ui.IEditorInput; @@ -267,7 +266,7 @@ protected IEditorReference openICEFormEditor(ICEFormInput input, * seen in the plug-in extensions and the UI itself. * @return The view wrapped by the {@code SWTBot}. */ - protected SWTBotView openView(String category, String name) { + protected void openView(String category, String name) { SWTWorkbenchBot bot = getBot(); @@ -281,8 +280,6 @@ protected SWTBotView openView(String category, String name) { bot.tree().expandNode(category, false).select(name); // Close the dialog by clicking OK. bot.button().click(); - // Return the view itself. - return bot.viewByTitle(name); } /** From b26399e5af738356a99130723f7c84e0fb461887 Mon Sep 17 00:00:00 2001 From: Jay Jay Billings Date: Wed, 24 May 2017 11:06:55 -0400 Subject: [PATCH 73/74] Updated release number in pom.xml. Signed-off-by: Jay Jay Billings --- org.eclipse.ice.parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.ice.parent/pom.xml b/org.eclipse.ice.parent/pom.xml index 133f60e78..e48bbddf7 100644 --- a/org.eclipse.ice.parent/pom.xml +++ b/org.eclipse.ice.parent/pom.xml @@ -4,7 +4,7 @@ - 2.2.1RC3 + 2.2.1 0.26.0 ${tycho-version} 1.1.3 From 62513ecfc61a8c486de28b55f8ede971d508f5dd Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 26 May 2017 09:40:07 -0400 Subject: [PATCH 74/74] Fixed SWTBot tests Updated the SWTBot tests to work with the latest version of ICE. Signed-off-by: Robert Smith --- .../src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java | 2 +- .../eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java | 5 ++++- .../eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java | 2 +- .../eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java | 2 +- .../org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java | 2 +- .../src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java index 7b2a133cc..9134d3d9b 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MOOSETester.java @@ -35,7 +35,7 @@ public void checkMooseActions() { bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("MOOSE"); - bot.button("OK").click(); + bot.button().click(); // Select fork the stork bot.menu("Developer").menu("Framework").menu("MOOSE") diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java index 4f3b7df9e..6c526d962 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/MaterialsDatabaseTester.java @@ -62,10 +62,13 @@ public void checkMaterialsTree() { bot.viewByTitle("Welcome").close(); // Open the ICE perspective + bot.menu("Window"); + bot.menu("Window").menu("Perspective"); + bot.menu("Window").menu("Perspective").menu("Open Perspective"); bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("ICE"); - bot.button("OK").click(); + bot.button().click(); // Open the materials database bot.toolbarButtonWithTooltip("Edit Materials Database").click(); diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java index 5e5d3a291..279b77285 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/ReflectivityModelTester.java @@ -64,7 +64,7 @@ public void checkReflectivityModel() { bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("ICE"); - bot.button("OK").click(); + bot.button().click(); // Create a new reflectivity model item bot.toolbarButtonWithTooltip("Create an Item").click(); diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java index 94c2f123d..0fc9ec661 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEKeyValuePairTester.java @@ -52,7 +52,7 @@ public void checkVIBEKeyValuePair() { bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("ICE"); - bot.button("OK").click(); + bot.button().click(); // Create a new reflectivity model item bot.toolbarButtonWithTooltip("Create an Item").click(); diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java index e13115de7..aa8daffca 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBELauncherTester.java @@ -52,7 +52,7 @@ public void checkVIBELauncher() { bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("ICE"); - bot.button("OK").click(); + bot.button().click(); // Create a new reflectivity model item bot.toolbarButtonWithTooltip("Create an Item").click(); diff --git a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java index ac2c3d9c0..62a9d99e5 100644 --- a/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java +++ b/org.eclipse.ice.tests.ui.swtbot/src/org/eclipse/ice/tests/ui/swtbot/VIBEModelTester.java @@ -37,7 +37,7 @@ public void checkVIBELauncher() { bot.menu("Window").menu("Perspective").menu("Open Perspective") .menu("Other...").click(); bot.table(0).select("ICE"); - bot.button("OK").click(); + bot.button().click(); // Create a new reflectivity model item bot.toolbarButtonWithTooltip("Create an Item").click();