diff options
Diffstat (limited to 'plugins')
238 files changed, 2505 insertions, 1563 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo.test/META-INF/MANIFEST.MF deleted file mode 100644 index 939b3ed9f03..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: ATS Config Demo Test Fragment -Bundle-SymbolicName: org.eclipse.osee.ats.client.demo.test;singleton:=true -Bundle-Version: 0.11.0.qualifier -Bundle-Vendor: Eclipse Open System Engineering Environment -Fragment-Host: org.eclipse.osee.ats.client.demo -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.osee.ats.client.demo, - org.eclipse.osee.ats.client.demo.config -Require-Bundle: org.junit -Import-Package: org.eclipse.osee.ats.api.data, - org.eclipse.osee.ats.core.client.action, - org.eclipse.osee.ats.core.util diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/build.properties b/plugins/org.eclipse.osee.ats.client.demo.test/build.properties deleted file mode 100644 index 34d2e4d2dad..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfigTest.java b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfigTest.java deleted file mode 100644 index 52376649125..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfigTest.java +++ /dev/null @@ -1,163 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.client.demo.config; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import org.eclipse.osee.ats.client.demo.DemoCISBuilds; -import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.junit.Assert; -import org.junit.BeforeClass; - -/** - * Test unit for {@link DemoDatabaseConfig} - * - * @author Donald G. Dunne - */ -public class DemoDatabaseConfigTest { - - @BeforeClass - public static void validateDbInit() throws OseeCoreException { - DemoDbUtil.checkDbInitAndPopulateSuccess(); - } - - @org.junit.Test - public void test_SAW_Bld_1__creation() throws OseeCoreException { - Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid()); - Assert.assertNotNull(branch); - Artifact programRoot = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch); - Assert.assertNotNull(programRoot); - - Assert.assertEquals(8, programRoot.getChildren().size()); - List<String> topFolders = new ArrayList<String>(); - topFolders.addAll(Arrays.asList("Hardware Requirements", "Integration Tests", "SAW Product Decomposition", - "Software Requirements", "Subsystem Requirements", "System Requirements", "Validation Tests", - "Verification Tests")); - - for (Artifact child : programRoot.getChildren()) { - if (child.getName().equals("Integration Tests")) { - Assert.assertEquals(3, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Hardware Requirements")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("SAW Product Decomposition")) { - Assert.assertEquals(14, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Software Requirements")) { - Assert.assertEquals(1, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Subsystem Requirements")) { - Assert.assertEquals(1, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("System Requirements")) { - Assert.assertEquals(6, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Validation Tests")) { - Assert.assertEquals(3, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Verification Tests")) { - Assert.assertEquals(3, child.getChildren().size()); - topFolders.remove(child.getName()); - } - } - - Assert.assertEquals(String.format("All top folders not created; missing [%s]", topFolders), 0, topFolders.size()); - } - - @org.junit.Test - public void test_SAW_Bld_1__SoftwareRequirementImport() throws OseeCoreException { - Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid()); - Assert.assertNotNull(branch); - - Collection<Artifact> artifacts = - ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirement, branch); - Assert.assertEquals(67, artifacts.size()); - - artifacts = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch); - Assert.assertEquals(59, artifacts.size()); - - artifacts = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SoftwareRequirement, branch); - Assert.assertEquals(24, artifacts.size()); - - } - - @org.junit.Test - public void test_CIS_Bld_1__creation() throws OseeCoreException { - Branch branch = BranchManager.getBranchByGuid(DemoCISBuilds.CIS_Bld_1.getGuid()); - Assert.assertNotNull(branch); - Artifact programRoot = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch); - Assert.assertNotNull(programRoot); - - Assert.assertEquals(8, programRoot.getChildren().size()); - List<String> topFolders = new ArrayList<String>(); - topFolders.addAll(Arrays.asList("Hardware Requirements", "Integration Tests", "SAW Product Decomposition", - "Software Requirements", "Subsystem Requirements", "System Requirements", "Validation Tests", - "Verification Tests")); - - for (Artifact child : programRoot.getChildren()) { - if (child.getName().equals("Integration Tests")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Hardware Requirements")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("SAW Product Decomposition")) { - Assert.assertEquals(14, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Software Requirements")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Subsystem Requirements")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("System Requirements")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Validation Tests")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } else if (child.getName().equals("Verification Tests")) { - Assert.assertEquals(0, child.getChildren().size()); - topFolders.remove(child.getName()); - } - } - - Assert.assertEquals(String.format("All top folders not created; missing [%s]", topFolders), 0, topFolders.size()); - } - - @org.junit.Test - public void test_CIS_Bld_1__SoftwareRequirementImport() throws OseeCoreException { - Branch branch = BranchManager.getBranchByGuid(DemoCISBuilds.CIS_Bld_1.getGuid()); - Assert.assertNotNull(branch); - - Collection<Artifact> artifacts = - ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirement, branch); - Assert.assertEquals(0, artifacts.size()); - - artifacts = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch); - Assert.assertEquals(0, artifacts.size()); - - artifacts = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SoftwareRequirement, branch); - Assert.assertEquals(0, artifacts.size()); - - } - -} diff --git a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF index 2e96c3060ee..6c0b215030a 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Demo Plug-in +Bundle-Name: ATS Client Demo (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.client.demo;singleton:=true Bundle-Version: 0.11.0.qualifier Eclipse-ExtensibleAPI: true diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoActionableItems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoActionableItems.java index c3c4c7a80d2..376e9d3c610 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoActionableItems.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoActionableItems.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoArtifactTypes.java index c2f5e9351de..d2d6c5ae45f 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoArtifactTypes.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.TokenFactory; diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoChoice.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoChoice.java new file mode 100644 index 00000000000..2ece9cedf43 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoChoice.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.demo; + +import org.eclipse.osee.framework.database.init.IDbInitChoiceEnum; + +/** + * @author Roberto E. Escobar + */ +public enum DemoChoice implements IDbInitChoiceEnum { + + ATS_CLIENT_DEMO; + +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsUserCommunity.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoGroups.java index e97e22d6ba3..797a0c61ad2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsUserCommunity.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoGroups.java @@ -8,15 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.navigate; +package org.eclipse.osee.ats.client.demo; /** * @author Donald G. Dunne */ -public enum AtsUserCommunity { - Program_1, - Program_2, - Tools, - Processes, - Other; +public class DemoGroups { + + private DemoGroups() { + // Constants class + } + + public static String TEST_GROUP_NAME = "Test Group"; + } diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java index 5ab7e7aeb70..833a17da273 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoTeam.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java index 074d9078176..c2304c4c0c1 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoTeam.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; /** * Convenience method for demo plugin to retrieve configured teams for use mostly in DemoNavigateViewItem. diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUsers.java index bd7c33be0aa..414c53fc37a 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUsers.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; import java.util.Arrays; import java.util.List; diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java new file mode 100644 index 00000000000..2533be51866 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.demo; + +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.database.core.OseeInfo; + +public class DemoUtil { + + private DemoUtil() { + // Utility class + } + + public static void checkDbInitSuccess() throws OseeCoreException { + if (!isDbInitSuccessful()) { + throw new OseeStateException("DbInit must be successful to continue"); + } + } + + public static void checkDbInitAndPopulateSuccess() throws OseeCoreException { + if (!isDbInitSuccessful()) { + throw new OseeStateException("DbInit must be successful to continue"); + } + if (!isPopulateDbSuccessful()) { + throw new OseeStateException("PopulateDb must be successful to continue"); + } + } + + public static boolean isDbInitSuccessful() throws OseeCoreException { + return OseeInfo.isBoolean("DbInitSuccess"); + } + + public static void setDbInitSuccessful(boolean success) throws OseeCoreException { + OseeInfo.setBoolean("DbInitSuccess", success); + } + + public static boolean isPopulateDbSuccessful() throws OseeCoreException { + return OseeInfo.isBoolean("PopulateSuccessful"); + } + + public static void setPopulateDbSuccessful(boolean success) throws OseeCoreException { + OseeInfo.setBoolean("PopulateSuccessful", success); + } +} diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoWorkType.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoWorkType.java index 33203dc6fcd..841cef0c53d 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoWorkType.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoWorkType.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.support.test.util; +package org.eclipse.osee.ats.client.demo; /** * Declares the different work types for Widget_A and Widget_B diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java index 8068e96edfc..83dff9800b5 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java @@ -87,8 +87,6 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationFactory; import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationParameter; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; -import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.eclipse.osee.support.test.util.TestUtil; /** diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java index c151a126270..9e45e6ced25 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java @@ -51,7 +51,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoSawBuilds; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java index fcdfd211837..3091579fb04 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.demo.artifact; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; import org.eclipse.osee.ats.client.demo.util.DemoImage; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java index 60ad3b30252..38e12268746 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java @@ -16,13 +16,13 @@ import org.eclipse.osee.ats.actions.wizard.TeamWorkflowProviderAdapter; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java index 4abffadc5d8..ed07a9624f4 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.demo.config; +import org.eclipse.osee.ats.client.demo.DemoChoice; import org.eclipse.osee.framework.database.init.DatabaseInitConfiguration; import org.eclipse.osee.framework.database.init.DefaultOseeTypeDefinitions; import org.eclipse.osee.framework.database.init.IAddDbInitChoice; @@ -33,10 +34,10 @@ public class AddDbInitDemoChoice implements IAddDbInitChoice { config.addTask("org.eclipse.osee.ats.AtsDatabaseConfig"); config.addTask("org.eclipse.osee.ats.client.demo.DemoDatabaseConfig"); - for (DefaultOseeTypeDefinitions types : DefaultOseeTypeDefinitions.values()) { - config.addOseeType(types); - } + config.addOseeType(DefaultOseeTypeDefinitions.OSEE_BASE_TYPES); + config.addOseeType(DefaultOseeTypeDefinitions.DEFINE_TYPES); + config.addOseeType(DefaultOseeTypeDefinitions.ATS_TYPES); config.addOseeType("org.eclipse.osee.ats.client.demo.OseeTypes_Demo"); - groupSelection.addChoice("OSEE Demo Database", config); + groupSelection.addChoice(DemoChoice.ATS_CLIENT_DEMO, config); } } diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java index 6888a14b09e..b9fb6fe0d85 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ats.client.demo.config; import java.util.ArrayList; import java.util.List; +import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.core.client.util.AtsGroup; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -22,7 +23,6 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoUsers; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java index 064ecc4ebb1..12adc380175 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java @@ -11,7 +11,9 @@ package org.eclipse.osee.ats.client.demo.config; import org.eclipse.osee.ats.client.demo.DemoCISBuilds; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoSubsystems; +import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.core.client.util.AtsGroup; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -23,8 +25,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.utility.Requirements; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoUsers; import org.eclipse.osee.support.test.util.TestUtil; /** diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java index 3883bcd99bf..0b4aeacf0d2 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoGroups; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -30,7 +31,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; * @author Donald G. Dunne */ public class DemoDbGroups { - public static String TEST_GROUP_NAME = "Test Group"; public static List<TeamWorkFlowArtifact> createGroups(boolean DEBUG) throws Exception { @@ -42,7 +42,7 @@ public class DemoDbGroups { if (DEBUG) { OseeLog.log(Activator.class, Level.INFO, "Create Groups and add objects"); } - Artifact groupArt = UniversalGroup.addGroup(TEST_GROUP_NAME, AtsUtil.getAtsBranch(), transaction); + Artifact groupArt = UniversalGroup.addGroup(DemoGroups.TEST_GROUP_NAME, AtsUtil.getAtsBranch(), transaction); for (TeamWorkFlowArtifact codeArt : DemoDbUtil.getSampleCodeWorkflows()) { // Add Action to Universal Group diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java index 86997074936..1b73ef38e52 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java @@ -16,6 +16,8 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; @@ -40,8 +42,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; -import org.eclipse.osee.support.test.util.DemoUsers; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java index 236f73b3a29..ff9e0e2b06e 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java @@ -17,6 +17,7 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -25,7 +26,6 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoUsers; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java index a978237678f..0c65d5cc0c8 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.ActionableItems; @@ -28,17 +29,14 @@ import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; -import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; /** * @author Donald G. Dunne @@ -48,37 +46,6 @@ public class DemoDbUtil { public static String INTERFACE_INITIALIZATION = "Interface Initialization"; private static List<TeamWorkFlowArtifact> codeArts; - public static void checkDbInitSuccess() throws OseeCoreException { - if (!isDbInitSuccessful()) { - throw new OseeStateException("DbInit must be successful to continue"); - } - } - - public static void checkDbInitAndPopulateSuccess() throws OseeCoreException { - if (!isDbInitSuccessful()) { - throw new OseeStateException("DbInit must be successful to continue"); - } - if (!isPopulateDbSuccessful()) { - throw new OseeStateException("PopulateDb must be successful to continue"); - } - } - - public static boolean isDbInitSuccessful() throws OseeCoreException { - return OseeInfo.isBoolean("DbInitSuccess"); - } - - public static void setDbInitSuccessful(boolean success) throws OseeCoreException { - OseeInfo.setBoolean("DbInitSuccess", success); - } - - public static boolean isPopulateDbSuccessful() throws OseeCoreException { - return OseeInfo.isBoolean("PopulateSuccessful"); - } - - public static void setPopulateDbSuccessful(boolean success) throws OseeCoreException { - OseeInfo.setBoolean("PopulateSuccessful", success); - } - public static List<TeamWorkFlowArtifact> getSampleCodeWorkflows() throws OseeCoreException { if (codeArts == null) { codeArts = new ArrayList<TeamWorkFlowArtifact>(); diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java index b7ee4b11973..017bf06ca0f 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.demo.DemoTeam; import org.eclipse.osee.ats.client.demo.PopulateDemoActions; import org.eclipse.osee.ats.client.demo.internal.Activator; import org.eclipse.osee.ats.config.ValidateAtsConfiguration; @@ -42,7 +43,6 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemFolder; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateUrlItem; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.support.test.util.DemoTeam; /** * Provides the ATS Navigator items for the sample XYZ company's teams diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/.classpath b/plugins/org.eclipse.osee.ats.client.integration.tests/.classpath index ad32c83a788..ad32c83a788 100644 --- a/plugins/org.eclipse.osee.ats.client.demo.test/.classpath +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/.classpath diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/.gitignore b/plugins/org.eclipse.osee.ats.client.integration.tests/.gitignore new file mode 100644 index 00000000000..da2a95a91af --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/.gitignore @@ -0,0 +1 @@ +/Rerun*.launch diff --git a/plugins/org.eclipse.osee.ats.test/.pmd b/plugins/org.eclipse.osee.ats.client.integration.tests/.pmd index c7b0a9fb3f5..c7b0a9fb3f5 100644 --- a/plugins/org.eclipse.osee.ats.test/.pmd +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/.pmd diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/.project b/plugins/org.eclipse.osee.ats.client.integration.tests/.project index 6ac49e75033..c11a5f51726 100644 --- a/plugins/org.eclipse.osee.ats.client.demo.test/.project +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.osee.ats.client.demo.test</name> + <name>org.eclipse.osee.ats.client.integration.tests</name> <comment></comment> <projects> </projects> diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch b/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch new file mode 100644 index 00000000000..34a308e1e74 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<setAttribute key="additional_plugins"> +<setEntry value="org.eclipse.core.runtime.compatibility:3.2.100.v20100505:default:true"/> +<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.11.0.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:false"/> +<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:false"/> +</setAttribute> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="false"/> +<booleanAttribute key="automaticValidate" value="true"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="featureDefaultLocation" value="workspace"/> +<stringAttribute key="featurePluginResolution" value="workspace"/> +<booleanAttribute key="includeOptional" value="false"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-atsTest"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/AtsClientIntegrationTestSuite.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.ats.client.integration.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -DeventDebug=log -DeventSystem=new -Dosee.is.in.db.init=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<setAttribute key="selected_features"> +<setEntry value="org.eclipse.osee.ats.client.demo.feature:default"/> +<setEntry value="org.eclipse.osee.ats.feature:default"/> +<setEntry value="org.eclipse.osee.client.demo.feature:default"/> +<setEntry value="org.eclipse.osee.client.feature:default"/> +<setEntry value="org.eclipse.osee.core.feature:default"/> +<setEntry value="org.eclipse.osee.core.plugin.feature:default"/> +<setEntry value="org.eclipse.osee.core.runtime.feature:default"/> +<setEntry value="org.eclipse.osee.core.ui.feature:default"/> +<setEntry value="org.eclipse.osee.define.feature:default"/> +<setEntry value="org.eclipse.osee.external.feature:default"/> +<setEntry value="org.eclipse.osee.framework.feature:default"/> +<setEntry value="org.eclipse.osee.framework.ui.feature:default"/> +<setEntry value="org.eclipse.sdk:default"/> +</setAttribute> +<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.collect@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.el@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.jasper@default:default,org.apache.log4j@default:default,org.apache.lucene*1.9.1.v201101211617@default:default,org.apache.lucene*2.9.1.v201101211721@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core.win32@default:false,org.eclipse.update.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.mockito@default:default,org.objenesis@default:default"/> +<booleanAttribute key="show_selected_only" value="true"/> +<stringAttribute key="timestamp" value="1354263054730"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..b57bbcc0d14 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF @@ -0,0 +1,43 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: ATS Client Integration Tests (Incubation) +Bundle-SymbolicName: org.eclipse.osee.ats.client.integration.tests +Bundle-Version: 0.11.0.qualifier +Bundle-Vendor: Eclipse Open System Engineering Environment +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.junit, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.eclipse.ui, + org.eclipse.ui.forms, + org.eclipse.osee.ats, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.core, + org.eclipse.osee.ats.core.client, + org.eclipse.osee.support.test.util, + org.eclipse.osee.framework.ui.skynet, + org.eclipse.osee.framework.skynet.core +Import-Package: org.eclipse.nebula.widgets.xviewer, + org.eclipse.nebula.widgets.xviewer.customize, + org.eclipse.nebula.widgets.xviewer.customize.dialog, + org.eclipse.osee.ats.client.demo, + org.eclipse.osee.ats.mocks, + org.eclipse.osee.framework.core.client, + org.eclipse.osee.framework.core.data, + org.eclipse.osee.framework.core.dsl.integration, + org.eclipse.osee.framework.core.enums, + org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, + org.eclipse.osee.framework.core.model.cache, + org.eclipse.osee.framework.core.operation, + org.eclipse.osee.framework.core.util, + org.eclipse.osee.framework.database.core, + org.eclipse.osee.framework.database.init, + org.eclipse.osee.framework.jdk.core.type, + org.eclipse.osee.framework.jdk.core.util, + org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.ui.plugin, + org.eclipse.osee.framework.ui.plugin.util, + org.eclipse.osee.framework.ui.plugin.xnavigate, + org.eclipse.osee.framework.ui.swt, + org.osgi.framework diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/build.properties b/plugins/org.eclipse.osee.ats.client.integration.tests/build.properties new file mode 100644 index 00000000000..125e3fcfbe7 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/build.properties @@ -0,0 +1,16 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . +additional.bundles = org.eclipse.osee.ats.mocks,\ + org.eclipse.osee.ats.client.demo,\ + org.eclipse.osee.framework.jdk.core,\ + org.eclipse.osee.framework.logging,\ + org.eclipse.osee.framework.core,\ + org.eclipse.osee.framework.core.model,\ + org.eclipse.osee.framework.database,\ + org.eclipse.osee.framework.ui.plugin,\ + org.eclipse.nebula.widgets.xviewer,\ + org.eclipse.osee.framework.ui.swt,\ + org.eclipse.osee.framework.core.client,\ + org.eclipse.osee.framework.database.init diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml new file mode 100644 index 00000000000..925057f12cc --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml @@ -0,0 +1,29 @@ +<configuration debug="true"> + <!-- See documentation at http://logback.qos.ch/manual/joran.html --> + + <!-- To select this configuration add -Dlogback.configurationFile=logback-test.xml --> + <!-- Set attribute debug="true" to configuration xml element to trace logback configuration --> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder + by default --> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + </pattern> + </encoder> + </appender> + + <!-- Configure OSEE log messages --> + <!-- <logger name="org.eclipse.osee.orcs.db" level="TRACE" /> --> + <!-- <logger name="org.eclipse.osee.database" level="TRACE" /> --> + <!-- <logger name="org.eclipse.osee.orcs.core" level="TRACE" /> --> + <logger name="org.eclipse.osee" level="WARN" /> + <!-- <logger name="org.eclipse.osee.framework.core.server" level="INFO" />--> + + <!-- Vaadin Servlet URL Requests --> + <!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> --> + + <root level="WARN"> + <appender-ref ref="STDOUT" /> + </root> +</configuration>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml new file mode 100644 index 00000000000..61d7d5c9a05 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml @@ -0,0 +1,157 @@ +<?xml version="1.0"?> +<project name="Test OSEE Application Server Launcher" default="run" basedir="."> + + <!-- + ${extraVMargs} + + $xserver-db-home + $xserver-db-name=psql.osee.eclipse.org \ + $xserver-db-username=osee.eclipse \ + $xserver-db-password=osee.eclipse \ + $xserver-db-address=127.0.0.1 \ + $xserver-db-port=1623 \ + $xserver-db-web-port=1623 \ + $xserver-db-type=H2,PGSQL \ + + ${xserver-authentication} + ${xserver-data} + ${xserver-home} + ${xserver-port} + ${xserver-telnet-port} + ${xserver-log-config} + --> + + <target name="init"> + <echo message="extraVMargs: [${extraVMargs}]" /> + + <for param="argline" delimiter=" -D" list="${extraVMargs}" trim="true"> + <sequential> + <propertyregex property="argName" override="true" input="@{argline}" regexp="(.*?)=" select="\1" casesensitive="false" /> + <propertyregex property="argValue" override="true" input="@{argline}" regexp="=(.*)" select="\1" casesensitive="false" /> + <echo message="Found arg - [${argName}]=[${argValue}]" /> + <property name="${argName}" value="${argValue}" /> + </sequential> + </for> + + <property name="osee.app.server.connectionFile" value="${xserver-data}/test.osee.client.db.connection.xml" /> + <property name="osee.app.server.connectionId" value="test.osee.client.db.connection.id" /> + + <echo message="Osee Application Server Home: [${xserver-home}]" /> + <echo message="Osee Application Server Port: [${xserver-port}]" /> + <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> + <echo message="Osee Application Server Db Type: [${xserver-db-type}]" /> + </target> + + <target name="writeH2ConnectionFile" depends="init"> + <writeConnectionFile dbType="h2" dbHome="${xserver-db-home}" dbPrefix="jdbc:h2" dbDriver="h2.db.connection" dbName="${xserver-db-name}" dbUser="${xserver-db-username}" dbPasswd="${xserver-db-password}" dbAddress="${xserver-db-address}" dbPort="${xserver-db-port}" connectionFilePath="${osee.app.server.connectionFile}" connectionid="${osee.app.server.connectionId}" /> + </target> + + <target name="run" depends="init,writeH2ConnectionFile,startServer" /> + + <target name="startServer"> + <pathconvert property="launcherJarPath" setonempty="false"> + <path> + <fileset dir="${xserver-home}/plugins"> + <include name="org.eclipse.equinox.launcher_*.jar" /> + </fileset> + </path> + </pathconvert> + + <mkdir dir="${xserver-data}" /> + + <forget> + <echo message="Launching Osee Application Server..." /> + <!-- Test Should Complete in 30 mins (timeout vale) - currently, they only take ~13 mins --> + <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="true"> + <classpath> + <fileset dir="${xserver-home}/plugins" includes="org.eclipse.equinox.launcher_*.jar" /> + <pathelement location="${xserver-home}/plugins" /> + </classpath> + <sysproperty key="osee.log.default" value="INFO" /> + <sysproperty key="osee.check.tag.queue.on.startup" value="false" /> + <sysproperty key="osgi.noShutdown" value="true" /> + <sysproperty key="org.osgi.service.http.port" value="${xserver-port}" /> + <sysproperty key="osee.db.connection.id" value="${osee.app.server.connectionId}" /> + <sysproperty key="osee.connection.info.uri" value="${osee.app.server.connectionFile}" /> + <sysproperty key="osee.application.server.data" value="${xserver-data}" /> + <sysproperty key="osee.authentication.protocol" value="${xserver-authentication}" /> + <sysproperty key="osee.connection.info.uri" value="${osee.app.server.connectionFile}" /> + <sysproperty key="osee.db.embedded.server" value="${xserver-db-address}:${xserver-db-port}" /> + <sysproperty key="osee.db.embedded.web.server.port" value="${xserver-db-web-port}" /> + <sysproperty key="logback.configurationFile" value="${xserver-log-config}" /> + <sysproperty key="osgi.configuration.area" value="${xserver-data}/configuration" /> + + <jvmarg line="${additionalJvmArgs}" /> + <arg line=" -console ${xserver-telnet-port} -consoleLog -configuration "${xserver-home}/configuration"" /> + </java> + </forget> + + <waitfor maxwait="20" maxwaitunit="second" checkevery="100" checkeveryunit="millisecond"> + <http url="http://127.0.0.1:${xserver-port}/osee/configure/datastore/schema" /> + </waitfor> + </target> + + <target name="stopServer"> + <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> + <telnet server="localhost" port="${xserver-telnet-port}" initialCR="yes" timeout="1000"> + <read>osgi></read> + <write>close</write> + </telnet> + <sleep milliseconds="500" /> + + <!-- <echo message="Osee Application Server Port: [${xserver-port}]" /> + <post to="http://127.0.0.1:${xserver-port}/osee/console?cmd=osee&args=server_shutdown" verbose="true" wantresponse="true" property="shutdownOutput" /> + <echo message="${shutdownOutput}" /> + --> + </target> + + <macrodef name="writeConnectionFile"> + <attribute name="dbHome" /> + <attribute name="dbName" /> + <attribute name="dbUser" /> + <attribute name="dbPasswd" /> + <attribute name="dbType" /> + <attribute name="dbPrefix" /> + <attribute name="dbDriver" /> + <attribute name="dbAddress" /> + <attribute name="dbPort" /> + <attribute name="connectionId" /> + <attribute name="connectionFilePath" /> + <sequential> + <echo message="Writing [@{dbType}] Db Connection File" /> + <echo file="@{connectionFilePath}"> + <DbConnection> + <DatabaseInfo id="db.connection.info">${line.separator} + <DatabaseHome key="#DBHOME#" value="@{dbHome}" />${line.separator} + <DatabaseName key="#DBNAME#" value="@{dbName}" />${line.separator} + <DatabaseType key="#TYPE#" value="@{dbType}" />${line.separator} + <Prefix key="#PREFIX#" value="@{dbPrefix}" />${line.separator} + <UserName key="#USERNAME#" value="@{dbUser}" />${line.separator} + <Password key="#PASSWORD#" value="@{dbPasswd}" />${line.separator} + <Host key="#HOST#" value="@AvailableDbServices.hostAddress" />${line.separator} + <Port key="#PORT#" value="@AvailableDbServices.port" />${line.separator} + </DatabaseInfo>${line.separator} + ${line.separator} + <ConnectionDescription id="h2.db.connection">${line.separator} + <Driver>org.h2.Driver</Driver>${line.separator} + <Url>#PREFIX#:tcp://#HOST#:#PORT#/#DBHOME##DBNAME#;IGNORECASE=TRUE;SCHEMA_SEARCH_PATH=@{dbUser}, PUBLIC;MVCC=TRUE</Url>${line.separator} + </ConnectionDescription>${line.separator} + ${line.separator} + <ConnectionDescription id="postgresql.db.connection">${line.separator} + <Driver>org.postgresql.Driver</Driver>${line.separator} + <Url>#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#</Url>${line.separator} + </ConnectionDescription>${line.separator} + ${line.separator} + </echo> + + <echo file="@{connectionFilePath}" append="true"> + ${line.separator}${line.separator} + <AvailableDbServices>${line.separator} + <Server id="@{connectionId}" dbInfo="db.connection.info" connectsWith="@{dbDriver}" hostAddress="@{dbAddress}" port="@{dbPort}" />${line.separator} + </AvailableDbServices>${line.separator} + </DbConnection> + </echo> + </sequential> + </macrodef> + +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml new file mode 100644 index 00000000000..8a554381a06 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml @@ -0,0 +1,203 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.ats.parent</artifactId> + <version>0.11.0-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.ats.client.integration.tests</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>OSEE ATS Client Integration Tests (Incubation)</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.osee.ats.client.integration.tests</testSuite> + <testClass>org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite</testClass> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <showEclipseLog>true</showEclipseLog> + <product>org.eclipse.osee.framework.ui.product.osee</product> + <application>org.eclipse.ui.ide.workbench</application> + <argLine>-Xmx1024M -XX:MaxPermSize=256m</argLine> + <appArgLine>-consoleLog</appArgLine> + <systemProperties combine.children="append"> + <osee.log.default>WARNING</osee.log.default> + <eventDebug>log</eventDebug> + <eventSystem>new</eventSystem> + <osee.is.in.db.init>true</osee.is.in.db.init> + <osee.application.server>http://localhost:${ats-server-port}</osee.application.server> + </systemProperties> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + <dependencies> + <dependency> + <type>eclipse-feature</type> + <artifactId>org.eclipse.osee.ats.feature</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>eclipse-feature</type> + <artifactId>org.eclipse.osee.ats.client.demo.feature</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>eclipse-feature</type> + <artifactId>org.eclipse.sdk</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>ats-client-int-test-debug</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <ats-int-test-debug-port>9009</ats-int-test-debug-port> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <debugPort>${ats-int-test-debug-port}</debugPort> + <!-- <systemProperties combine.children="append"> <equinox.ds.debug>true</equinox.ds.debug> + </systemProperties> --> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>ats-client-int-test-remote-server</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <ats-server-port>8089</ats-server-port> + </properties> + </profile> + <profile> + <id>ats-client-int-test-local-server</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${build-helper-maven-plugin-version}</version> + <executions> + <execution> + <id>ats-reserve-ports</id> + <phase>pre-integration-test</phase> + <goals> + <goal>reserve-network-port</goal> + </goals> + <configuration> + <portNames> + <portName>ats-server-port</portName> + <portName>ats-server-db-port</portName> + <portName>ats-server-db-web-port</portName> + <portName>ats-server-telnet-port</portName> + </portNames> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-version}</version> + <executions> + <execution> + <id>ats-server-start</id> + <phase>pre-integration-test</phase> + <configuration> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <property name="xserver-project" + value="${project.basedir}/../org.eclipse.osee.x.server.p2" /> + <property name="xserver-home" value="${xserver-project}/target/server" /> + <property name="xserver-port" value="${ats-server-port}" /> + <property name="xserver-telnet-port" value="${ats-server-telnet-port}" /> + <property name="xserver-authentication" value="demo" /> + <property name="xserver-data" + value="${project.build.directory}/server-data" /> + <property name="xserver-log-config" value="${project.basedir}/logback-test.xml" /> + + <property name="xserver-db-home" value="target/server-data/" /> + <property name="xserver-db-name" value="osee-test-db" /> + <property name="xserver-db-username" value="osee" /> + <property name="xserver-db-password" value="osee" /> + <property name="xserver-db-address" value="127.0.0.1" /> + <property name="xserver-db-port" value="${ats-server-db-port}" /> + <property name="xserver-db-web-port" value="${ats-server-db-web-port}" /> + <property name="xserver-db-type" value="H2" /> + <property name="additionalJvmArgs" value=" " /> + + <property name="xserver-log-output" value="${xserver-data}/server-output.log" /> + + <mkdir dir="${xserver-data}" /> + <ant antfile="osee-application-server.xml" target="run" + inheritRefs="true" output="${xserver-log-output}" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>ats-server-stop</id> + <phase>post-integration-test</phase> + <configuration> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + <property name="xserver-port" value="${ats-server-port}" /> + <property name="xserver-telnet-port" value="${ats-server-telnet-port}" /> + + <ant antfile="osee-application-server.xml" target="stopServer" + inheritRefs="true" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/AtsClientIntegrationTestSuite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/AtsClientIntegrationTestSuite.java new file mode 100644 index 00000000000..9d7866915e4 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/AtsClientIntegrationTestSuite.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration; + +import org.eclipse.osee.ats.client.integration.tests.AtsTest_AllAts_Suite; +import org.eclipse.osee.ats.client.integration.tests.DemoDbPopulateSuite; +import org.eclipse.osee.ats.client.integration.tests.DirtyArtifactCacheTest; +import org.eclipse.osee.ats.client.integration.tests.util.DbInitTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + DbInitTest.class, + DemoDbPopulateSuite.class, + AtsTest_AllAts_Suite.class, + DirtyArtifactCacheTest.class}) +public class AtsClientIntegrationTestSuite { + // Test Suite +} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsTest_AllAts_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsTest_AllAts_Suite.java new file mode 100644 index 00000000000..73181527896 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsTest_AllAts_Suite.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.demo.DemoUtil; +import org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite; +import org.eclipse.osee.ats.client.integration.tests.ats.AtsTest_Ats_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsCoreClient_Suite; +import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.core.client.OseeClientSession; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.support.test.util.TestUtil; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsCoreClient_Suite.class, AtsTest_Ats_Suite.class}) +public class AtsTest_AllAts_Suite { + + @BeforeClass + public static void setUp() throws Exception { + DemoUtil.checkDbInitSuccess(); + System.out.println("\nBegin " + AtsClientIntegrationTestSuite.class.getSimpleName()); + OseeProperties.setIsInTest(true); + assertTrue("Demo Application Server must be running.", + ClientSessionManager.getAuthenticationProtocols().contains("demo")); + assertTrue("Client must authenticate using demo protocol", + ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + assertTrue("Should be run on demo database.", TestUtil.isDemoDb()); + + OseeClientSession session = ClientSessionManager.getSession(); + assertEquals("Must run populate as Joe Smith", DemoUsers.Joe_Smith.getUserId(), session.getUserId()); + assertEquals("Must run populate as Joe Smith", DemoUsers.Joe_Smith.getUserId(), UserManager.getUser().getUserId()); + + RenderingUtil.setPopupsAllowed(false); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsClientIntegrationTestSuite.class.getSimpleName() + "\n\n"); + } +} diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroupsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DemoDbGroupsTest.java index 3d21cc61d87..3702fa1aa6c 100644 --- a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroupsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DemoDbGroupsTest.java @@ -8,10 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.client.demo.config; +package org.eclipse.osee.ats.client.integration.tests; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoGroups; +import org.eclipse.osee.ats.client.demo.DemoUtil; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -19,28 +22,24 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Test; /** * @author Donald G. Dunne */ public class DemoDbGroupsTest { + @BeforeClass public static void validateDbInit() throws OseeCoreException { - DemoDbUtil.checkDbInitAndPopulateSuccess(); + DemoUtil.checkDbInitAndPopulateSuccess(); } - /** - * Test method for {@link DemoDbGroups}. - * - * @throws OseeCoreException - */ - @org.junit.Test + @Test public void testCreateGroups() throws OseeCoreException { Artifact groupArt = - ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.UniversalGroup, DemoDbGroups.TEST_GROUP_NAME, + ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.UniversalGroup, DemoGroups.TEST_GROUP_NAME, AtsUtil.getAtsBranchToken()); Assert.assertNotNull(groupArt); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DemoDbPopulateSuite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DemoDbPopulateSuite.java new file mode 100644 index 00000000000..a922e1e57cf --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DemoDbPopulateSuite.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2010 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests; + +import static org.junit.Assert.assertTrue; +import org.eclipse.osee.ats.client.demo.DemoUtil; +import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.support.test.util.TestUtil; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({PopulateDemoDatabaseTest.class, DemoDbGroupsTest.class, PopulateDemoActionsTest.class}) +/** + * @author Donald G. Dunne + */ +public class DemoDbPopulateSuite { + @BeforeClass + public static void setUp() throws Exception { + DemoUtil.checkDbInitSuccess(); + System.out.println("\nBegin " + DemoDbPopulateSuite.class.getSimpleName()); + OseeProperties.setIsInTest(true); + assertTrue("Demo Application Server must be running.", + ClientSessionManager.getAuthenticationProtocols().contains("demo")); + assertTrue("Client must authenticate using demo protocol", + ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + assertTrue("Should be run on demo database.", TestUtil.isDemoDb()); + + RenderingUtil.setPopupsAllowed(false); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + DemoDbPopulateSuite.class.getSimpleName() + "\n\n"); + } +} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java new file mode 100644 index 00000000000..6cf9e69011d --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests; + +import java.util.Collection; +import java.util.logging.Level; +import junit.framework.Assert; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; + +/** + * This test should be run as the last test of a suite to make sure that the ArtifactCache has no dirty artifacts. + * + * @author Donald G. Dunne + */ +public class DirtyArtifactCacheTest { + + @org.junit.Test + public void testArtifactCacheNotDirty() { + final Collection<Artifact> dirtyArtifacts = ArtifactCache.getDirtyArtifacts(); + for (Artifact artifact : dirtyArtifacts) { + OseeLog.logf(getClass(), Level.WARNING, "Name: %s Type: %s ", artifact.getName(), + artifact.getArtifactTypeName()); + } + Assert.assertTrue(String.format( + "After all tests are run, there should be no dirty artifacts in Artifact Cache; \n Found [%s]", + Artifacts.getNames(dirtyArtifacts)), dirtyArtifacts.isEmpty()); + } +} diff --git a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java index 710fb81cb80..4661a19d338 100644 --- a/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/PopulateDemoActionsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.client.demo; +package org.eclipse.osee.ats.client.integration.tests; import java.util.ArrayList; import java.util.Collection; @@ -17,7 +17,12 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.client.demo.config.DemoDbUtil; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.demo.DemoTeam; +import org.eclipse.osee.ats.client.demo.DemoUtil; +import org.eclipse.osee.ats.client.demo.PopulateDemoActions; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; @@ -33,13 +38,9 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoTeam; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -52,7 +53,7 @@ import org.junit.BeforeClass; public class PopulateDemoActionsTest { @BeforeClass public static void validateDbInit() throws OseeCoreException { - DemoDbUtil.checkDbInitAndPopulateSuccess(); + DemoUtil.checkDbInitAndPopulateSuccess(); } @Before diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java new file mode 100644 index 00000000000..00cd11ff8e3 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests; + +import static org.junit.Assert.assertTrue; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.demo.DemoUtil; +import org.eclipse.osee.ats.client.demo.PopulateDemoActions; +import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.core.client.OseeClientSession; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.jdk.core.util.Lib; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.junit.Assert; +import org.junit.BeforeClass; + +/** + * @author Donald G. Dunne + */ +public class PopulateDemoDatabaseTest { + + @BeforeClass + public static void setup() throws Exception { + if (!DemoUtil.isDbInitSuccessful()) { + throw new OseeStateException("DbInit must be successful to continue"); + } + OseeProperties.setIsInTest(true); + assertTrue("Demo Application Server must be running", + ClientSessionManager.getAuthenticationProtocols().contains("demo")); + RenderingUtil.setPopupsAllowed(false); + DemoUtil.setPopulateDbSuccessful(false); + } + + @org.junit.Test + public void testPopulateDemoDb() { + System.out.println("\nBegin Populate Demo DB..."); + try { + ClientSessionManager.releaseSession(); + // Re-authenticate so we can continue + OseeClientSession session = ClientSessionManager.getSession(); + UserManager.releaseUser(); + + Assert.assertEquals("Must run populate as Joe Smith", DemoUsers.Joe_Smith.getUserId(), session.getUserId()); + Assert.assertEquals("Must run populate as Joe Smith", DemoUsers.Joe_Smith.getUserId(), + UserManager.getUser().getUserId()); + + PopulateDemoActions populateDemoActions = new PopulateDemoActions(null); + populateDemoActions.run(false); + + DemoUtil.setPopulateDbSuccessful(true); + System.out.println("End Populate Demo DB...\n"); + } catch (Exception ex) { + Assert.fail(Lib.exceptionToString(ex)); + } + } + +} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/AtsTest_Ats_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/AtsTest_Ats_Suite.java new file mode 100644 index 00000000000..f69bde44f5e --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/AtsTest_Ats_Suite.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats; + +import org.eclipse.osee.ats.client.integration.tests.ats.access.AtsTest_Access_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.actions.AtsTest_Action_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.artifact.log.AtsTest_Log_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.column.AtsTest_Column_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.config.AtsTest_Config_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.editor.AtsTest_Editor_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.health.AtsTest_Health_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.navigate.AtsTest_Navigate_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.render.AtsTest_Renderer_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.review.AtsTest_Review_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.util.AtsTest_Util_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.workflow.AtsTest_Workflow_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.world.search.AtsTest_World_Search_Suite; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + AtsTest_Access_Suite.class, + AtsTest_Action_Suite.class, + AtsTest_Log_Suite.class, + AtsTest_Column_Suite.class, + AtsTest_Config_Suite.class, + AtsTest_Editor_Suite.class, + AtsTest_Health_Suite.class, + AtsTest_Navigate_Suite.class, + AtsTest_Renderer_Suite.class, + AtsTest_Review_Suite.class, + AtsTest_Util_Suite.class, + AtsTest_Workflow_Suite.class, + AtsTest_World_Search_Suite.class}) +public class AtsTest_Ats_Suite { + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Ats_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Ats_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/access/AtsBranchAccessManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java index 305f99d35d7..534b02c8595 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/access/AtsBranchAccessManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java @@ -8,34 +8,32 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.access; +package org.eclipse.osee.ats.client.integration.tests.ats.access; +import static java.lang.Thread.sleep; import java.util.Arrays; -import java.util.logging.Level; import junit.framework.Assert; +import org.eclipse.osee.ats.access.AtsBranchAccessManager; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.data.IAccessContextId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.OseeEventService; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoWorkType; -import org.eclipse.osee.support.test.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -134,9 +132,10 @@ public class AtsBranchAccessManagerTest { * {@link org.eclipse.osee.ats.access.AtsBranchAccessManager#handleArtifactEvent(org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent, org.eclipse.osee.framework.skynet.core.event.model.Sender)} * * @throws OseeCoreException + * @throws InterruptedException */ @Test - public void testGetContextIdBranch() throws OseeCoreException { + public void testGetContextIdBranch() throws Exception { AtsBranchAccessManager mgr = new AtsBranchAccessManager(getEventService()); TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements); @@ -151,11 +150,7 @@ public class AtsBranchAccessManagerTest { Arrays.asList(teamDefContextId1, teamDefContextId2)); teamDefArt.persist(getClass().getSimpleName()); - try { - TestUtil.sleep(1000); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } + sleep(1000); Assert.assertEquals(2, mgr.getContextId(teamArt.getWorkingBranch()).size()); @@ -166,11 +161,7 @@ public class AtsBranchAccessManagerTest { aiArt.setAttributeValues(CoreAttributeTypes.AccessContextId, Arrays.asList(aiContextId)); aiArt.persist(getClass().getSimpleName()); - try { - TestUtil.sleep(1000); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } + sleep(1000); Assert.assertEquals(1, mgr.getContextId(teamArt.getWorkingBranch()).size()); @@ -181,11 +172,7 @@ public class AtsBranchAccessManagerTest { Arrays.asList(teamContextId1, teamContextId2, teamContextId3)); teamArt.persist(getClass().getSimpleName()); - try { - TestUtil.sleep(1000); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } + sleep(1000); Assert.assertEquals(3, mgr.getContextId(teamArt.getWorkingBranch()).size()); @@ -196,7 +183,7 @@ public class AtsBranchAccessManagerTest { * */ @Test - public void testConvertAccessAttributeToGuid() throws OseeCoreException { + public void testConvertAccessAttributeToGuid() throws Exception { AtsBranchAccessManager mgr = new AtsBranchAccessManager(getEventService()); TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements); @@ -209,11 +196,7 @@ public class AtsBranchAccessManagerTest { teamDefArt.setAttributeValues(CoreAttributeTypes.AccessContextId, Arrays.asList(teamDefContextId1)); teamDefArt.persist(getClass().getSimpleName()); - try { - TestUtil.sleep(2000); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } + sleep(2000); Assert.assertEquals(1, mgr.getContextId(teamArt.getWorkingBranch()).size()); IAccessContextId contextId = mgr.getContextId(teamArt.getWorkingBranch()).iterator().next(); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsTest_Access_Suite.java index e4202d137d2..9cdef07b826 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsTest_Access_Suite.java @@ -8,10 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.access; -import org.eclipse.osee.ats.access.AtsBranchAccessManagerTest; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -23,16 +22,16 @@ import org.junit.runners.Suite; /** * @author Donald G. Dunne */ -public class AtsTest_Demo_Access_Suite { +public class AtsTest_Access_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsTest_Demo_Access_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Access_Suite.class.getSimpleName()); DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Access_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Access_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionPerspectiveTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionPerspectiveTest.java index 9459d507789..e77cf794a0c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionPerspectiveTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionPerspectiveTest.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionRunTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionRunTest.java index 74c9eb57a6d..60dffa983c6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionRunTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionRunTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.AbstractAtsAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java index 6e7b3ca9122..e342f34064e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AbstractAtsActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java @@ -3,11 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.AfterClass; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AccessControlActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AccessControlActionTest.java index 6823cc6e55a..9c173e165bd 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AccessControlActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AccessControlActionTest.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; @@ -11,8 +11,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.actions.AccessControlAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; @@ -36,7 +36,7 @@ public class AccessControlActionTest extends AbstractAtsActionTest { try { Thread.sleep(2000); } catch (InterruptedException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); + OseeLog.log(AccessControlActionTest.class, Level.SEVERE, ex); } Displays.ensureInDisplayThread(new Runnable() { diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AddNoteActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AddNoteActionTest.java index 692bc650b18..f7052d7d108 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AddNoteActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AddNoteActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.AddNoteAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java index 95c3dc9ee7d..4d7ba2e95b2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java @@ -8,9 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -23,7 +23,7 @@ import org.junit.runners.Suite; AddNoteActionTest.class, CopyActionDetailsActionTest.class, DeletePurgeAtsArtifactsActionTest.class, - DirtyReportActionTest.class, + DirtyReportActionTest1.class, DirtyReportActionTest2.class, DuplicateWorkflowActionTest.class, DuplicateWorkflowViaWorldEditorActionTest.class, @@ -37,13 +37,13 @@ import org.junit.runners.Suite; OpenChangeReportByIdActionTest.class, OpenInArtifactEditorActionTest.class, OpenInAtsWorkflowEditorActionTest.class, - OpenInSkyWalkerActionTest.class, - OpenInAtsWorldActionTest.class, + OpenInAtsWorldActionTest1.class, OpenInAtsWorldActionTest2.class, OpenInAtsWorldActionTest3.class, + OpenInSkyWalkerActionTest.class, OpenNewAtsTaskEditorActionTest.class, - OpenNewAtsWorldEditorActionTest.class, OpenNewAtsTaskEditorSelectedTest.class, + OpenNewAtsWorldEditorActionTest.class, OpenNewAtsWorldEditorSelectedActionTest.class, OpenParentActionTest.class, OpenReviewPerspectiveActionTest.class, @@ -61,16 +61,16 @@ import org.junit.runners.Suite; /** * @author Donald G. Dunne */ -public class AtsTest_Demo_Action_Suite { +public class AtsTest_Action_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsTest_Demo_Action_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Action_Suite.class.getSimpleName()); DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Action_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Action_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/CopyActionDetailsActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/CopyActionDetailsActionTest.java index a1a78211f8c..9786ad07bf3 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/CopyActionDetailsActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/CopyActionDetailsActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.CopyActionDetailsAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DeletePurgeAtsArtifactsActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DeletePurgeAtsArtifactsActionTest.java index c67972fe598..81d63e7daa0 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DeletePurgeAtsArtifactsActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DeletePurgeAtsArtifactsActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.DeletePurgeAtsArtifactsAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DirtyReportActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DirtyReportActionTest1.java index ec0874a16d5..f00427c6e57 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DirtyReportActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DirtyReportActionTest1.java @@ -3,9 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.DirtyReportAction; +import org.eclipse.osee.ats.actions.IDirtyReportable; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; import org.junit.Test; @@ -13,7 +15,7 @@ import org.junit.Test; /** * @author Donald G. Dunne */ -public class DirtyReportActionTest extends AbstractAtsActionTest { +public class DirtyReportActionTest1 extends AbstractAtsActionTest { @Test(expected = OseeStateException.class) public void test() throws Exception { diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DirtyReportActionTest2.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DirtyReportActionTest2.java index 81a1eb5a05a..7d085dbd51f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DirtyReportActionTest2.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DirtyReportActionTest2.java @@ -3,9 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.DirtyReportAction; +import org.eclipse.osee.ats.actions.IDirtyReportable; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.util.Result; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DuplicateWorkflowActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java index 2bd5c6d3d7e..9c236b9f232 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DuplicateWorkflowActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import java.util.Collections; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.DuplicateWorkflowAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DuplicateWorkflowViaWorldEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowViaWorldEditorActionTest.java index 5c6e87d4d07..decc55d7bd9 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/DuplicateWorkflowViaWorldEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowViaWorldEditorActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.DuplicateWorkflowViaWorldEditorAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.actions.SelectedAtsArtifactsAdapter; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java index c33503e36ca..25a956023f0 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java @@ -3,11 +3,12 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; +import org.eclipse.osee.ats.actions.FavoriteAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ImportTasksViaSimpleListTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ImportTasksViaSimpleListTest.java index 99d9c7cbb0f..c50f1be9954 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ImportTasksViaSimpleListTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ImportTasksViaSimpleListTest.java @@ -3,9 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ImportListener; +import org.eclipse.osee.ats.actions.ImportTasksViaSimpleList; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ImportTasksViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ImportTasksViaSpreadsheetTest.java index 7010b1a34b1..6d56293fdf1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ImportTasksViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ImportTasksViaSpreadsheetTest.java @@ -3,9 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ImportListener; +import org.eclipse.osee.ats.actions.ImportTasksViaSpreadsheet; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/MyFavoritesActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/MyFavoritesActionTest.java index dd012d5c490..ab0c1011071 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/MyFavoritesActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/MyFavoritesActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.MyFavoritesAction; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/MyWorldActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/MyWorldActionTest.java index 445a9952a8d..92acbc16eb2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/MyWorldActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/MyWorldActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.MyWorldAction; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/NewGoalTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java index 14c22224208..c6001ade970 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/NewGoalTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.NewGoal; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -23,7 +24,8 @@ public class NewGoalTest extends AbstractAtsActionRunTest { @BeforeClass @AfterClass public static void cleanup() throws OseeCoreException { - SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), NewGoalTest.class.getSimpleName()); + SkynetTransaction transaction = + TransactionManager.createTransaction(AtsUtil.getAtsBranch(), NewGoalTest.class.getSimpleName()); for (Artifact art : ArtifactQuery.getArtifactListFromName(NewGoalTest.class.getSimpleName(), AtsUtil.getAtsBranchToken(), DeletionFlag.EXCLUDE_DELETED)) { art.deleteAndPersist(transaction); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenAtsPerspectiveActionTest.java index e6e0cbc4750..89326265a5c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenAtsPerspectiveActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.OpenAtsPerspectiveAction; import org.eclipse.ui.IWorkbenchWindowActionDelegate; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java index 04f7be2f47d..1f9ee72582c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenChangeReportByIdAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInArtifactEditorActionTest.java index 59f307bd73c..a4c3d0dba59 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInArtifactEditorActionTest.java @@ -3,10 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; - -import org.eclipse.osee.ats.core.client.AtsTestUtil; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.OpenInArtifactEditorAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorkflowEditorActionTest.java index 0dd14f225d5..f748475ce64 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorkflowEditorActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenInAtsWorkflowEditorAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.editor.SMAEditor; import org.junit.After; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest1.java index 4f4529a15cc..6d53ebdb943 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest1.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.OpenInAtsWorldAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.junit.Test; @@ -14,7 +15,7 @@ import org.junit.Test; /** * @author Donald G. Dunne */ -public class OpenInAtsWorldActionTest extends AbstractAtsActionRunTest { +public class OpenInAtsWorldActionTest1 extends AbstractAtsActionRunTest { @Override public OpenInAtsWorldAction createAction() throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest2.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest2.java index 4779098ffa3..aefc01d9c8a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest2.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest2.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenInAtsWorldAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest3.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest3.java index 791b2d4491e..eaec96ff952 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorldActionTest3.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInAtsWorldActionTest3.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.OpenInAtsWorldAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInSkyWalkerActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInSkyWalkerActionTest.java index f81d4eafbcb..f3d18deec60 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInSkyWalkerActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenInSkyWalkerActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenInSkyWalkerAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsTaskEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java index c9873fd2186..ad2296dc0b1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsTaskEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java @@ -3,14 +3,15 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import java.util.Collection; import java.util.Collections; import org.eclipse.jface.action.Action; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; +import org.eclipse.osee.ats.actions.OpenNewAtsTaskEditorAction; import org.eclipse.osee.ats.actions.OpenNewAtsTaskEditorAction.IOpenNewAtsTaskEditorHandler; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.task.ITaskEditorProvider; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsTaskEditorSelectedTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorSelectedTest.java index 09bdcb6a97e..60dfac7c1b5 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsTaskEditorSelectedTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorSelectedTest.java @@ -3,13 +3,14 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import java.util.Arrays; import java.util.List; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; +import org.eclipse.osee.ats.actions.OpenNewAtsTaskEditorSelected; import org.eclipse.osee.ats.actions.OpenNewAtsTaskEditorSelected.IOpenNewAtsTaskEditorSelectedHandler; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java index 1df97298cd6..926acc3066a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; +import org.eclipse.osee.ats.actions.OpenNewAtsWorldEditorAction; import org.eclipse.osee.ats.actions.OpenNewAtsWorldEditorAction.IOpenNewAtsWorldEditorHandler; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.world.IWorldEditorProvider; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorSelectedActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorSelectedActionTest.java index 9fb99260448..444f1166557 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorSelectedActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorSelectedActionTest.java @@ -3,13 +3,14 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import java.util.Arrays; import java.util.List; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; +import org.eclipse.osee.ats.actions.OpenNewAtsWorldEditorSelectedAction; import org.eclipse.osee.ats.actions.OpenNewAtsWorldEditorSelectedAction.IOpenNewAtsWorldEditorSelectedHandler; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenParentActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenParentActionTest.java index 03010121c28..79fcf7aab8f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenParentActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenParentActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenParentAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenReviewPerspectiveActionTest.java index d06014edb09..c3792fbbc01 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenReviewPerspectiveActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.OpenReviewPerspectiveAction; import org.eclipse.ui.IWorkbenchWindowActionDelegate; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java index 268fd59d008..4edb073f7e7 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.jface.action.Action; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenWorkflowByIdAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenWorldByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java index 82e7d18f98a..df1b18f1ec6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenWorldByIdActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.OpenWorldByIdAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/RefreshDirtyActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/RefreshDirtyActionTest.java index cbe7633d100..4e7df831fc1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/RefreshDirtyActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/RefreshDirtyActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.RefreshDirtyAction; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ReloadActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ReloadActionTest.java index 41e96b40a84..13b0facb26d 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ReloadActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ReloadActionTest.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ReloadAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java index eecaa9ac2f5..57fb1d8a306 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java @@ -3,11 +3,12 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; +import org.eclipse.osee.ats.actions.ResourceHistoryAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java index e183db8fd06..3c47f34d7b1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowBranchChangeDataActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ShowBranchChangeDataAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowChangeReportActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java index 98ed3df65dc..5a277df1b27 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowChangeReportActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ShowChangeReportAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowMergeManagerActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java index 19e58624783..d2433e77231 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowMergeManagerActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java @@ -3,10 +3,11 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.actions.ShowMergeManagerAction; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowWorkDefinitionActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowWorkDefinitionActionTest.java index e7b9f5051d0..e3806d9af47 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ShowWorkDefinitionActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowWorkDefinitionActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.ShowWorkDefinitionAction; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java index 92342f79d14..aae1d8e921f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java @@ -3,11 +3,12 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; +import org.eclipse.osee.ats.actions.SubscribedAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/TaskAddActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/TaskAddActionTest.java index c61203f63e6..171159eb55e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/TaskAddActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/TaskAddActionTest.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.actions; +package org.eclipse.osee.ats.client.integration.tests.ats.actions; +import org.eclipse.osee.ats.actions.TaskAddAction; import org.eclipse.osee.ats.actions.TaskAddAction.ITaskAddActionHandler; /** diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/AtsLogTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/AtsLogTest.java index 9673e7cdf30..0ff02fe4dc2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/AtsLogTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/AtsLogTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.artifact.log; +package org.eclipse.osee.ats.client.integration.tests.ats.artifact.log; import java.util.Date; import org.eclipse.core.runtime.IStatus; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/AtsTest_Log_Suite.java index c8f26f4903c..62bcb154110 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/AtsTest_Log_Suite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2012 Boeing. * 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 @@ -8,29 +8,31 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.artifact.log; -import org.eclipse.osee.ats.util.AtsImageTest; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsImageTest.class}) /** - * @author Donald G. Dunne + * @author Roberto E. Escobar */ -public class AtsTest_Production_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsLogTest.class, LogItemTest.class}) +public class AtsTest_Log_Suite { + @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + Review_Demo_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Log_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + Review_Demo_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Log_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/LogItemTest.java index 3a4f95d5a90..f4ab0799ace 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/artifact/log/LogItemTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.artifact.log; +package org.eclipse.osee.ats.client.integration.tests.ats.artifact.log; import java.util.Date; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -56,8 +56,8 @@ public class LogItemTest { public void testLogItemStringStringStringStringStringString() throws OseeCoreException { Date date = new Date(); LogItem item = - new LogItem(LogType.Error.name(), String.valueOf(date.getTime()), AtsUsersClient.getUser().getUserId(), "Analyze", - "my msg", "ASDF4"); + new LogItem(LogType.Error.name(), String.valueOf(date.getTime()), AtsUsersClient.getUser().getUserId(), + "Analyze", "my msg", "ASDF4"); validateItem(item, date); } @@ -81,7 +81,8 @@ public class LogItemTest { Date date = new Date(); LogItem item = getTestLogItem(date); - Assert.assertEquals("NOTE (Error): my msg (" + AtsUsersClient.getUser().getName() + ")", item.toHTML(AHTML.LABEL_FONT)); + Assert.assertEquals("NOTE (Error): my msg (" + AtsUsersClient.getUser().getName() + ")", + item.toHTML(AHTML.LABEL_FONT)); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ActionableItemsColumnTest.java index 056fa4dcecd..39b7c287985 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ActionableItemsColumnTest.java @@ -8,15 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Collection; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.ActionableItemsColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/AssigneeColumnUITest.java index f9733d9ffed..fa33245e699 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/AssigneeColumnUITest.java @@ -8,15 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Arrays; import java.util.List; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.ActionableItemsColumn; +import org.eclipse.osee.ats.column.AssigneeColumnUI; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/AtsTest_Column_Suite.java index a23ce192464..b52568cc28f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/AtsTest_Column_Suite.java @@ -8,31 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import static org.junit.Assert.assertTrue; -import org.eclipse.osee.ats.column.ActionableItemsColumnTest; -import org.eclipse.osee.ats.column.BranchStatusColumnTest; -import org.eclipse.osee.ats.column.CancelledDateColumnTest; -import org.eclipse.osee.ats.column.CategoryColumnTest; -import org.eclipse.osee.ats.column.ChangeTypeColumnTest; -import org.eclipse.osee.ats.column.CompletedDateColumnTest; -import org.eclipse.osee.ats.column.CreatedDateColumnTest; -import org.eclipse.osee.ats.column.DeadlineColumnTest; -import org.eclipse.osee.ats.column.DescriptionColumnTest; -import org.eclipse.osee.ats.column.EstimatedHoursColumnTest; -import org.eclipse.osee.ats.column.GroupsColumnTest; -import org.eclipse.osee.ats.column.NumberOfTasksAndInWorkTasksColumnsTest; -import org.eclipse.osee.ats.column.OriginatorColumnTest; -import org.eclipse.osee.ats.column.ParentStateAndIdColumnTest; -import org.eclipse.osee.ats.column.PeerToPeerReviewColumnsTest; -import org.eclipse.osee.ats.column.PriorityColumnTest; -import org.eclipse.osee.ats.column.RelatedToStateColumnTest; -import org.eclipse.osee.ats.column.StateColumnTest; -import org.eclipse.osee.ats.column.TargetedVersionColumnTest; -import org.eclipse.osee.ats.column.TeamColumnTest; -import org.eclipse.osee.ats.column.TypeColumnTest; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -66,7 +45,7 @@ import org.junit.runners.Suite; /** * @author Donald G. Dunne */ -public class AtsTest_Demo_Column_Suite { +public class AtsTest_Column_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); @@ -74,12 +53,12 @@ public class AtsTest_Demo_Column_Suite { ClientSessionManager.getAuthenticationProtocols().contains("demo")); assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); - System.out.println("\n\nBegin " + AtsTest_Demo_Column_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Column_Suite.class.getSimpleName()); DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Column_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Column_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/BranchStatusColumnTest.java index 3cc18cca23c..98562fda044 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/BranchStatusColumnTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.BranchStatusColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CancelledDateColumnTest.java index 2619075dfd9..adfb3eec389 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CancelledDateColumnTest.java @@ -8,12 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Arrays; import java.util.Collections; import java.util.Date; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.CancelledDateColumn; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -22,7 +24,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; @@ -61,8 +62,8 @@ public class CancelledDateColumnTest { Assert.assertEquals("", CancelledDateColumn.getDateStr(teamArt)); TransitionHelper helper = - new TransitionHelper("Transition to Cancelled", Arrays.asList(teamArt), TeamState.Cancelled.getName(), - null, "reason", TransitionOption.OverrideTransitionValidityCheck, TransitionOption.OverrideAssigneeCheck); + new TransitionHelper("Transition to Cancelled", Arrays.asList(teamArt), TeamState.Cancelled.getName(), null, + "reason", TransitionOption.OverrideTransitionValidityCheck, TransitionOption.OverrideAssigneeCheck); TransitionManager transitionMgr = new TransitionManager(helper); TransitionResults results = transitionMgr.handleAll(); Assert.assertTrue(results.toString(), results.isEmpty()); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CategoryColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java index 5cf1858db11..52b2d3c6dc6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CategoryColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java @@ -8,18 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.CategoryColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ChangeTypeColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ChangeTypeColumnTest.java index 147b4e2d1f6..fbfa1804027 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ChangeTypeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ChangeTypeColumnTest.java @@ -8,17 +8,18 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CompletedDateColumnTest.java index e8bd83a8911..76118a19901 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CompletedDateColumnTest.java @@ -8,11 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Arrays; import java.util.Date; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.CompletedDateColumn; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -21,7 +23,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; @@ -60,8 +61,8 @@ public class CompletedDateColumnTest { Assert.assertEquals("", CompletedDateColumn.getDateStr(teamArt)); TransitionHelper helper = - new TransitionHelper("Transition to Completed", Arrays.asList(teamArt), TeamState.Completed.getName(), - null, null, TransitionOption.OverrideTransitionValidityCheck, TransitionOption.OverrideAssigneeCheck); + new TransitionHelper("Transition to Completed", Arrays.asList(teamArt), TeamState.Completed.getName(), null, + null, TransitionOption.OverrideTransitionValidityCheck, TransitionOption.OverrideAssigneeCheck); TransitionManager transitionMgr = new TransitionManager(helper); TransitionResults results = transitionMgr.handleAll(); Assert.assertTrue(results.toString(), results.isEmpty()); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CreatedDateColumnTest.java index fb8319bf8d6..2d608a12fb2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CreatedDateColumnTest.java @@ -8,15 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Date; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.CreatedDateColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DeadlineColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/DeadlineColumnTest.java index f5e932d3a10..554139e5812 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DeadlineColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/DeadlineColumnTest.java @@ -8,15 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Calendar; import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.DeadlineColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/DescriptionColumnTest.java index 421d5163441..1d4e29c1dd0 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/DescriptionColumnTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.DescriptionColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/EstimatedHoursColumnTest.java index ea31852f0a5..4afac0c97c9 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/EstimatedHoursColumnTest.java @@ -8,11 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; @@ -20,7 +21,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.EstimatedHoursUtil; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/GroupsColumnTest.java index 33c0e37995a..78b264b3acb 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/GroupsColumnTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.GroupsColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java index e659b245b8d..55ad70f6c4b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java @@ -8,22 +8,24 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Collection; import java.util.HashSet; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.NumberOfTasksColumn; +import org.eclipse.osee.ats.column.NumberOfTasksRemainingColumn; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/OriginatorColumnTest.java index 082fd0f0769..d9a68e8c8c3 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/OriginatorColumnTest.java @@ -8,15 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.OriginatorColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoUsers; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java index f4e534e0616..3c7f8d5408e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java @@ -8,16 +8,18 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.ParentHridColumn; +import org.eclipse.osee.ats.column.ParentStateColumn; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/PeerToPeerReviewColumnsTest.java index 7dc70ce0eff..d7df8490e80 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/PeerToPeerReviewColumnsTest.java @@ -8,12 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import java.util.Arrays; import java.util.Date; import java.util.List; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.ReviewAuthorColumn; +import org.eclipse.osee.ats.column.ReviewModeratorColumn; +import org.eclipse.osee.ats.column.ReviewNumIssuesColumn; +import org.eclipse.osee.ats.column.ReviewNumMajorDefectsColumn; +import org.eclipse.osee.ats.column.ReviewNumMinorDefectsColumn; +import org.eclipse.osee.ats.column.ReviewReviewerColumn; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem; @@ -27,11 +35,9 @@ import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoUsers; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/PriorityColumnTest.java index 8e4b65d9aec..6f8d47f4d2a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/PriorityColumnTest.java @@ -8,16 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.PriorityColumn; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/RelatedToStateColumnTest.java index 80157c9989e..b2e99fe625c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/RelatedToStateColumnTest.java @@ -8,16 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.RelatedToStateColumn; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/StateColumnTest.java index ccaf72c72d6..c05178e0e81 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/StateColumnTest.java @@ -8,14 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.StateColumn; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java index 7f669ad36ac..296f2b793f3 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java @@ -8,14 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.TargetedVersionColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TeamColumnTest.java index f0d22b2d2d4..3e43cfb36fd 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TeamColumnTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.TeamColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TypeColumnTest.java index 45267759d16..a71154e9c31 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TypeColumnTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.column; +package org.eclipse.osee.ats.client.integration.tests.ats.column; +import org.eclipse.osee.ats.client.demo.DemoWorkType; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.column.TypeColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java index 77fe3a95979..8977e1506a1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.config; +package org.eclipse.osee.ats.client.integration.tests.ats.config; import java.util.ArrayList; import java.util.Arrays; @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; +import org.eclipse.osee.ats.config.AtsConfigManager; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; @@ -37,7 +38,6 @@ import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.editor.SMAEditor; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IOseeBranch; @@ -106,14 +106,15 @@ public class AtsBranchConfigurationTest { public void testBranchViaVersions() throws Exception { SevereLoggingMonitor monitor = TestUtil.severeLoggingStart(); if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Running testBranchViaVersions..."); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Running testBranchViaVersions..."); } // Cleanup from previous run cleanupBranchTest(BRANCH_VIA_VERSIONS); if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, + "Configuring ATS for team org.branchTest.viaTeamDefs"); } // create team definition and actionable item @@ -125,7 +126,7 @@ public class AtsBranchConfigurationTest { // create main branch if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Creating root branch"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Creating root branch"); } // Create SAW_Bld_2 branch off SAW_Bld_1 Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_VERSIONS); @@ -134,7 +135,8 @@ public class AtsBranchConfigurationTest { // configure version to use branch and allow create/commit if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Configuring version to use branch and allow create/commit"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, + "Configuring version to use branch and allow create/commit"); } IAtsTeamDefinition teamDef = AtsConfigCache.instance.getSoleByName(BRANCH_VIA_VERSIONS.getName(), IAtsTeamDefinition.class); @@ -159,7 +161,8 @@ public class AtsBranchConfigurationTest { // create action and target for version if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Create new Action and target for version " + versionToTarget); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, + "Create new Action and target for version " + versionToTarget); } Collection<IAtsActionableItem> selectedActionableItems = @@ -181,7 +184,7 @@ public class AtsBranchConfigurationTest { // Transition to desired state if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Transitioning to Implement state"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Transitioning to Implement state"); } dtwm.transitionTo(TeamState.Implement, AtsUsersClient.getUser(), false, transaction); @@ -194,7 +197,7 @@ public class AtsBranchConfigurationTest { // make changes if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Make new requirement artifact"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Make new requirement artifact"); } Artifact rootArtifact = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(teamWf.getWorkingBranch()); Artifact blk3MainArt = @@ -210,7 +213,7 @@ public class AtsBranchConfigurationTest { // test change report if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Test change report results"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Test change report results"); } ChangeData changeData = AtsBranchManager.getChangeDataFromEarliestTransactionId(teamWf); Assert.assertFalse("No changes detected", changeData.isEmpty()); @@ -228,14 +231,15 @@ public class AtsBranchConfigurationTest { SevereLoggingMonitor monitor = TestUtil.severeLoggingStart(); if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Running testBranchViaTeamDefinition..."); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Running testBranchViaTeamDefinition..."); } // Cleanup from previous run cleanupBranchTest(BRANCH_VIA_TEAM_DEFINITION); if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, + "Configuring ATS for team org.branchTest.viaTeamDefs"); // create team definition and actionable item } @@ -247,7 +251,7 @@ public class AtsBranchConfigurationTest { // create main branch if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Creating root branch"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Creating root branch"); } // Create SAW_Bld_2 branch off SAW_Bld_1 Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_TEAM_DEFINITION); @@ -256,7 +260,8 @@ public class AtsBranchConfigurationTest { // configure team def to use branch if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Configuring team def to use branch and allow create/commit"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, + "Configuring team def to use branch and allow create/commit"); } IAtsTeamDefinition teamDef = AtsConfigCache.instance.getSoleByName(BRANCH_VIA_TEAM_DEFINITION.getName(), IAtsTeamDefinition.class); @@ -271,7 +276,7 @@ public class AtsBranchConfigurationTest { // create action, if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Create new Action"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Create new Action"); } Collection<IAtsActionableItem> selectedActionableItems = ActionableItems.getActionableItems(appendToName(BRANCH_VIA_TEAM_DEFINITION, "A1")); @@ -290,7 +295,7 @@ public class AtsBranchConfigurationTest { // Transition to desired state if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Transitioning to Implement state"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Transitioning to Implement state"); } dtwm.transitionTo(TeamState.Implement, AtsUsersClient.getUser(), false, transaction); teamWf.persist("Test branch via team definition: Transition to desired state"); @@ -300,7 +305,7 @@ public class AtsBranchConfigurationTest { // make changes if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Make new requirement artifact"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Make new requirement artifact"); } Artifact rootArtifact = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(teamWf.getWorkingBranch()); Artifact blk3MainArt = @@ -314,7 +319,7 @@ public class AtsBranchConfigurationTest { // test change report if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "Test change report results"); + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Test change report results"); } ChangeData changeData = AtsBranchManager.getChangeDataFromEarliestTransactionId(teamWf); Assert.assertTrue("No changes detected", !changeData.isEmpty()); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsTest_Config_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsTest_Config_Suite.java new file mode 100644 index 00000000000..0bacdbfc231 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsTest_Config_Suite.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.config; + +import org.eclipse.osee.ats.client.integration.tests.ats.config.copy.AtsTest_Demo_Copy_Suite; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsTest_Demo_Copy_Suite.class, AtsBranchConfigurationTest.class}) +/** + * This test suite contains test that can be run against any production db + * + * @author Donald G. Dunne + */ +public class AtsTest_Config_Suite { + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Config_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Config_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/AtsTest_Demo_Copy_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/AtsTest_Demo_Copy_Suite.java new file mode 100644 index 00000000000..672e3db7c37 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/AtsTest_Demo_Copy_Suite.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; + +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + ConfigDataTest.class, + CopyAtsConfigurationOperationTest.class, + CopyAtsUtilTest.class, + CopyAtsValidationTest.class}) +public class AtsTest_Demo_Copy_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Demo_Copy_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_Copy_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java index fcb1e19cbab..4401c003f1e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java @@ -8,17 +8,18 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.config.copy; +package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; import junit.framework.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoTeam; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.config.copy.ConfigData; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.util.XResultData; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoTeam; /** * Test case for {@link ConfigData} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java index 43eb6c6c1a3..f0075beec0f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.config.copy; +package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; import java.util.Collection; import java.util.HashSet; @@ -16,7 +16,9 @@ import java.util.Set; import junit.framework.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.config.copy.ConfigData; +import org.eclipse.osee.ats.config.copy.CopyAtsConfigurationOperation; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsUtilTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java index e31c02cdea8..537e0919ff6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsUtilTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java @@ -8,9 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.config.copy; +package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; import junit.framework.Assert; +import org.eclipse.osee.ats.config.copy.ConfigData; +import org.eclipse.osee.ats.config.copy.CopyAtsUtil; /** * Test case for {@link CopyAtsUtil} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java index bd146107be2..96ae1205ffe 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java @@ -8,16 +8,18 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.config.copy; +package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; import junit.framework.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoTeam; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.config.copy.ConfigData; +import org.eclipse.osee.ats.config.copy.CopyAtsValidation; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.XResultData; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoTeam; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsCoreClient_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsCoreClient_Suite.java new file mode 100644 index 00000000000..2bf0bccdb1d --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsCoreClient_Suite.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.core.client; + +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.branch.AtsCoreClient_Branch_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.config.AtsCoreClient_Config_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.notify.AtsCoreClient_Notify_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.operation.AtsCoreClient_Operation_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.review.AtsCoreClient_Review_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.task.AtsCoreClient_Task_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.util.AtsCoreClient_Util_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.AtsCoreClient_Workflow_Suite; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + AtsTestUtilTest.class, + AtsCoreClient_Branch_Suite.class, + AtsCoreClient_Config_Suite.class, + AtsCoreClient_Notify_Suite.class, + AtsCoreClient_Operation_Suite.class, + AtsCoreClient_Review_Suite.class, + AtsCoreClient_Task_Suite.class, + AtsCoreClient_Util_Suite.class, + AtsCoreClient_Workflow_Suite.class}) +public class AtsCoreClient_Suite { + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsCoreClient_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsCoreClient_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java index 42745d4ef4e..0722634506e 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java @@ -8,9 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -29,6 +29,7 @@ import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.actions.ISelectedAtsArtifacts; @@ -73,7 +74,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.eclipse.osee.support.test.util.TestUtil; /** diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java index 812630cfb67..917ca81534e 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client; import junit.framework.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchManagerCoreTest.java index 18fe9e9c8a1..e0887019fad 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchManagerCoreTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.branch; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.branch; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -18,7 +18,9 @@ import java.util.HashSet; import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; @@ -29,7 +31,6 @@ import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsCoreClient_Branch_Suite.java index 510c581a5cc..42a6798db6f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsCoreClient_Branch_Suite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2012 Boeing. * 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 @@ -8,31 +8,31 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.branch; -import org.eclipse.osee.ats.util.CreateActionUsingAllActionableItemsTest; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({CreateActionUsingAllActionableItemsTest.class}) /** - * @author Donald G. Dunne + * @author Roberto E. Escobar */ -public class AtsTest_Demo_Util_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsBranchManagerCoreTest.class}) +public class AtsCoreClient_Branch_Suite { + @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsTest_Demo_Util_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Branch_Suite.class.getSimpleName()); DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Util_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Branch_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java index 9a1332a0177..22915db99cf 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.config; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.config; import static org.junit.Assert.assertFalse; import java.util.Arrays; import java.util.Collection; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsCoreClient_Config_Production_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/AtsCoreClient_Config_Suite.java index 16d51ca671d..37ade7ab63f 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsCoreClient_Config_Production_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/AtsCoreClient_Config_Suite.java @@ -8,30 +8,29 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.config; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.config; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.config.store.AtsCoreClient_Store_Suite; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsActionableItemToTeamDefinitionTest.class}) /** - * This test suite contains tests that must be run against Production database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Config_Production_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsActionableItemToTeamDefinitionTest.class, AtsCoreClient_Store_Suite.class}) +public class AtsCoreClient_Config_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Config_Production_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Config_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Config_Production_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Config_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/AtsCoreClient_Workflow_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/AtsCoreClient_Store_Suite.java index 433b0e3511f..99ec62cc89c 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/AtsCoreClient_Workflow_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/AtsCoreClient_Store_Suite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2012 Boeing. * 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 @@ -8,30 +8,31 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.workflow; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.config.store; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({ConvertWorkflowStatesOperationTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * - * @author Donald G. Dunne + * @author Roberto E. Escobar */ -public class AtsCoreClient_Workflow_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({VersionArtifactStoreTest.class}) +public class AtsCoreClient_Store_Suite { + @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Workflow_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Store_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Workflow_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Store_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStoreTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java index d4e0bed35c2..440337ad0c0 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStoreTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.config.store; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.config.store; import java.util.Arrays; import java.util.Date; @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsCoreClient_Notify_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsCoreClient_Notify_Suite.java index 25612b978b0..17458d0e4a2 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsCoreClient_Notify_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsCoreClient_Notify_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.notify; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.notify; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -16,22 +16,20 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsNotifyUsersTest.class, AtsNotificationManagerTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Notify_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsNotifyUsersTest.class, AtsNotificationManagerTest.class}) +public class AtsCoreClient_Notify_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Notify_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Notify_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Notify_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Notify_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java index cf3a971e2fa..43522021a20 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.client.notify; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.notify; import java.util.ArrayList; import java.util.Arrays; @@ -12,10 +12,12 @@ import java.util.List; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.core.client.AtsTestUtil.AtsTestUtilState; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil.AtsTestUtilState; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionManager; +import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager.ConfigurationProvider; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; @@ -37,8 +39,8 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.skynet.core.utility.INotificationManager; -import org.eclipse.osee.support.test.util.DemoUsers; import org.junit.AfterClass; +import org.junit.BeforeClass; /** * Test unit for (@link AtsNotificationManager} @@ -47,6 +49,11 @@ import org.junit.AfterClass; */ public class AtsNotificationManagerTest { + @BeforeClass + public static void setup() { + AtsUtilCore.setEmailEnabled(true); + } + @AfterClass public static void cleanup() throws OseeCoreException { User user = UserManager.getUser(DemoUsers.Alex_Kay); @@ -56,6 +63,7 @@ public class AtsNotificationManagerTest { AtsNotificationManager.setInTest(true); AtsTestUtil.cleanup(); + AtsUtilCore.setEmailEnabled(false); } @org.junit.Test diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java index 40a77c9e8c4..b24dafb1ec5 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java @@ -8,16 +8,21 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.notify; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.notify; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.action.ActionManager; +import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager.ConfigurationProvider; +import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; +import org.eclipse.osee.ats.core.client.notify.AtsNotifyUsers; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -40,8 +45,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.skynet.core.utility.INotificationManager; import org.eclipse.osee.framework.skynet.core.utility.OseeNotificationEvent; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoUsers; import org.junit.Assert; /** @@ -52,6 +55,7 @@ import org.junit.Assert; public class AtsNotifyUsersTest { @org.junit.BeforeClass public static void setup() throws OseeCoreException { + AtsUtilCore.setEmailEnabled(true); AtsTestUtil.cleanupAndReset(AtsNotificationManagerTest.class.getSimpleName()); cleanUpAction(); } @@ -66,7 +70,10 @@ public class AtsNotifyUsersTest { AtsTestUtil.cleanup(); cleanUpAction(); + AtsUtilCore.setEmailEnabled(false); + AtsTestUtil.validateArtifactCache(); + AtsUtilCore.setEmailEnabled(false); } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/MockNotificationManager.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/MockNotificationManager.java index e4814b083e7..f50c1e35e2f 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/MockNotificationManager.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/MockNotificationManager.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.notify; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.notify; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/operation/AtsCoreClient_Operation_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/AtsCoreClient_Operation_Suite.java index 1f7221e45bc..398bc144a94 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/operation/AtsCoreClient_Operation_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/AtsCoreClient_Operation_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.operation; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.operation; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -16,22 +16,20 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({MoveTeamWorkflowsOperationTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Operation_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({MoveTeamWorkflowsOperationTest.class}) +public class AtsCoreClient_Operation_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Operation_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Operation_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Operation_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Operation_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java index 4176986b675..718b871b7ba 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java @@ -3,14 +3,16 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.client.operation; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.operation; import java.util.Arrays; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.action.ActionArtifact; +import org.eclipse.osee.ats.core.client.operation.MoveTeamWorkflowsOperation; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.Operations; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -36,7 +38,7 @@ public class MoveTeamWorkflowsOperationTest { MoveTeamWorkflowsOperation operation = new MoveTeamWorkflowsOperation("Move", teamWf, Arrays.asList(teamWf2), "new title"); - operation.doWork(null); + Operations.executeWorkAndCheckStatus(operation); Assert.assertEquals("Parent Actions should be same", teamWf.getParentActionArtifact(), teamWf.getParentActionArtifact()); diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/AtsCoreClient_Review_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/AtsCoreClient_Review_Suite.java index ae677b0d421..0ce04942963 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/AtsCoreClient_Review_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/AtsCoreClient_Review_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.review; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -16,26 +16,24 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; +/** + * @author Donald G. Dunne + */ @RunWith(Suite.class) @Suite.SuiteClasses({ DecisionReviewManagerTest.class, DecisionReviewDefinitionManagerTest.class, PeerToPeerReviewManagerTest.class, PeerReviewDefinitionManagerTest.class}) -/** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * - * @author Donald G. Dunne - */ -public class AtsCoreClient_Review_PT_Suite { +public class AtsCoreClient_Review_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Review_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Review_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Review_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Review_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java index 57c3e6f0b0d..630b0848409 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.review; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Arrays; import junit.framework.Assert; @@ -16,11 +16,16 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateEventType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition.MockTransitionHelper; +import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; +import org.eclipse.osee.ats.core.client.review.DecisionReviewDefinitionManager; +import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; +import org.eclipse.osee.ats.core.client.review.DecisionReviewState; +import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.client.workflow.transition.MockTransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java index fde536c543c..d41cab8f06d 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.review; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.ArrayList; import java.util.Arrays; @@ -18,7 +18,11 @@ import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; +import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; +import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -29,7 +33,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.support.test.util.DemoUsers; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java index b459671cbda..c758217e574 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.review; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Arrays; import junit.framework.Assert; @@ -16,11 +16,15 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateEventType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition.MockTransitionHelper; +import org.eclipse.osee.ats.core.client.review.PeerReviewDefinitionManager; +import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; +import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; +import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.client.workflow.transition.MockTransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java index 23b52ac238a..f3cfaa981ca 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java @@ -8,13 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.review; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Date; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; +import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; +import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; +import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -26,7 +29,7 @@ import org.junit.BeforeClass; /** * Test unit for {@link PeerToPeerReviewManager} - * + * * @author Donald G. Dunne */ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager { diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_JT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/AtsCoreClient_Task_Suite.java index dea480b3f46..0dffe92f4a1 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/AtsCoreClient_Task_Suite.java @@ -8,31 +8,29 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.task; -import org.eclipse.osee.ats.core.client.review.AtsCoreClient_Review_JT_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.task.createTasks.AtsCoreClient_CreateTasks_Suite; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsCoreClient_Review_JT_Suite.class}) /** - * This test suite contains tests that can be run as stand-alone JUnit tests (JT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_JT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsCoreClient_CreateTasks_Suite.class, TaskManagerTest.class}) +public class AtsCoreClient_Task_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_JT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Task_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_JT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Task_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java index bc6c1ccefd7..0d0245288c7 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java @@ -8,14 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.task; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.task; import java.util.Arrays; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.core.client.task.TaskArtifact; +import org.eclipse.osee.ats.core.client.task.TaskManager; +import org.eclipse.osee.ats.core.client.task.TaskStates; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/AtsCoreClient_CreateTasks_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/AtsCoreClient_CreateTasks_Suite.java new file mode 100644 index 00000000000..778a215ce10 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/AtsCoreClient_CreateTasks_Suite.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.task.createTasks; + +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({CreateTasksOperationTest.class}) +public class AtsCoreClient_CreateTasks_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsCoreClient_CreateTasks_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsCoreClient_CreateTasks_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java index afbdbf91eac..6597fc53998 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.task.createTasks; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.task.createTasks; import java.rmi.activation.Activator; import java.util.ArrayList; @@ -21,7 +21,8 @@ import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.createtasks.CreateTasksOperation; @@ -52,7 +53,6 @@ import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.skynet.core.revision.LoadChangeType; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsCoreClient_Util_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsCoreClient_Util_Suite.java index 277fd6469f3..c719757d9d6 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsCoreClient_Util_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsCoreClient_Util_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.util; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -16,22 +16,20 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsUserTest.class, CopyActionDetailsTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Util_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsUserTest.class, CopyActionDetailsTest.class}) +public class AtsCoreClient_Util_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Util_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Util_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Util_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Util_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java index 70648423bd4..79f931081d4 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java @@ -3,19 +3,21 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.client.util; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import junit.framework.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.core.client.util.AtsUser; +import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.support.test.util.DemoUsers; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/CopyActionDetailsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java index cdf00186139..afabc719182 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/CopyActionDetailsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java @@ -3,12 +3,12 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.client.util; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; import junit.framework.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.core.client.AtsTestUtil.AtsTestUtilState; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil.AtsTestUtilState; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.util.CopyActionDetails; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_Production_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/AtsCoreClient_Workflow_Suite.java index df5f488a614..c9ed95b73e2 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_Production_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/AtsCoreClient_Workflow_Suite.java @@ -8,31 +8,33 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow; -import org.eclipse.osee.ats.core.client.config.AtsCoreClient_Config_Production_PT_Suite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.note.NoteTestSuite; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition.AtsCoreClient_Transition_Suite; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsCoreClient_Config_Production_PT_Suite.class}) /** - * This test suite contains tests that must be run as PDE Junit (PT) through test launch config - * * @author Donald G. Dunne */ -public class AtsCoreClient_Production_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + NoteTestSuite.class, + AtsCoreClient_Transition_Suite.class, + ConvertWorkflowStatesOperationTest.class}) +public class AtsCoreClient_Workflow_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Production_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Workflow_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Production_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Workflow_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java index 8444a5fd17b..abc9b3d7a92 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.workflow; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow; import java.util.ArrayList; import java.util.HashMap; @@ -18,12 +18,16 @@ import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.client.workflow.ConvertWorkflowStatesOperation; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; @@ -44,7 +48,7 @@ public class ConvertWorkflowStatesOperationTest { TransactionManager.createTransaction(AtsUtilCore.getAtsBranchToken(), "ConvertWorkflowStatesOperationTest.cleanup"); for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamWorkflow, - "ConvertWorkflowStatesOperationTest%", AtsUtilCore.getAtsBranchToken())) { + "ConvertWorkflowStatesOperationTest", AtsUtilCore.getAtsBranchToken(), QueryOptions.CONTAINS_MATCH_OPTIONS)) { art.deleteAndPersist(transaction); } transaction.execute(); @@ -58,20 +62,22 @@ public class ConvertWorkflowStatesOperationTest { XResultData rd = new XResultData(false); ConvertWorkflowStatesOperation operation = new ConvertWorkflowStatesOperation(fromStateToStateMap, workflows, persist, rd); + Operations.executeWorkAndCheckStatus(operation); - operation.doWork(null); Assert.assertEquals("Error: Must enter FromToState pairs\n", rd.toString()); fromStateToStateMap.put("Endor;se", "New\"StateName"); rd.clear(); - operation.doWork(null); + + Operations.executeWorkAndCheckStatus(operation); Assert.assertEquals("Should be two state name errors\n", 2, rd.getNumErrors()); fromStateToStateMap.clear(); fromStateToStateMap.put("Endorse", "NewStateName"); rd.clear(); - operation.doWork(null); + + Operations.executeWorkAndCheckStatus(operation); Assert.assertEquals("Error: No workflows entered\n", rd.toString()); } @@ -98,7 +104,7 @@ public class ConvertWorkflowStatesOperationTest { ConvertWorkflowStatesOperation operation = new ConvertWorkflowStatesOperation(fromStateToStateMap, workflows, persist, rd); - operation.doWork(null); + Operations.executeWorkAndCheckStatus(operation); Assert.assertFalse(rd.isErrors()); Assert.assertEquals("NewEndorse;", teamWf.getSoleAttributeValue(AtsAttributeTypes.CurrentState, "")); @@ -133,7 +139,7 @@ public class ConvertWorkflowStatesOperationTest { ConvertWorkflowStatesOperation operation = new ConvertWorkflowStatesOperation(fromStateToStateMap, workflows, persist, rd); - operation.doWork(null); + Operations.executeWorkAndCheckStatus(operation); Assert.assertFalse(rd.isErrors()); Assert.assertEquals("NewEndorse;", teamWf.getSoleAttributeValue(AtsAttributeTypes.CurrentState, "")); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/AtsNoteTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/AtsNoteTest.java index 5820009de6a..0877a6c9022 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/AtsNoteTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/AtsNoteTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.artifact.note; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.note; import java.util.Date; import org.eclipse.core.runtime.IStatus; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/NoteItemTest.java index a4aa33a55ed..947eb028cb0 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/NoteItemTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.artifact.note; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.note; import java.util.Arrays; import java.util.Date; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/NoteTestSuite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/NoteTestSuite.java new file mode 100644 index 00000000000..42998b2b5be --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/note/NoteTestSuite.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.note; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsNoteTest.class, NoteItemTest.class}) +public class NoteTestSuite { + // Test Suite +} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/AtsCoreClient_Transition_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/AtsCoreClient_Transition_Suite.java index 2bcbf4c8155..e91374e9bb5 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/AtsCoreClient_Transition_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/AtsCoreClient_Transition_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.workflow.transition; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -16,22 +16,20 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({TransitionManagerTest.class, StateManagerTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Transition_PT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({TransitionManagerTest.class, StateManagerTest.class}) +public class AtsCoreClient_Transition_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Transition_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsCoreClient_Transition_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Transition_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsCoreClient_Transition_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/MockTransitionHelper.java index 6b729f48c89..4de771dbfa5 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/MockTransitionHelper.java @@ -8,18 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.workflow.transition; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition; import java.util.Collection; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** * Allows setting of workingBranchInWork and branchInCommit for testing purposes. If not set, uses default from * TransitionHelper - * + * * @author Donald G. Dunne */ public class MockTransitionHelper extends TransitionHelper { diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/StateManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java index b819534de71..14be4b7711a 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/StateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java @@ -8,15 +8,18 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.workflow.transition; +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition; import java.util.Collections; import junit.framework.Assert; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; import org.eclipse.osee.ats.core.client.workflow.StateManager; +import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionHelper; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java index c44bb187b75..8ca6ccb796d 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java @@ -1,7 +1,14 @@ -/** - * @author Donald G. Dunne - */ -package org.eclipse.osee.ats.core.client.workflow.transition; +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition; import java.util.ArrayList; import java.util.Arrays; @@ -19,8 +26,9 @@ import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.api.workdef.WidgetOption; -import org.eclipse.osee.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.core.client.AtsTestUtil.AtsTestUtilState; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil.AtsTestUtilState; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; @@ -31,6 +39,12 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionListener; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionAdapter; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; +import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.workflow.transition.TransitionResult; import org.eclipse.osee.ats.mocks.MockStateDefinition; @@ -38,7 +52,6 @@ import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoUsers; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/AtsTest_Editor_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/AtsTest_Editor_Suite.java new file mode 100644 index 00000000000..8f3acc690de --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/AtsTest_Editor_Suite.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.editor; + +import org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem.AtsTest_Demo_StateItem_Suite; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsTest_Demo_StateItem_Suite.class, SMAPrintTest.class}) +public class AtsTest_Editor_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Editor_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Editor_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/SMAPrintTest.java index 0c42c0a68ec..296b4038cab 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/SMAPrintTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/SMAPrintTest.java @@ -8,20 +8,21 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor; +package org.eclipse.osee.ats.client.integration.tests.ats.editor; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.editor.SMAPrint; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java index 1815d19d291..c4683981d62 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor.stateItem; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Collection; @@ -16,11 +16,12 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewDecisionStateItem; import org.eclipse.osee.ats.mocks.MockStateDefinition; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java index 4ca435d3e93..893527cb635 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java @@ -8,19 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor.stateItem; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IStateToken; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; +import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewPrepareStateItem; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java index 1ceea13ff6f..8008f2cc960 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java @@ -8,19 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor.stateItem; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.editor.stateItem.AtsForceAssigneesToTeamLeadsStateItem; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java index abcb3c5079d..8ba8bef3e99 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java @@ -8,21 +8,22 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor.stateItem; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; +import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewPrepareStateItem; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.skynet.widgets.XComboDam; -import org.eclipse.osee.support.test.util.DemoActionableItems; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java index a26f683357b..c11c3d92641 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java @@ -8,13 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor.stateItem; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewReviewStateItem; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsTest_Demo_StateItem_Suite.java index e58d707e51f..ce1dc2ebb97 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsTest_Demo_StateItem_Suite.java @@ -8,14 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.editor.stateItem; -import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewDecisionStateItemTest; -import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewPrepareStateItemTest; -import org.eclipse.osee.ats.editor.stateItem.AtsForceAssigneesToTeamLeadsStateItemTest; -import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewPrepareStateItemTest; -import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewReviewStateItemTest; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -24,11 +19,11 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ + AtsDecisionReviewDecisionStateItemTest.class, + AtsDecisionReviewPrepareStateItemTest.class, AtsForceAssigneesToTeamLeadsStateItemTest.class, - AtsPeerToPeerReviewReviewStateItemTest.class, AtsPeerToPeerReviewPrepareStateItemTest.class, - AtsDecisionReviewDecisionStateItemTest.class, - AtsDecisionReviewPrepareStateItemTest.class}) + AtsPeerToPeerReviewReviewStateItemTest.class}) /** * This test suite contains tests that must be run against demo database * diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/health/AtsTest_Health_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/health/AtsTest_Health_Suite.java new file mode 100644 index 00000000000..001067db6ad --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/health/AtsTest_Health_Suite.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.health; + +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({AtsValidateAtsDatabaseTest.class}) +public class AtsTest_Health_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Health_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Health_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/health/AtsValidateAtsDatabaseTest.java index 2e30989f177..aee21c8ebd8 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/health/AtsValidateAtsDatabaseTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/health/AtsValidateAtsDatabaseTest.java @@ -8,12 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.health; +package org.eclipse.osee.ats.client.integration.tests.ats.health; import static org.junit.Assert.fail; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; +import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToMassEditorTest.java index 1437c35f79c..3b3b770b1a6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToMassEditorTest.java @@ -8,16 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.navigate; +package org.eclipse.osee.ats.client.integration.tests.ats.navigate; import java.util.Collection; import java.util.Collections; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.task.TaskEditor; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.NavigateTestUtil; import org.eclipse.osee.ats.version.MassEditTeamVersionItem; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; @@ -52,8 +52,7 @@ public class AtsNavigateItemsToMassEditorTest { Assert.assertTrue(item instanceof MassEditTeamVersionItem); MassEditTeamVersionItem massEditItem = ((MassEditTeamVersionItem) item); - Collection<IAtsTeamDefinition> teamDefs = - TeamDefinitions.getTeamDefinitions(Collections.singleton("SAW SW")); + Collection<IAtsTeamDefinition> teamDefs = TeamDefinitions.getTeamDefinitions(Collections.singleton("SAW SW")); Assert.assertNotNull(teamDefs); Assert.assertFalse(teamDefs.isEmpty()); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java index 3a2a6481e68..5c4c388cc9c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.navigate; +package org.eclipse.osee.ats.client.integration.tests.ats.navigate; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -17,13 +17,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; import org.eclipse.osee.ats.core.config.TeamDefinitions; +import org.eclipse.osee.ats.navigate.SearchNavigateItem; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.task.TaskXViewer; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.CustomizeDemoTableTestUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.NavigateTestUtil; import org.eclipse.osee.ats.world.search.TaskSearchWorldSearchItem; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.Active; @@ -35,7 +36,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.util.IDynamicWidgetLayoutListener; -import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.eclipse.osee.support.test.util.TestUtil; /** @@ -151,7 +151,7 @@ public class AtsNavigateItemsToTaskEditorTest { public void handleTableCustomization() { // add all columns - CustomizeDemoTableTestUtil cdialog = new CustomizeDemoTableTestUtil(getXViewer()); + CustomizeTableDialog cdialog = new CustomizeTableDialog(getXViewer()); cdialog.createDialogArea(getSingleEditorOrFail().getTaskActionPage().getTaskComposite()); cdialog.handleAddAllItemButtonClick(); } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java index 20e0adf0824..bd4ba5fceb8 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.navigate; +package org.eclipse.osee.ats.client.integration.tests.ats.navigate; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -27,20 +27,26 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.ats.config.AtsBranchConfigurationTest; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.WorldEditorUtil; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.editor.SMAEditor; -import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.navigate.SearchNavigateItem; +import org.eclipse.osee.ats.navigate.TeamWorkflowSearchWorkflowSearchItem; +import org.eclipse.osee.ats.navigate.UserSearchWorkflowSearchItem; +import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.task.TaskEditorSimpleProvider; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.CustomizeDemoTableTestUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.NavigateTestUtil; -import org.eclipse.osee.ats.util.WorldEditorUtil; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldXViewer; import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem; @@ -65,9 +71,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.util.IDynamicWidgetLayoutListener; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoUsers; import org.eclipse.osee.support.test.util.TestUtil; import org.eclipse.swt.widgets.TreeItem; import org.junit.Ignore; @@ -77,6 +80,14 @@ import org.junit.Ignore; */ public class AtsNavigateItemsToWorldViewTest { + private static enum AtsUserCommunity { + Program_1, + Program_2, + Tools, + Processes, + Other; + } + @org.junit.Test public void testDemoDatabase() throws Exception { SevereLoggingMonitor monitor = TestUtil.severeLoggingStart(); @@ -299,7 +310,7 @@ public class AtsNavigateItemsToWorldViewTest { public void testOtherUsersWorld() throws Exception { SevereLoggingMonitor monitor = TestUtil.severeLoggingStart(); - OseeLog.log(Activator.class, Level.INFO, + OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Testing User's items relating to " + DemoTestUtil.getDemoUser(DemoUsers.Kay_Jones)); XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's World").iterator().next(); runGeneralLoadingTest(item, AtsArtifactTypes.AbstractWorkflowArtifact, 12, @@ -609,7 +620,7 @@ public class AtsNavigateItemsToWorldViewTest { private void handleTableCustomization() { // add all columns - CustomizeDemoTableTestUtil cdialog = new CustomizeDemoTableTestUtil(getXViewer()); + CustomizeTableDialog cdialog = new CustomizeTableDialog(getXViewer()); cdialog.createDialogArea(WorldEditorUtil.getSingleEditorOrFail().getWorldComposite()); cdialog.handleAddAllItemButtonClick(); } diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/AtsImpl_JT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsTest_Navigate_Suite.java index 7130e3a74bf..564d82ba6a3 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/AtsImpl_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsTest_Navigate_Suite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2012 Boeing. * 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 @@ -8,32 +8,34 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal; +package org.eclipse.osee.ats.client.integration.tests.ats.navigate; -import org.eclipse.osee.ats.impl.internal.model.AtsCore_WorkDef_JT_Suite; -import org.eclipse.osee.ats.impl.internal.query.AtsImpl_Query_Suite; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({AtsCore_WorkDef_JT_Suite.class, AtsImpl_Query_Suite.class}) /** - * This test suite contains tests that can be run as stand-alone JUnit tests (JT) - * - * @author Donald G. Dunne + * @author Roberto E. Escobar */ -public class AtsImpl_JT_Suite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + AtsNavigateItemsToMassEditorTest.class, + AtsNavigateItemsToTaskEditorTest.class, + AtsNavigateItemsToWorldViewTest.class}) +public class AtsTest_Navigate_Suite { + @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsImpl_JT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Navigate_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsImpl_JT_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Navigate_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/CustomizeDemoTableTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/CustomizeTableDialog.java index 3d4a5c94d8e..d85ba87b317 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/CustomizeDemoTableTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/CustomizeTableDialog.java @@ -8,12 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.navigate; import java.util.logging.Level; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.customize.dialog.XViewerCustomizeDialog; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -21,11 +20,11 @@ import org.eclipse.swt.widgets.Control; /** * @author Megumi Telles */ -public class CustomizeDemoTableTestUtil extends XViewerCustomizeDialog { +public class CustomizeTableDialog extends XViewerCustomizeDialog { public boolean DEBUG = false; - public CustomizeDemoTableTestUtil(XViewer viewer) { + public CustomizeTableDialog(XViewer viewer) { super(viewer); } @@ -35,7 +34,7 @@ public class CustomizeDemoTableTestUtil extends XViewerCustomizeDialog { @Override public Control createDialogArea(Composite parent) { if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "===> Simulating CustomizationView " + "\"..."); + OseeLog.log(CustomizeTableDialog.class, Level.INFO, "===> Simulating CustomizationView " + "\"..."); } return super.createDialogArea(parent); } @@ -45,7 +44,8 @@ public class CustomizeDemoTableTestUtil extends XViewerCustomizeDialog { */ public void handleAddAllItemButtonClick() { if (DEBUG) { - OseeLog.log(Activator.class, Level.INFO, "===> Simulating CustomizationView Add All Columns" + "\"..."); + OseeLog.log(CustomizeTableDialog.class, Level.INFO, + "===> Simulating CustomizationView Add All Columns" + "\"..."); } super.handleAddAllItem(); super.handleLoadConfigCust(); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/AtsTest_Renderer_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/AtsTest_Renderer_Suite.java new file mode 100644 index 00000000000..250c41101cd --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/AtsTest_Renderer_Suite.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.render; + +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({RendererManagerTest.class}) +public class AtsTest_Renderer_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Renderer_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Renderer_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java index 1aba5f00c7e..eabea02bdec 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.render; +package org.eclipse.osee.ats.client.integration.tests.ats.render; import static org.eclipse.osee.ats.api.data.AtsArtifactTypes.Action; -import static org.eclipse.osee.ats.render.RendererManagerTest.DefaultOption.Both; -import static org.eclipse.osee.ats.render.RendererManagerTest.DefaultOption.Off; -import static org.eclipse.osee.ats.render.RendererManagerTest.DefaultOption.On; +import static org.eclipse.osee.ats.client.integration.tests.ats.render.RendererManagerTest.DefaultOption.Both; +import static org.eclipse.osee.ats.client.integration.tests.ats.render.RendererManagerTest.DefaultOption.Off; +import static org.eclipse.osee.ats.client.integration.tests.ats.render.RendererManagerTest.DefaultOption.On; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Folder; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.GeneralDocument; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.SoftwareRequirement; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/AtsTest_Review_Suite.java index 555253b8c04..b9fe8917795 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/AtsTest_Review_Suite.java @@ -8,10 +8,8 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats; +package org.eclipse.osee.ats.client.integration.tests.ats.review; -import org.eclipse.osee.ats.review.ReviewNavigateItemsToWorldViewTest; -import org.eclipse.osee.ats.review.ReviewWorldSearchItemDemoTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -25,15 +23,15 @@ import org.junit.runners.Suite; * * @author Donald G. Dunne */ -public class Review_Demo_Suite { +public class AtsTest_Review_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + Review_Demo_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Review_Suite.class.getSimpleName()); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + Review_Demo_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Review_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/ReviewNavigateItemsToWorldViewTest.java index 52ecec0ee77..cef6c46a3d2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/ReviewNavigateItemsToWorldViewTest.java @@ -8,19 +8,21 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.review; +package org.eclipse.osee.ats.client.integration.tests.ats.review; import static org.junit.Assert.assertTrue; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.WorldEditorUtil; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.navigate.SearchNavigateItem; import org.eclipse.osee.ats.navigate.VisitedItems; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.MassEditorUtil; -import org.eclipse.osee.ats.util.NavigateTestUtil; -import org.eclipse.osee.ats.util.WorldEditorUtil; +import org.eclipse.osee.ats.review.GenerateReviewParticipationReport; +import org.eclipse.osee.ats.review.ReviewNavigateViewItems; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.search.UserSearchItem; import org.eclipse.osee.framework.core.data.IArtifactType; @@ -28,7 +30,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; -import org.eclipse.osee.support.test.util.DemoUsers; /** * Test case for @link {@link ReviewNavigateViewItems} @@ -55,14 +56,17 @@ public class ReviewNavigateItemsToWorldViewTest { @org.junit.Test public void testOtherUsersWorld_KayJones() throws Exception { XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's Reviews").iterator().next(); - runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 1, AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones)); + runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 1, + AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones)); } @org.junit.Test public void testOtherUsersWorld_JoeSmith() throws Exception { XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's Reviews").iterator().next(); - runGeneralLoadingTest(item, AtsArtifactTypes.DecisionReview, 2, AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)); - runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 2, AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)); + runGeneralLoadingTest(item, AtsArtifactTypes.DecisionReview, 2, + AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)); + runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 2, + AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)); } @org.junit.Test @@ -94,7 +98,7 @@ public class ReviewNavigateItemsToWorldViewTest { item.run(TableLoadOption.ForcePend); - MassArtifactEditor editor = MassEditorUtil.getSingleEditorOrFail(); + MassArtifactEditor editor = getSingleEditorOrFail(); Collection<Artifact> arts = editor.getLoadedArtifacts(); NavigateTestUtil.testExpectedVersusActual(item.getName(), arts, AtsArtifactTypes.PeerToPeerReview, 2); NavigateTestUtil.testExpectedVersusActual(item.getName(), arts, AtsArtifactTypes.DecisionReview, 3); @@ -126,4 +130,10 @@ public class ReviewNavigateItemsToWorldViewTest { return arts; } + private static MassArtifactEditor getSingleEditorOrFail() { + // Retrieve results from opened editor and test + Collection<MassArtifactEditor> editors = MassArtifactEditor.getEditors(); + assertTrue("Expecting 1 editor open, currently " + editors.size(), editors.size() == 1); + return editors.iterator().next(); + } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/ReviewWorldSearchItemDemoTest.java index 4e37e5dca55..b536ed7d5f2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/review/ReviewWorldSearchItemDemoTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.review; +package org.eclipse.osee.ats.client.integration.tests.ats.review; import static org.junit.Assert.assertTrue; import java.util.Arrays; @@ -18,13 +18,14 @@ import java.util.Set; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.client.demo.DemoUsers; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.navigate.VisitedItems; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.NavigateTestUtil; +import org.eclipse.osee.ats.review.ReviewWorldSearchItem; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.support.test.util.DemoUsers; /** * Test Case for @link {@link ReviewWorldSearchItem} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImageManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java index 44ce22174b1..2ba2c3b448b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImageManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; @@ -40,13 +39,16 @@ import org.eclipse.osee.framework.ui.swt.KeyedImage; /** * @author Donald G. Dunne */ -public abstract class ImageManagerTest { +public abstract class AbstractImageManagerTest { + + private static final String pluginId = "org.eclipse.osee.ats"; private final KeyedImage[] oseeImages; private final String imageClassName; + private static SevereLoggingMonitor monitorLog; - public ImageManagerTest(String imageClassName, KeyedImage[] oseeImages) { + public AbstractImageManagerTest(String imageClassName, KeyedImage[] oseeImages) { this.imageClassName = imageClassName; this.oseeImages = oseeImages; } @@ -112,8 +114,8 @@ public abstract class ImageManagerTest { ArtifactCache.deCache(folder); } - public static ByteArrayInputStream getByteArrayInputStream(String imageFilename) throws Exception { - URL imageFile = Platform.getBundle(Activator.PLUGIN_ID).getResource("images/" + imageFilename); + public ByteArrayInputStream getByteArrayInputStream(String imageFilename) throws Exception { + URL imageFile = Platform.getBundle(pluginId).getResource("images/" + imageFilename); if (imageFile == null) { throw new OseeArgumentException("Invalid image filename."); } @@ -131,12 +133,12 @@ public abstract class ImageManagerTest { @Override public ImageDescriptor createImageDescriptor() { - return ImageManager.createImageDescriptor(Activator.PLUGIN_ID, "images", fileName); + return ImageManager.createImageDescriptor(pluginId, "images", fileName); } @Override public String getImageKey() { - return Activator.PLUGIN_ID + "." + fileName; + return pluginId + "." + fileName; } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java index bdb87b15119..ed25459c4ee 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java @@ -8,9 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -20,7 +20,10 @@ import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; @@ -29,7 +32,9 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; +import org.eclipse.osee.ats.util.AtsDeleteManager; import org.eclipse.osee.ats.util.AtsDeleteManager.DeleteOption; +import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.Named; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -39,8 +44,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsImageTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsImageTest.java index 4bf50ed11c6..841fc90ce49 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsImageTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsImageTest.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; import org.eclipse.osee.ats.AtsImage; /** * @author Donald G. Dunne */ -public class AtsImageTest extends ImageManagerTest { +public class AtsImageTest extends AbstractImageManagerTest { public AtsImageTest() { super("AtsImage", AtsImage.values()); diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsCoreClient_Config_Demo_PT_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsTest_Util_Suite.java index 382d1898b81..2443209539e 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsCoreClient_Config_Demo_PT_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsTest_Util_Suite.java @@ -8,9 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.client.config; +package org.eclipse.osee.ats.client.integration.tests.ats.util; -import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStoreTest; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -18,21 +18,25 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({AtsActionableItemToTeamDefinitionTest.class, VersionArtifactStoreTest.class}) +@Suite.SuiteClasses({ + AtsDeleteManagerTest.class, + AtsImageTest.class, + AtsXWidgetsExampleBlamTest.class, + CreateActionUsingAllActionableItemsTest.class, + ImportActionsViaSpreadsheetTest.class}) /** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * * @author Donald G. Dunne */ -public class AtsCoreClient_Config_Demo_PT_Suite { +public class AtsTest_Util_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Config_Demo_PT_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_Util_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Config_Demo_PT_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_Util_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsXWidgetsExampleBlamTest.java index f84b3034b3a..aac8cb57f8e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsXWidgetsExampleBlamTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; import java.util.Map; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItemsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java index 26d2034afdc..f1480364b7b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItemsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java @@ -3,11 +3,13 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; import junit.framework.Assert; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; +import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.CreateActionUsingAllActionableItems; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java index b715f3e168d..ca42f053716 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.ats.util; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertFalse; @@ -17,10 +17,11 @@ import java.util.Arrays; import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam.ImportOption; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTest_Workflow_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTest_Workflow_Suite.java new file mode 100644 index 00000000000..fdf99a5b4e7 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTest_Workflow_Suite.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.ats.workflow; + +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({SMAPromptChangeStatusTest.class}) +public class AtsTest_Workflow_Suite { + + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Workflow_Suite.class.getSimpleName()); + DemoTestUtil.setUpTest(); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Workflow_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/workflow/SMAPromptChangeStatusTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java index e099afb999c..cce08f9b583 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/workflow/SMAPromptChangeStatusTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.workflow; +package org.eclipse.osee.ats.client.integration.tests.ats.workflow; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -17,19 +17,23 @@ import java.util.Arrays; import java.util.Collection; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskStates; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.client.workflow.AtsWorkStateFactory; +import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; +import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; +import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.editor.SMAPromptChangeStatus; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.SMATestUtil; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; @@ -79,23 +83,23 @@ public class SMAPromptChangeStatusTest { // Change two to 100, 1 hr split SMAPromptChangeStatus.performChangeStatus(tasks, null, 1, 100, true, true); - SMATestUtil.validateSMAs(tasks, TaskStates.InWork.getName(), 100, 0.25); + validateSMAs(tasks, TaskStates.InWork.getName(), 100, 0.25); // Change two to 100, 1 hr split // hours should be added to inwork state; make sure completed state isn't statused SMAPromptChangeStatus.performChangeStatus(tasks, null, 1, 100, true, true); - SMATestUtil.validateSMAs(tasks, TaskStates.InWork.getName(), 100, 0.50); + validateSMAs(tasks, TaskStates.InWork.getName(), 100, 0.50); // Change two to 99, 1 hr split // transitions to InWork and adds hours // make sure hours not added to completed state SMAPromptChangeStatus.performChangeStatus(tasks, null, 1, 99, true, true); - SMATestUtil.validateSMAs(tasks, TaskStates.InWork.getName(), 99, 0.75); + validateSMAs(tasks, TaskStates.InWork.getName(), 99, 0.75); // Change two to 55, 0 // no transition, no hours spent SMAPromptChangeStatus.performChangeStatus(tasks, null, 0, 55, true, true); - SMATestUtil.validateSMAs(tasks, TaskStates.InWork.getName(), 55, 0.75); + validateSMAs(tasks, TaskStates.InWork.getName(), 55, 0.75); } @@ -151,4 +155,33 @@ public class SMAPromptChangeStatusTest { AtsTestUtil.cleanupSimpleTest(SMAPromptChangeStatusTest.class.getSimpleName()); } + private static void validateSMAs(Collection<? extends AbstractWorkflowArtifact> awas, String stateName, int totalPercent, double hoursSpent) throws Exception { + for (AbstractWorkflowArtifact awa : awas) { + Assert.assertEquals("Current State wrong for " + awa.getHumanReadableId(), + awa.getStateMgr().getCurrentStateName(), stateName); + if (awa.isCompletedOrCancelled()) { + Assert.assertEquals("ats.CurrentState wrong " + awa.getHumanReadableId(), + awa.getStateMgr().getCurrentStateName() + ";;;", + awa.getSoleAttributeValue(AtsAttributeTypes.CurrentState)); + } + Assert.assertEquals("Percent wrong for " + awa.getHumanReadableId(), + PercentCompleteTotalUtil.getPercentCompleteTotal(awa), totalPercent); + Assert.assertEquals("Hours Spent wrong for " + awa.getHumanReadableId(), + HoursSpentUtil.getHoursSpentTotal(awa), hoursSpent, 0.0); + + for (String xml : awa.getAttributesToStringList(AtsAttributeTypes.State)) { + WorkStateImpl state = AtsWorkStateFactory.getFromXml(xml); + boolean isCompletedCancelledState = isCompletedCancelledState(awa, state.getName()); + if (isCompletedCancelledState) { + Assert.assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(), + xml.endsWith(";;;")); + } + } + } + } + + private static boolean isCompletedCancelledState(AbstractWorkflowArtifact aba, String stateName) { + return aba.getWorkDefinition().getStateByName(stateName).getStateType().isCompletedOrCancelledState(); + } + } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/AtsTest_Demo_World_Search_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsTest_World_Search_Suite.java index 295b8202fa2..d3092ab892b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/AtsTest_Demo_World_Search_Suite.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsTest_World_Search_Suite.java @@ -1,7 +1,7 @@ -package org.eclipse.osee.ats.world.search; +package org.eclipse.osee.ats.client.integration.tests.ats.world.search; import static org.junit.Assert.assertTrue; -import org.eclipse.osee.ats.util.DemoTestUtil; +import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; @@ -14,7 +14,7 @@ import org.junit.runners.Suite; /** * @author Donald G. Dunne */ -public class AtsTest_Demo_World_Search_Suite { +public class AtsTest_World_Search_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); @@ -22,12 +22,12 @@ public class AtsTest_Demo_World_Search_Suite { ClientSessionManager.getAuthenticationProtocols().contains("demo")); assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); - System.out.println("\n\nBegin " + AtsTest_Demo_World_Search_Suite.class.getSimpleName()); + System.out.println("\n\nBegin " + AtsTest_World_Search_Suite.class.getSimpleName()); DemoTestUtil.setUpTest(); } @AfterClass public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_World_Search_Suite.class.getSimpleName()); + System.out.println("End " + AtsTest_World_Search_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/LegacyPcrIdQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java index 5366d072dac..c18e9427092 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/LegacyPcrIdQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ - -package org.eclipse.osee.ats.world.search; +package org.eclipse.osee.ats.client.integration.tests.ats.world.search; import java.util.Arrays; import java.util.Collection; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.world.search.LegacyPcrIdQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/TeamDefinitionQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java index 61d2ae5a238..beb90cc3c7a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/world/search/TeamDefinitionQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java @@ -8,15 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.world.search; +package org.eclipse.osee.ats.client.integration.tests.ats.world.search; import java.util.Arrays; import java.util.Collection; import junit.framework.Assert; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.client.AtsTestUtil; +import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.world.search.TeamDefinitionQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DbInitTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DbInitTest.java new file mode 100644 index 00000000000..f934a6defee --- /dev/null +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DbInitTest.java @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.client.integration.tests.util; + +import static org.junit.Assert.assertTrue; +import java.util.List; +import java.util.logging.Level; +import org.eclipse.osee.ats.client.demo.DemoChoice; +import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.database.init.DatabaseInitOpFactory; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.logging.SevereLoggingMonitor; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.support.test.util.TestUtil; +import org.junit.Assert; +import org.junit.BeforeClass; + +/** + * @author Donald G. Dunne + */ +public class DbInitTest { + private static boolean wasDbInitSuccessful = false; + + @BeforeClass + public static void setup() throws Exception { + OseeProperties.setIsInTest(true); + assertTrue("Demo Application Server must be running", + ClientSessionManager.getAuthenticationProtocols().contains("demo")); + RenderingUtil.setPopupsAllowed(false); + } + + @org.junit.Test + public void testDbInit() throws Exception { + System.out.println("\nBegin database initialization..."); + + List<String> protocols = ClientSessionManager.getAuthenticationProtocols(); + Assert.assertTrue("Application Server must be running." + protocols, protocols.contains("demo")); + + OseeLog.log(DbInitTest.class, Level.INFO, "Begin Database Initialization..."); + + SevereLoggingMonitor monitorLog = TestUtil.severeLoggingStart(); + OseeLog.registerLoggerListener(monitorLog); + + DatabaseInitOpFactory.executeWithoutPrompting(DemoChoice.ATS_CLIENT_DEMO); + + TestUtil.severeLoggingEnd(monitorLog); + OseeLog.log(DbInitTest.class, Level.INFO, "Completed database initialization"); + wasDbInitSuccessful = true; + + if (wasDbInitSuccessful) { + TestUtil.setDbInitSuccessful(true); + + // Re-authenticate so we can continue and NOT be bootstrap + ClientSessionManager.releaseSession(); + ClientSessionManager.getSession(); + UserManager.releaseUser(); + + if (UserManager.getUser().getUserId().equals("bootstrap")) { + throw new OseeStateException("Should not be bootstrap user here"); + } + } + + System.out.println("End database initialization...\n"); + } +} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java index 6953ca6d37e..76144774c4c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java @@ -8,9 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.util; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -23,6 +23,11 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.client.demo.DemoActionableItems; +import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; +import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import org.eclipse.osee.ats.client.demo.DemoTeam; +import org.eclipse.osee.ats.client.demo.DemoWorkType; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -31,7 +36,7 @@ import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -45,11 +50,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.support.test.util.DemoActionableItems; -import org.eclipse.osee.support.test.util.DemoArtifactTypes; -import org.eclipse.osee.support.test.util.DemoSawBuilds; -import org.eclipse.osee.support.test.util.DemoTeam; -import org.eclipse.osee.support.test.util.DemoWorkType; import org.junit.Assert; /** @@ -212,7 +212,7 @@ public class DemoTestUtil { "Authenticated user should be \"Joe Smith\" and is not. Check that Demo Application Server is being run.", AtsUsersClient.getUser().getUserId().equals("Joe Smith")); } catch (OseeAuthenticationException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); + OseeLog.log(DemoTestUtil.class, Level.SEVERE, ex); Assert.fail("Can't authenticate, either Demo Application Server is not running or Demo DbInit has not been performed"); } @@ -227,7 +227,7 @@ public class DemoTestUtil { String name = team.name().replaceAll("_", " "); return AtsConfigCache.instance.getSoleByName(name, IAtsTeamDefinition.class); } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); + OseeLog.log(DemoTestUtil.class, Level.SEVERE, ex); } return null; } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/NavigateTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/NavigateTestUtil.java index 0dafbdd3bc5..4f5b2678ca2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/NavigateTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/NavigateTestUtil.java @@ -8,12 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.util; import java.util.ArrayList; import java.util.Collection; import java.util.logging.Level; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.navigate.AtsNavigateViewItems; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.jdk.core.type.HashCollection; @@ -114,14 +113,14 @@ public final class NavigateTestUtil { public static void compare(int expectedNumOfType, int actualNumOfType, String expectedStr) { if (expectedNumOfType != actualNumOfType) { - OseeLog.log(Activator.class, Level.SEVERE, expectedStr, null); + OseeLog.log(NavigateTestUtil.class, Level.SEVERE, expectedStr, null); } Assert.assertTrue(expectedStr, actualNumOfType == expectedNumOfType); } public static void compare(boolean expectedCond, boolean actualCond, String expectedStr) { if (expectedCond != actualCond) { - OseeLog.log(Activator.class, Level.SEVERE, expectedStr, null); + OseeLog.log(NavigateTestUtil.class, Level.SEVERE, expectedStr, null); } Assert.assertTrue(expectedStr, expectedCond == actualCond); } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/WorldEditorUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/WorldEditorUtil.java index 06f9d40bbb2..90bff5c2cb7 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/WorldEditorUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/WorldEditorUtil.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.util; +package org.eclipse.osee.ats.client.integration.tests.util; import static org.junit.Assert.assertTrue; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF index 8d2db26e419..ddca80cdc05 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF @@ -6,7 +6,10 @@ Bundle-Version: 0.11.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ats.core.client Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="4.8.1" +Require-Bundle: org.junit, + org.mockito;bundle-version="1.9.0", + org.hamcrest.core, + org.objenesis Export-Package: org.eclipse.osee.ats.core.client, org.eclipse.osee.ats.core.client.validator Import-Package: org.eclipse.osee.ats.core.validator, diff --git a/plugins/org.eclipse.osee.ats.core.client.test/pom.xml b/plugins/org.eclipse.osee.ats.core.client.test/pom.xml new file mode 100644 index 00000000000..b703ca96228 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client.test/pom.xml @@ -0,0 +1,31 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.ats.parent</artifactId> + <version>0.11.0-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.ats.core.client.test</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>OSEE ATS Core Client Test (Incubation)</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.osee.ats.core.client.test</testSuite> + <testClass>org.eclipse.osee.ats.core.client.AllAtsCoreClientTestSuite</testClass> + </configuration> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/query/AtsImpl_Query_Suite.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AllAtsCoreClientTestSuite.java index 0e40420a52c..538fef76972 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/query/AtsImpl_Query_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AllAtsCoreClientTestSuite.java @@ -8,28 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.query; +package org.eclipse.osee.ats.core.client; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.eclipse.osee.ats.core.client.review.ReviewTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({AtsQueryTest.class}) +@Suite.SuiteClasses({ReviewTestSuite.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * * @author Donald G. Dunne */ -public class AtsImpl_Query_Suite { - @BeforeClass - public static void setUp() throws Exception { - System.out.println("\n\nBegin " + AtsImpl_Query_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsImpl_Query_Suite.class.getSimpleName()); - } +public class AllAtsCoreClientTestSuite { + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_PT_Suite.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_PT_Suite.java deleted file mode 100644 index 812dbe374d3..00000000000 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsCoreClient_PT_Suite.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.client; - -import org.eclipse.osee.ats.core.client.notify.AtsCoreClient_Notify_PT_Suite; -import org.eclipse.osee.ats.core.client.operation.AtsCoreClient_Operation_PT_Suite; -import org.eclipse.osee.ats.core.client.review.AtsCoreClient_Review_PT_Suite; -import org.eclipse.osee.ats.core.client.task.AtsCoreClient_Task_PT_Suite; -import org.eclipse.osee.ats.core.client.util.AtsCoreClient_Util_PT_Suite; -import org.eclipse.osee.ats.core.client.workflow.AtsCoreClient_Workflow_PT_Suite; -import org.eclipse.osee.ats.core.client.workflow.transition.AtsCoreClient_Transition_PT_Suite; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - AtsCoreClient_Transition_PT_Suite.class, - AtsTestUtilTest.class, - AtsCoreClient_Util_PT_Suite.class, - AtsCoreClient_Workflow_PT_Suite.class, - AtsCoreClient_Notify_PT_Suite.class, - AtsCoreClient_Operation_PT_Suite.class, - AtsCoreClient_Review_PT_Suite.class, - AtsCoreClient_Task_PT_Suite.class,}) -/** - * This test suite contains tests that must be run as PDE Junit (PT) through test launch config - * - * @author Donald G. Dunne - */ -public class AtsCoreClient_PT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_PT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_PT_Suite.class.getSimpleName()); - } -} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/AtsCoreClient_Review_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/ReviewTestSuite.java index 30c990bd488..d369988f3ac 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/AtsCoreClient_Review_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/ReviewTestSuite.java @@ -14,32 +14,20 @@ import org.eclipse.osee.ats.core.client.review.defect.AtsXDefectValidatorTest; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItemTest; import org.eclipse.osee.ats.core.client.review.role.AtsXUserRoleValidatorTest; import org.eclipse.osee.ats.core.client.review.role.UserRoleTest; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ - ReviewDefectItemTest.class, AtsXDefectValidatorTest.class, - UserRoleTest.class, - AtsXUserRoleValidatorTest.class}) + ReviewDefectItemTest.class, + AtsXUserRoleValidatorTest.class, + UserRoleTest.class}) /** * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) * * @author Donald G. Dunne */ -public class AtsCoreClient_Review_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Review_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Review_JT_Suite.class.getSimpleName()); - } +public class ReviewTestSuite { + // TestSuite } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java index 97099388b69..f6cad7c9fc6 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java @@ -20,7 +20,6 @@ import org.eclipse.osee.ats.api.workdef.WidgetStatus; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Disposition; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.InjectionActivity; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Severity; -import org.eclipse.osee.ats.core.validator.ValidatorTestUtil; import org.eclipse.osee.ats.mocks.MockStateDefinition; import org.eclipse.osee.ats.mocks.MockWidgetDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/MockValueProvider.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/MockValueProvider.java new file mode 100644 index 00000000000..9b72ed0b032 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/MockValueProvider.java @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.core.client.review.defect; + +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import org.eclipse.osee.ats.core.validator.IValueProvider; + +/** + * @author Donald G. Dunne + */ +public class MockValueProvider implements IValueProvider { + + private final Collection<String> values; + private final String name; + + public MockValueProvider(Collection<String> values) { + this("test", values); + } + + public MockValueProvider(String name, Collection<String> values) { + this.name = name; + this.values = values; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean isEmpty() { + return values.isEmpty(); + } + + @Override + public Collection<String> getValues() { + return values; + } + + @Override + public Collection<Date> getDateValues() { + return Collections.emptyList(); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ValidatorTestUtil.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ValidatorTestUtil.java new file mode 100644 index 00000000000..dd78e5ba3f3 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ValidatorTestUtil.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.core.client.review.defect; + +import java.util.ArrayList; +import org.eclipse.osee.ats.api.workdef.WidgetResult; +import org.eclipse.osee.ats.api.workdef.WidgetStatus; +import org.junit.Assert; + +/** + * @author Donald G. Dunne + */ +public class ValidatorTestUtil { + + public static MockValueProvider emptyValueProvider = new MockValueProvider(new ArrayList<String>()); + + public static void assertValidResult(WidgetResult result) { + Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); + Assert.assertNull(result.getWidgetDef()); + Assert.assertEquals(WidgetStatus.Valid.name(), result.getDetails()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java index 8c49649eef3..f8716a6f441 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java @@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.core.validator.ValidatorTestUtil; +import org.eclipse.osee.ats.core.client.review.defect.ValidatorTestUtil; import org.eclipse.osee.ats.mocks.MockStateDefinition; import org.eclipse.osee.ats.mocks.MockWidgetDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/AtsCoreClient_Task_PT_Suite.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/AtsCoreClient_Task_PT_Suite.java deleted file mode 100644 index 7729f85eed1..00000000000 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/AtsCoreClient_Task_PT_Suite.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.client.task; - -import org.eclipse.osee.ats.core.client.task.createTasks.CreateTasksOperationTest; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({TaskManagerTest.class, CreateTasksOperationTest.class}) -/** - * This test suite contains tests that must be run against demo database as Plugin JUnit (PT) - * - * @author Donald G. Dunne - */ -public class AtsCoreClient_Task_PT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCoreClient_Task_PT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCoreClient_Task_PT_Suite.class.getSimpleName()); - } -} diff --git a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF index 9a51ca2993f..78b70957b7b 100644 --- a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF @@ -86,6 +86,7 @@ Export-Package: org.eclipse.osee.ats.core.client.access, org.eclipse.osee.ats.core.client.review.defect, org.eclipse.osee.ats.core.client.review.role, org.eclipse.osee.ats.core.client.task, + org.eclipse.osee.ats.core.client.task.createtasks, org.eclipse.osee.ats.core.client.team, org.eclipse.osee.ats.core.client.util, org.eclipse.osee.ats.core.client.validator, diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java index 6f1307b7d00..3eccedb77ba 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java @@ -177,7 +177,7 @@ public class AtsNotificationManager { return AtsNotificationManager.inTest; } - protected static void setInTest(boolean inTest) { + public static void setInTest(boolean inTest) { AtsNotificationManager.inTest = inTest; } } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java index aabc4215851..e89bcb81a4e 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java @@ -66,6 +66,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; public class StateManager implements IAtsNotificationListener, WorkStateProvider, WorkStateFactory { private final AbstractWorkflowArtifact awa; + private static List<String> allValidStateNames = null; private WorkStateProvider stateProvider = null; private int loadTransactionNumber; diff --git a/plugins/org.eclipse.osee.ats.core.test/pom.xml b/plugins/org.eclipse.osee.ats.core.test/pom.xml new file mode 100644 index 00000000000..2ef2eca96a9 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/pom.xml @@ -0,0 +1,31 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.ats.parent</artifactId> + <version>0.11.0-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.ats.core.test</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>OSEE ATS Core Test (Incubation)</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.osee.ats.core.test</testSuite> + <testClass>org.eclipse.osee.ats.core.AllAtsCoreTestSuite</testClass> + </configuration> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AtsCore_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java index 6c89b4d9217..1f96b393824 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AtsCore_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java @@ -17,11 +17,7 @@ import org.eclipse.osee.ats.core.users.AtsCore_Users_JT_Suite; import org.eclipse.osee.ats.core.util.AtsCore_Util_JT_Suite; import org.eclipse.osee.ats.core.validator.AtsCore_Validator_JT_Suite; import org.eclipse.osee.ats.core.workdef.AtsCore_WorkDef_JT_Suite; -import org.eclipse.osee.ats.core.workdef.provider.AtsCore_WorkDefProvider_JT_Suite; import org.eclipse.osee.ats.core.workflow.AtsCore_Workflow_JT_Suite; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -29,27 +25,17 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ AtsCore_Column_JT_Suite.class, AtsCore_ModelImpl_JT_Suite.class, - AtsCore_Util_JT_Suite.class, - AtsCore_WorkDef_JT_Suite.class, AtsCore_Transition_JT_Suite.class, - AtsCore_WorkDefProvider_JT_Suite.class, + AtsCore_Util_JT_Suite.class, AtsCore_Users_JT_Suite.class, AtsCore_Validator_JT_Suite.class, + AtsCore_WorkDef_JT_Suite.class, AtsCore_Workflow_JT_Suite.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * * @author Donald G. Dunne */ -public class AtsCore_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_JT_Suite.class.getSimpleName()); - } +public class AllAtsCoreTestSuite { + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/internal/TeamDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/internal/TeamDefinitionTest.java new file mode 100644 index 00000000000..2fd485fca5a --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/internal/TeamDefinitionTest.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2012 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.core.config.internal; + +import junit.framework.Assert; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.junit.Test; + +/** + * Test case for {@link TeamDefinition} + * + * @author Donald G. Dunne + */ +public class TeamDefinitionTest { + + @Test + public void testGetTeamDefinitionHoldingVersions() throws OseeCoreException { + TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid", "ADSF"); + + TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid", "ADSF"); + teamDef1_child1.setParentTeamDef(teamDef1); + + Assert.assertNull(teamDef1.getTeamDefinitionHoldingVersions()); + Assert.assertNull(teamDef1_child1.getTeamDefinitionHoldingVersions()); + + teamDef1.getVersions().add(new Version("ver1", "ver1guid", "ASDF")); + + Assert.assertEquals(teamDef1, teamDef1.getTeamDefinitionHoldingVersions()); + Assert.assertEquals(teamDef1, teamDef1_child1.getTeamDefinitionHoldingVersions()); + } + + @Test + public void testIsTeamUsesVersions() throws OseeCoreException { + TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid", "ADSF"); + + TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid", "ADSF"); + teamDef1_child1.setParentTeamDef(teamDef1); + + Assert.assertFalse(teamDef1.isTeamUsesVersions()); + Assert.assertFalse(teamDef1_child1.isTeamUsesVersions()); + + teamDef1.getVersions().add(new Version("ver1", "ver1guid", "ASDF")); + + Assert.assertTrue(teamDef1.isTeamUsesVersions()); + Assert.assertTrue(teamDef1_child1.isTeamUsesVersions()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java index 60d0c42c31a..79657b0e4ef 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.model.impl; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -28,14 +25,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_ModelImpl_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_ModelImpl_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_ModelImpl_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java index befd23c0d70..5510826a977 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java @@ -19,24 +19,27 @@ import org.eclipse.osee.ats.core.users.UnAssigned; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.junit.Before; import org.junit.Test; /** * @author Donald G. Dunne */ public class WorkStateProviderImplTest { + private final MockAtsUser joe = new MockAtsUser("joe"); private final MockAtsUser steve = new MockAtsUser("steve"); private final MockAtsUser alice = new MockAtsUser("alice"); - @Test - public void testWorkStateProviderImplWorkStateFactory() { - new WorkStateProviderImpl(new MockWorkStateFactory()); + private WorkStateProviderImpl provider; + + @Before + public void setup() { + provider = new WorkStateProviderImpl(new MockWorkStateFactory()); } @Test public void testSetNotificationListener() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setNotificationListener(new IAtsNotificationListener() { @@ -56,7 +59,6 @@ public class WorkStateProviderImplTest { @Test public void testAddAssignee() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -79,7 +81,6 @@ public class WorkStateProviderImplTest { @Test(expected = OseeArgumentException.class) public void testAddAssignee_exception() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -88,7 +89,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssignee() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -115,7 +115,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssignee_removeUnassigned() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -129,16 +128,14 @@ public class WorkStateProviderImplTest { } @Test - public void testAddState_exception() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testAddState_exception() { provider.addState(new WorkStateImpl("endorse")); provider.addState(new WorkStateImpl("endorse"), false); } @Test - public void testAddState_exception2() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testAddState_exception2() { provider.addState(new WorkStateImpl("endorse")); provider.addState("endorse", new LinkedList<IAtsUser>(), 34, 23, false); @@ -146,7 +143,6 @@ public class WorkStateProviderImplTest { @Test(expected = OseeArgumentException.class) public void testSetAssignee_exception() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -155,7 +151,6 @@ public class WorkStateProviderImplTest { @Test public void testIsUnAssigned() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); Assert.assertFalse(provider.isUnAssigned()); @@ -165,7 +160,6 @@ public class WorkStateProviderImplTest { @Test public void testIsUnAssignedSolely() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); Assert.assertFalse(provider.isUnAssignedSolely()); @@ -179,7 +173,6 @@ public class WorkStateProviderImplTest { @Test public void testGetAssigneesStrString() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.addAssignee(steve); @@ -193,7 +186,6 @@ public class WorkStateProviderImplTest { @Test public void testAddAssignees() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.addAssignees(Arrays.asList(joe, alice)); @@ -202,7 +194,6 @@ public class WorkStateProviderImplTest { @Test public void testAddAssignees_state() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.addAssignees("endorse", Arrays.asList(joe, alice)); @@ -211,7 +202,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssigneesIAtsUser() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setAssignee(joe); @@ -222,7 +212,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssigneeStringIAtsUser() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setAssignee("endorse", joe); @@ -233,7 +222,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssigneesListOfQextendsIAtsUser() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.addAssignees(Arrays.asList(joe, alice)); @@ -244,7 +232,6 @@ public class WorkStateProviderImplTest { @Test public void testSetAssigneesStringListOfQextendsIAtsUser() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setAssignee("endorse", joe); @@ -255,7 +242,6 @@ public class WorkStateProviderImplTest { @Test public void testRemoveAssigneeIAtsUser() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setAssignees("endorse", Arrays.asList(joe, alice)); @@ -266,7 +252,6 @@ public class WorkStateProviderImplTest { @Test public void testClearAssignees() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setAssignees("endorse", Arrays.asList(joe, alice)); @@ -276,8 +261,7 @@ public class WorkStateProviderImplTest { } @Test - public void testIsStateVisited() throws OseeArgumentException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testIsStateVisited() { Assert.assertFalse(provider.isStateVisited("endorse")); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); @@ -288,8 +272,7 @@ public class WorkStateProviderImplTest { } @Test - public void testCreateState() throws OseeArgumentException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testCreateState() { provider.createState("endorse"); Assert.assertTrue(provider.isStateVisited("endorse")); provider.createState("endorse"); @@ -297,8 +280,7 @@ public class WorkStateProviderImplTest { } @Test - public void testAddStateStringListOfQextendsIAtsUserDoubleInt() throws OseeArgumentException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testAddStateStringListOfQextendsIAtsUserDoubleInt() { provider.addState("endorse", Arrays.asList(joe), 4.2, 4); Assert.assertTrue(provider.isStateVisited("endorse")); Assert.assertEquals(1, provider.getVisitedStateNames().size()); @@ -309,13 +291,11 @@ public class WorkStateProviderImplTest { @Test(expected = OseeStateException.class) public void testGetAssigneesForState() throws OseeStateException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.getAssignees(); } @Test - public void testAddStateWorkState() throws OseeArgumentException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testAddStateWorkState() { provider.addState("endorse", Arrays.asList(joe)); Assert.assertTrue(provider.isStateVisited("endorse")); Assert.assertEquals(1, provider.getVisitedStateNames().size()); @@ -326,19 +306,16 @@ public class WorkStateProviderImplTest { @Test public void getPercentComplete() { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); Assert.assertEquals(0, provider.getPercentComplete("endorse")); } @Test(expected = OseeStateException.class) public void setPercentComplete_exception() throws OseeStateException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.setPercentComplete("endorse", 34); } @Test public void setPercentComplete() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setPercentComplete("endorse", 34); @@ -348,19 +325,16 @@ public class WorkStateProviderImplTest { @Test public void getHoursSpent() { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); Assert.assertEquals(0.0, provider.getHoursSpent("endorse")); } @Test(expected = OseeStateException.class) public void setHoursSpent_exception() throws OseeStateException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.setHoursSpent("endorse", 8.0); } @Test public void setHoursSpent() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.addState(new WorkStateImpl("endorse")); provider.setCurrentStateName("endorse"); provider.setHoursSpent("endorse", 8.0); @@ -370,13 +344,11 @@ public class WorkStateProviderImplTest { @Test(expected = OseeStateException.class) public void removeAssignee_exception() throws OseeCoreException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); provider.removeAssignee(joe); } @Test - public void testIsSame() throws OseeArgumentException { - WorkStateProviderImpl provider = new WorkStateProviderImpl(new MockWorkStateFactory()); + public void testIsSame() { WorkStateImpl endorse = new WorkStateImpl("endorse"); provider.addState(endorse); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java index 92babc9aa7f..83c8bdcfcad 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.transition; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -24,14 +21,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_Transition_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_Transition_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_Transition_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java index 34bf095b4ea..9dc87c7ba45 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.util; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -24,14 +21,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_Util_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_Util_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_Util_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java index 84e7407ad3e..ed9d9fe3f69 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.eclipse.osee.ats.core.workdef.provider.AtsCore_WorkDefProvider_JT_Suite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ + AtsCore_WorkDefProvider_JT_Suite.class, WorkDefinitionMatchTest.class, WorkDefinitionSheetTest.class, StateEventTypeTest.class, @@ -31,14 +30,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_WorkDef_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_WorkDef_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_WorkDef_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/AtsCore_WorkDefProvider_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/AtsCore_WorkDefProvider_JT_Suite.java index 71320bc26f3..185cad32f72 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/AtsCore_WorkDefProvider_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/AtsCore_WorkDefProvider_JT_Suite.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef.provider; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -24,14 +21,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_WorkDefProvider_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_WorkDefProvider_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_WorkDefProvider_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java index a389ba66fbd..51957a3267d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workflow; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -24,14 +21,5 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AtsCore_Workflow_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsCore_Workflow_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_Workflow_JT_Suite.class.getSimpleName()); - } + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java index 26dff8af9fc..0f6ebf9b315 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java @@ -36,10 +36,11 @@ import org.eclipse.osee.framework.logging.OseeLog; */ public class WorkStateProviderImpl implements WorkStateProvider { - protected IAtsNotificationListener listener; - WorkStateFactory factory; - List<WorkState> states = new LinkedList<WorkState>(); - String currentStateName; + private final WorkStateFactory factory; + private final List<WorkState> states = new LinkedList<WorkState>(); + + private IAtsNotificationListener listener; + private String currentStateName; /** * Creates a new StateData initialized with currentStateName as current state and sets assignees diff --git a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF index 71749e6c338..d8d62ded209 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF @@ -1,15 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ATS Work Definition Impl Test +Bundle-Name: ATS Work Definition Impl Test (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.impl.test -Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: Eclipse Open System Engineering Environment +Bundle-Version: 0.11.0.qualifier Fragment-Host: org.eclipse.osee.ats.impl Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: junit.framework;version="4.8.2", - org.eclipse.osee.ats.api.ai, - org.eclipse.osee.ats.api.data, - org.eclipse.osee.ats.api.team, - org.eclipse.osee.ats.api.workdef, - org.junit;version="4.8.2", - org.junit.runner;version="4.8.2", - org.junit.runners;version="4.8.2" +Import-Package: org.eclipse.osee.ats.api.workdef +Require-Bundle: org.junit, + org.mockito;bundle-version="1.9.0", + org.hamcrest.core, + org.objenesis + diff --git a/plugins/org.eclipse.osee.ats.impl.test/build.properties b/plugins/org.eclipse.osee.ats.impl.test/build.properties index 34d2e4d2dad..3b1eb2b27f6 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/build.properties +++ b/plugins/org.eclipse.osee.ats.impl.test/build.properties @@ -2,3 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . +additional.bundles = org.eclipse.osee.ats.api,\ + org.eclipse.osee.ats.mocks diff --git a/plugins/org.eclipse.osee.ats.impl.test/pom.xml b/plugins/org.eclipse.osee.ats.impl.test/pom.xml new file mode 100644 index 00000000000..b7b493f6b61 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.impl.test/pom.xml @@ -0,0 +1,31 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.ats.parent</artifactId> + <version>0.11.0-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.ats.impl.test</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>OSEE ATS WorkDef Impl Test(Incubation)</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.osee.ats.impl.test</testSuite> + <testClass>org.eclipse.osee.ats.impl.AllAtsImplTestSuite</testClass> + </configuration> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java new file mode 100644 index 00000000000..1c9f77be111 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.impl; + +import org.eclipse.osee.ats.impl.internal.convert.ConvertTestSuite; +import org.eclipse.osee.ats.impl.internal.model.ModelTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ConvertTestSuite.class, ModelTestSuite.class}) +public class AllAtsImplTestSuite { + // Test Suite +} diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertTestSuite.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertTestSuite.java new file mode 100644 index 00000000000..4e0954d715b --- /dev/null +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertTestSuite.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.impl.internal.convert; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Donald G. Dunne + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ConvertWorkDefinitionToAtsDslTest.class}) +public class ConvertTestSuite { + // Test Suite +} diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AtsCore_WorkDef_JT_Suite.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelTestSuite.java index a01d42c82af..77fa287a9d4 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AtsCore_WorkDef_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelTestSuite.java @@ -10,39 +10,29 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import org.eclipse.osee.ats.impl.internal.convert.ConvertWorkDefinitionToAtsDslTest; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; +/** + * @author Donald G. Dunne + */ @RunWith(Suite.class) @Suite.SuiteClasses({ - ConvertWorkDefinitionToAtsDslTest.class, + AbstractWorkDefItemTest.class, + CompositeStateItemTest.class, + DecisionReviewDefinitionTest.class, + DecisionReviewOptionTest.class, ModelUtilTest.class, - WidgetOptionTest.class, + PeerReviewDefinitionTest.class, StateDefinitionTest.class, WorkDefinitionTest.class, WidgetOptionHandlerTest.class, - WidgetDefinitionTest.class, - PeerReviewDefinitionTest.class, - DecisionReviewOptionTest.class, - DecisionReviewDefinitionTest.class, - AbstractWorkDefItemTest.class, - CompositeStateItemTest.class}) + WidgetOptionTest.class, + WidgetDefinitionTest.class}) /** - * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * * @author Donald G. Dunne */ -public class AtsCore_WorkDef_JT_Suite { - @BeforeClass - public static void setUp() throws Exception { - System.out.println("\n\nBegin " + AtsCore_WorkDef_JT_Suite.class.getSimpleName()); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsCore_WorkDef_JT_Suite.class.getSimpleName()); - } +public class ModelTestSuite { + // Test Suite } diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryTest.java deleted file mode 100644 index 5eaa263a0d1..00000000000 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Created on Oct 9, 2012 - * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ -package org.eclipse.osee.ats.impl.internal.query; - -import static org.junit.Assert.*; -import org.junit.Test; - -public class AtsQueryTest { - - @Test - public void testAtsQuery() { - fail("Not yet implemented"); - } - - @Test - public void testFrom() { - fail("Not yet implemented"); - } - - @Test - public void testIsOfType() { - fail("Not yet implemented"); - } - - @Test - public void testUnion() { - fail("Not yet implemented"); - } - - @Test - public void testFromTeam() { - fail("Not yet implemented"); - } - - @Test - public void testIsStateType() { - fail("Not yet implemented"); - } - - @Test - public void testGetItems() { - fail("Not yet implemented"); - } - - @Test - public void testWithOrValue() { - fail("Not yet implemented"); - } - -} diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF index 3c1eb140c31..594cfd05d65 100644 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ATS Implementation +Bundle-Name: ATS Implementation (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.impl;singleton:=true Bundle-Version: 0.11.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItem.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItem.java index cc2b9aff91c..8667af32004 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItem.java +++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItem.java @@ -42,4 +42,5 @@ public class AbstractWorkDefItem { public String toString() { return getName(); } + } diff --git a/plugins/org.eclipse.osee.ats.parent/pom.xml b/plugins/org.eclipse.osee.ats.parent/pom.xml index bc7cfe1e1e1..f6a24464838 100644 --- a/plugins/org.eclipse.osee.ats.parent/pom.xml +++ b/plugins/org.eclipse.osee.ats.parent/pom.xml @@ -9,7 +9,7 @@ <version>0.11.0-SNAPSHOT</version> <relativePath>../../plugins/org.eclipse.osee.ide.parent</relativePath> </parent> - + <groupId>org.eclipse.osee</groupId> <artifactId>org.eclipse.osee.ats.parent</artifactId> <packaging>pom</packaging> @@ -17,20 +17,26 @@ <version>0.11.0-SNAPSHOT</version> <modules> - <module>../../plugins/org.eclipse.osee.ats.mocks</module> + <module>../../plugins/org.eclipse.osee.support.test.util</module> + + <module>../../plugins/org.eclipse.osee.ats.mocks</module> <module>../../plugins/org.eclipse.osee.ats.help.ui</module> <module>../../plugins/org.eclipse.osee.ats</module> <module>../../plugins/org.eclipse.osee.ats.core</module> + <module>../../plugins/org.eclipse.osee.ats.core.test</module> <module>../../plugins/org.eclipse.osee.ats.core.client</module> + <module>../../plugins/org.eclipse.osee.ats.core.client.test</module> <module>../../plugins/org.eclipse.osee.ats.dsl</module> - <module>../../plugins/org.eclipse.osee.ats.dsl.ui</module> + <module>../../plugins/org.eclipse.osee.ats.dsl.ui</module> <module>../../plugins/org.eclipse.osee.ats.impl</module> - <module>../../plugins/org.eclipse.osee.ats.client.demo</module> + <module>../../plugins/org.eclipse.osee.ats.impl.test</module> - <module>../../plugins/org.eclipse.osee.ats.reports</module> - <module>../../plugins/org.eclipse.osee.ats.reports.burndown</module> - <module>../../plugins/org.eclipse.osee.ats.reports.efficiency</module> - <module>../../plugins/org.eclipse.osee.ats.reports.split</module> + <module>../../plugins/org.eclipse.osee.ats.reports</module> + <module>../../plugins/org.eclipse.osee.ats.reports.burndown</module> + <module>../../plugins/org.eclipse.osee.ats.reports.efficiency</module> + <module>../../plugins/org.eclipse.osee.ats.reports.split</module> + + <module>../../plugins/org.eclipse.osee.ats.client.demo</module> <module>../../features/org.eclipse.osee.ats.feature</module> <module>../../features/org.eclipse.osee.ats.feature.source</module> @@ -38,6 +44,8 @@ <module>../../features/org.eclipse.osee.ats.client.demo.feature</module> <module>../../features/org.eclipse.osee.ats.client.demo.feature.source</module> + <module>../../plugins/org.eclipse.osee.ats.client.integration.tests</module> + <module>../../plugins/org.eclipse.osee.ats.p2</module> </modules> diff --git a/plugins/org.eclipse.osee.ats.test/.classpath b/plugins/org.eclipse.osee.ats.test/.classpath deleted file mode 100644 index ad32c83a788..00000000000 --- a/plugins/org.eclipse.osee.ats.test/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/plugins/org.eclipse.osee.ats.test/.project b/plugins/org.eclipse.osee.ats.test/.project deleted file mode 100644 index ab2ea44f594..00000000000 --- a/plugins/org.eclipse.osee.ats.test/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.osee.ats.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/plugins/org.eclipse.osee.ats.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.test/META-INF/MANIFEST.MF deleted file mode 100644 index 70a33858130..00000000000 --- a/plugins/org.eclipse.osee.ats.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: ATS Test Fragment -Bundle-SymbolicName: org.eclipse.osee.ats.test;singleton:=true -Bundle-Version: 0.11.0.qualifier -Bundle-Vendor: Eclipse Open System Engineering Environment -Fragment-Host: org.eclipse.osee.ats -Require-Bundle: org.junit -Import-Package: org.eclipse.osee.ats.core.client, - org.eclipse.osee.ats.core.model, - org.eclipse.osee.ats.mocks, - org.eclipse.osee.framework.core.client, - org.eclipse.osee.framework.core.model.type, - org.eclipse.osee.support.test.util -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.osee.ats, - org.eclipse.osee.ats.artifact, - org.eclipse.osee.ats.artifact.log, - org.eclipse.osee.ats.artifact.note, - org.eclipse.osee.ats.config, - org.eclipse.osee.ats.editor, - org.eclipse.osee.ats.health, - org.eclipse.osee.ats.navigate, - org.eclipse.osee.ats.render, - org.eclipse.osee.ats.util, - org.eclipse.osee.ats.workflow, - org.eclipse.osee.ats.world.search diff --git a/plugins/org.eclipse.osee.ats.test/build.properties b/plugins/org.eclipse.osee.ats.test/build.properties deleted file mode 100644 index 34d2e4d2dad..00000000000 --- a/plugins/org.eclipse.osee.ats.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java deleted file mode 100644 index 44d21ca0685..00000000000 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats; - -import org.eclipse.osee.ats.config.copy.ConfigDataTest; -import org.eclipse.osee.ats.config.copy.CopyAtsConfigurationOperationTest; -import org.eclipse.osee.ats.config.copy.CopyAtsUtilTest; -import org.eclipse.osee.ats.config.copy.CopyAtsValidationTest; -import org.eclipse.osee.ats.core.client.config.AtsCoreClient_Config_Demo_PT_Suite; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - ConfigDataTest.class, - CopyAtsUtilTest.class, - CopyAtsValidationTest.class, - CopyAtsConfigurationOperationTest.class, - AtsCoreClient_Config_Demo_PT_Suite.class}) -/** - * This test suite contains test that can be run against any production db - * - * @author Donald G. Dunne - */ -public class AtsTest_Demo_Config_Suite { - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - System.out.println("\n\nBegin " + AtsTest_Demo_Config_Suite.class.getSimpleName()); - DemoTestUtil.setUpTest(); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Config_Suite.class.getSimpleName()); - } -} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java deleted file mode 100644 index b9886731704..00000000000 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats; - -import static org.junit.Assert.assertTrue; -import org.eclipse.osee.ats.actions.AtsTest_Demo_Action_Suite; -import org.eclipse.osee.ats.artifact.log.AtsLogTest; -import org.eclipse.osee.ats.artifact.log.LogItemTest; -import org.eclipse.osee.ats.artifact.note.AtsNoteTest; -import org.eclipse.osee.ats.artifact.note.NoteItemTest; -import org.eclipse.osee.ats.config.AtsBranchConfigurationTest; -import org.eclipse.osee.ats.editor.SMAPrintTest; -import org.eclipse.osee.ats.health.AtsValidateAtsDatabaseTest; -import org.eclipse.osee.ats.navigate.AtsNavigateItemsToMassEditorTest; -import org.eclipse.osee.ats.navigate.AtsNavigateItemsToTaskEditorTest; -import org.eclipse.osee.ats.navigate.AtsNavigateItemsToWorldViewTest; -import org.eclipse.osee.ats.render.RendererManagerTest; -import org.eclipse.osee.ats.util.AtsDeleteManagerTest; -import org.eclipse.osee.ats.util.AtsImageTest; -import org.eclipse.osee.ats.util.AtsXWidgetsExampleBlamTest; -import org.eclipse.osee.ats.util.DemoTestUtil; -import org.eclipse.osee.ats.util.ImportActionsViaSpreadsheetTest; -import org.eclipse.osee.ats.workflow.SMAPromptChangeStatusTest; -import org.eclipse.osee.ats.world.search.AtsTest_Demo_World_Search_Suite; -import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - AtsNavigateItemsToMassEditorTest.class, - AtsNavigateItemsToTaskEditorTest.class, - AtsNavigateItemsToWorldViewTest.class, - AtsTest_Demo_World_Search_Suite.class, - AtsBranchConfigurationTest.class, - AtsTest_Demo_Action_Suite.class, - AtsTest_Demo_Access_Suite.class, - ImportActionsViaSpreadsheetTest.class, - AtsTest_Demo_Column_Suite.class, - AtsTest_Demo_Util_Suite.class, - LogItemTest.class, - AtsLogTest.class, - NoteItemTest.class, - AtsNoteTest.class, - RendererManagerTest.class, - SMAPrintTest.class, - AtsImageTest.class, - SMAPromptChangeStatusTest.class, - AtsDeleteManagerTest.class, - AtsValidateAtsDatabaseTest.class, - AtsXWidgetsExampleBlamTest.class, -// AtsPurgeTest.class, -// -}) -/** - * @author Donald G. Dunne - */ -public class AtsTest_Demo_Suite { - - @BeforeClass - public static void setUp() throws Exception { - OseeProperties.setIsInTest(true); - assertTrue("Demo Application Server must be running.", - ClientSessionManager.getAuthenticationProtocols().contains("demo")); - assertTrue("Client must authenticate using demo protocol", - ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); - System.out.println("\n\nBegin " + AtsTest_Demo_Suite.class.getSimpleName()); - DemoTestUtil.setUpTest(); - } - - @AfterClass - public static void tearDown() throws Exception { - System.out.println("End " + AtsTest_Demo_Suite.class.getSimpleName()); - } -} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java deleted file mode 100644 index b8b8a19989e..00000000000 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.util; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import java.util.Arrays; -import java.util.Collection; -import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; -import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.world.search.MyWorldSearchItem; -import org.eclipse.osee.ats.world.search.TeamWorldSearchItem; -import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; - -/** - * @author Andrew M. Finkbeiner - */ -public class AtsQueryPerformanceTests { - - @org.junit.Test - public void testAtsBulkLoad() throws Exception { - long startTime = System.currentTimeMillis(); - AtsBulkLoad.loadConfig(true); - long elapsedTime = System.currentTimeMillis() - startTime; - System.out.println(String.format("testAtsBulkLoad took %dms", elapsedTime)); - assertTrue("testAtsBulkLoad should take less than 5000ms currently " + elapsedTime + "ms", elapsedTime < 5000); - } - - @org.junit.Test - public void testTeamWorldSearchItem() throws Exception { - AtsBulkLoad.loadConfig(true); - TeamWorldSearchItem searchItem = - new TeamWorldSearchItem("Show Open OSEE Actions", Arrays.asList("ATS", "Define", "OTE"), false, false, true, - false, null, null, null, null, null); - long startTime = System.currentTimeMillis(); - Collection<Artifact> artifacts = searchItem.performSearch(SearchType.Search); - long elapsedTime = System.currentTimeMillis() - startTime; - System.out.println(String.format("testTeamWorldSearchItem took %dms for %d artifacts", elapsedTime, - artifacts.size())); - assertTrue("No artifacts found", artifacts.size() > 0); - assertTrue("testTeamWorldSearchItem should take less than 2000ms; took " + elapsedTime + "ms", elapsedTime < 2000); - } - - @org.junit.Test - public void testUserWorldSearch() throws Exception { - AtsBulkLoad.loadConfig(true); - IAtsUser user = AtsUsersClient.getUserByName("Finkbeiner, Andrew M"); - assertNotNull("User does not exist", user); - MyWorldSearchItem search = new MyWorldSearchItem(); - long startTime = System.currentTimeMillis(); - Collection<Artifact> artifacts = search.searchIt(user); - long elapsedTime = System.currentTimeMillis() - startTime; - System.out.println(String.format("testUserWorldSearch took %dms for %d artifacts", elapsedTime, artifacts.size())); - assertTrue("No artifacts found", artifacts.size() > 0); - assertTrue("testUserWorldSearch should take less than 2500ms currently " + elapsedTime + "ms", elapsedTime < 2500); - } - -} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/MassEditorUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/MassEditorUtil.java deleted file mode 100644 index 9b35647ece8..00000000000 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/MassEditorUtil.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.util; - -import static org.junit.Assert.assertTrue; -import java.util.Collection; -import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; - -/** - * @author Donald G. Dunne - */ -public class MassEditorUtil { - - public static MassArtifactEditor getSingleEditorOrFail() { - // Retrieve results from opened editor and test - Collection<MassArtifactEditor> editors = MassArtifactEditor.getEditors(); - assertTrue("Expecting 1 editor open, currently " + editors.size(), editors.size() == 1); - return editors.iterator().next(); - } - -} diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java deleted file mode 100644 index 1f8e1e4d57d..00000000000 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.util; - -import java.util.Arrays; -import java.util.Collection; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.client.workflow.AtsWorkStateFactory; -import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; -import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; -import org.junit.Assert; - -/** - * @author Donald G. Dunne - */ -public class SMATestUtil { - - public static void validateSMA(AbstractWorkflowArtifact sma, String stateName, int totalPercent, double hoursSpent) throws Exception { - validateSMAs(Arrays.asList(sma), stateName, totalPercent, hoursSpent); - - } - - public static void validateSMAs(Collection<? extends AbstractWorkflowArtifact> awas, String stateName, int totalPercent, double hoursSpent) throws Exception { - for (AbstractWorkflowArtifact awa : awas) { - Assert.assertEquals("Current State wrong for " + awa.getHumanReadableId(), - awa.getStateMgr().getCurrentStateName(), stateName); - if (awa.isCompletedOrCancelled()) { - Assert.assertEquals("ats.CurrentState wrong " + awa.getHumanReadableId(), - awa.getStateMgr().getCurrentStateName() + ";;;", - awa.getSoleAttributeValue(AtsAttributeTypes.CurrentState)); - } - Assert.assertEquals("Percent wrong for " + awa.getHumanReadableId(), - PercentCompleteTotalUtil.getPercentCompleteTotal(awa), totalPercent); - Assert.assertEquals("Hours Spent wrong for " + awa.getHumanReadableId(), - HoursSpentUtil.getHoursSpentTotal(awa), hoursSpent, 0.0); - - for (String xml : awa.getAttributesToStringList(AtsAttributeTypes.State)) { - WorkStateImpl state = AtsWorkStateFactory.getFromXml(xml); - boolean isCompletedCancelledState = isCompletedCancelledState(awa, state.getName()); - if (isCompletedCancelledState) { - Assert.assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(), - xml.endsWith(";;;")); - } - } - } - } - - public static boolean isCompletedCancelledState(AbstractWorkflowArtifact aba, String stateName) { - return aba.getWorkDefinition().getStateByName(stateName).getStateType().isCompletedOrCancelledState(); - } -} diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF index 42a980b72ae..8688d033e8c 100644 --- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF @@ -38,6 +38,7 @@ Export-Package: org.eclipse.osee.ats, org.eclipse.osee.ats.config.copy, org.eclipse.osee.ats.config.wizard, org.eclipse.osee.ats.editor, + org.eclipse.osee.ats.editor.renderer, org.eclipse.osee.ats.editor.stateItem, org.eclipse.osee.ats.export, org.eclipse.osee.ats.health, diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAMembersTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAMembersTab.java index 2a5ab9ef1f8..6e7fbcba751 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAMembersTab.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAMembersTab.java @@ -154,15 +154,17 @@ public class SMAMembersTab extends FormPage implements IWorldViewerEventHandler public IStatus runInUIThread(IProgressMonitor monitor) { if (firstTime) { try { - updateTitleBar(); - setLoading(false); - boolean createdAndLoaded = createMembersBody(); - if (!createdAndLoaded) { - smaGoalMembersSection.reload(); + if (managedForm != null && Widgets.isAccessible(managedForm.getForm())) { + updateTitleBar(); + setLoading(false); + boolean createdAndLoaded = createMembersBody(); + if (!createdAndLoaded) { + smaGoalMembersSection.reload(); + } + jumptoScrollLocation(); + FormsUtil.addHeadingGradient(editor.getToolkit(), managedForm.getForm(), true); + editor.onDirtied(); } - jumptoScrollLocation(); - FormsUtil.addHeadingGradient(editor.getToolkit(), managedForm.getForm(), true); - editor.onDirtied(); firstTime = false; } catch (OseeCoreException ex) { handleException(ex); @@ -174,8 +176,12 @@ public class SMAMembersTab extends FormPage implements IWorldViewerEventHandler updateTitleBar(); } catch (OseeCoreException ex) { handleException(ex); + } finally { + showBusy(false); + } + if (managedForm != null && Widgets.isAccessible(managedForm.getForm())) { + smaGoalMembersSection.refresh(); } - smaGoalMembersSection.refresh(); } return Status.OK_STATUS; } |