Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch51
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java28
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java10
3 files changed, 68 insertions, 21 deletions
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
index 6ce7ed4269..7b63c99747 100644
--- 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
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<setAttribute key="additional_plugins">
-<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.15.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.osee.client.integration.tests:0.15.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.osee.client.test.framework:0.15.0.qualifier:default:true"/>
+<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.16.0.qualifier:default:true"/>
+<setEntry value="org.eclipse.osee.client.integration.tests:0.16.0.qualifier:default:true"/>
+<setEntry value="org.eclipse.osee.client.test.framework:0.16.0.qualifier:default:true"/>
</setAttribute>
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="false"/>
@@ -41,17 +41,62 @@
<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="de.itemis.xtext.antlr.feature:default"/>
+<setEntry value="de.itemis.xtext.antlr.sdk:default"/>
+<setEntry value="de.itemis.xtext.antlr.source.feature:default"/>
+<setEntry value="org.eclipse.cvs.source:default"/>
+<setEntry value="org.eclipse.cvs:default"/>
+<setEntry value="org.eclipse.e4.rcp.source:default"/>
+<setEntry value="org.eclipse.e4.rcp:default"/>
+<setEntry value="org.eclipse.emf.common:default"/>
+<setEntry value="org.eclipse.emf.compare:default"/>
+<setEntry value="org.eclipse.emf.ecore:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
+<setEntry value="org.eclipse.help.source:default"/>
+<setEntry value="org.eclipse.help:default"/>
+<setEntry value="org.eclipse.jdt.source:default"/>
+<setEntry value="org.eclipse.jdt:default"/>
+<setEntry value="org.eclipse.nebula.widgets.ganttchart.feature:default"/>
+<setEntry value="org.eclipse.nebula.widgets.xviewer.feature:default"/>
<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.platform.source:default"/>
+<setEntry value="org.eclipse.platform:default"/>
+<setEntry value="org.eclipse.rcp.source:default"/>
+<setEntry value="org.eclipse.rcp:default"/>
<setEntry value="org.eclipse.sdk:default"/>
+<setEntry value="org.eclipse.xtend.sdk:default"/>
+<setEntry value="org.eclipse.xtext.docs:default"/>
+<setEntry value="org.eclipse.xtext.examples.source:default"/>
+<setEntry value="org.eclipse.xtext.examples:default"/>
+<setEntry value="org.eclipse.xtext.runtime.source:default"/>
+<setEntry value="org.eclipse.xtext.runtime:default"/>
+<setEntry value="org.eclipse.xtext.sdk:default"/>
+<setEntry value="org.eclipse.xtext.ui.source:default"/>
+<setEntry value="org.eclipse.xtext.ui:default"/>
+<setEntry value="org.eclipse.xtext.xbase.lib.source:default"/>
+<setEntry value="org.eclipse.xtext.xbase.lib:default"/>
+<setEntry value="org.eclipse.xtext.xbase.source:default"/>
+<setEntry value="org.eclipse.xtext.xbase:default"/>
+<setEntry value="org.eclipse.xtext.xtext.ui.source:default"/>
+<setEntry value="org.eclipse.xtext.xtext.ui:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="timestamp" value="1354263054730"/>
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 3b063f9294..2ddced2e71 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -97,10 +97,11 @@ public class AtsNotificationManagerTest {
UserManager.getUser(DemoUsers.Alex_Kay).persist(getClass().getSimpleName());
// reset the originator
+ AtsChangeSet changes = new AtsChangeSet("Change Originator");
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Alex_Kay), false,
- new Date());
+ new Date(), changes);
// persist will kick event which will log the notification event and send
- teamArt.persist("Change originator");
+ changes.execute();
// verify notification exists now
Assert.assertEquals(1, mgr.getNotificationEvents().size());
@@ -113,7 +114,7 @@ public class AtsNotificationManagerTest {
// reset the originator back to joe smith
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Joe_Smith), false,
- new Date());
+ new Date(), changes);
// persist will kick event which will log the notification event and send
teamArt.persist("Change originator");
AtsNotificationManager.setInTest(true);
@@ -128,7 +129,7 @@ public class AtsNotificationManagerTest {
// reset the originator
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Alex_Kay), false,
- new Date());
+ new Date(), changes);
// persist will kick event which will log the notification event and send
teamArt.persist("Change originator");
@@ -141,7 +142,7 @@ public class AtsNotificationManagerTest {
// reset the originator back to joe smith
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Joe_Smith), false,
- new Date());
+ new Date(), changes);
// persist will kick event which will log the notification event and send
teamArt.persist("Change originator");
AtsNotificationManager.setInTest(true);
@@ -156,7 +157,7 @@ public class AtsNotificationManagerTest {
// reset the originator
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Alex_Kay), false,
- new Date());
+ new Date(), changes);
// persist will kick event which will log the notification event and send
teamArt.persist("Change originator");
@@ -291,10 +292,10 @@ public class AtsNotificationManagerTest {
// set originator as Alex Kay
TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
+ AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName() + " - set originator");
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Alex_Kay), false,
- new Date());
-
- AtsChangeSet.execute(getClass().getSimpleName() + " - set originator", teamArt);
+ new Date(), changes);
+ changes.execute();
// set alex kay having valid email address
User user = UserManager.getUser(DemoUsers.Alex_Kay);
@@ -304,7 +305,7 @@ public class AtsNotificationManagerTest {
// verify no notification events yet
Assert.assertEquals(0, mgr.getNotificationEvents().size());
- AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName());
+ changes.reset(getClass().getSimpleName());
Result result =
AtsTestUtil.transitionTo(AtsTestUtilState.Completed, AtsClientService.get().getUserAdmin().getCurrentUser(),
changes, TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
@@ -334,9 +335,10 @@ public class AtsNotificationManagerTest {
// set originator as Alex Kay
TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
+ AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName() + " - set originator");
teamArt.setCreatedBy(AtsClientService.get().getUserAdmin().getUserFromToken(DemoUsers.Alex_Kay), false,
- new Date());
- AtsChangeSet.execute(getClass().getSimpleName() + " - set originator", teamArt);
+ new Date(), changes);
+ changes.execute();
// set alex kay having valid email address
User user = UserManager.getUser(DemoUsers.Alex_Kay);
@@ -346,7 +348,7 @@ public class AtsNotificationManagerTest {
// verify no notification events yet
Assert.assertEquals(0, mgr.getNotificationEvents().size());
- AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName());
+ changes.reset(getClass().getSimpleName());
Result result =
AtsTestUtil.transitionTo(AtsTestUtilState.Cancelled, AtsClientService.get().getUserAdmin().getCurrentUser(),
changes, TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 c41b6226a8..3171ad60b7 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -110,7 +110,7 @@ public class AtsNotifyUsersTest {
AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName());
TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
teamArt.setName(AtsNotifyUsersTest.class.getSimpleName() + "-testNotify");
- teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail));
+ teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail), changes);
List<User> assignees = new ArrayList<User>();
assignees.addAll(Arrays.asList(inactiveSteve, alex_NoValidEmail, jason_ValidEmail, kay_ValidEmail,
joeSmith_CurrentUser));
@@ -129,11 +129,11 @@ public class AtsNotifyUsersTest {
event.getDescription());
notifyManager.clear();
- teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(inactiveSteve));
+ teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(inactiveSteve), changes);
teamArt.persist(getClass().getSimpleName());
AtsNotificationManager.notify(teamArt, AtsNotifyType.Originator);
Assert.assertEquals(0, notifyManager.getNotificationEvents().size());
- teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail));
+ teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail), changes);
teamArt.persist(getClass().getSimpleName());
notifyManager.clear();
@@ -198,13 +198,13 @@ public class AtsNotifyUsersTest {
event.getDescription());
notifyManager.clear();
- teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(inactiveSteve));
+ teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(inactiveSteve), changes);
teamArt.persist(getClass().getSimpleName());
StateManagerUtility.initializeStateMachine(teamArt.getStateMgr(), TeamState.Completed, null,
AtsClientService.get().getUserAdmin().getCurrentUser(), changes);
AtsNotificationManager.notify(teamArt, AtsNotifyType.Completed);
Assert.assertEquals(0, notifyManager.getNotificationEvents().size());
- teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail));
+ teamArt.internalSetCreatedBy(AtsClientService.get().getUserAdmin().getUserFromOseeUser(kay_ValidEmail), changes);
teamArt.persist(getClass().getSimpleName());
notifyManager.clear();

Back to the top