Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2013-12-04 02:56:01 +0000
committerGerrit Code Review @ Eclipse.org2013-12-05 22:28:12 +0000
commit1b72f67088035edd1b438dd0152b1bf24b437856 (patch)
tree78141ac8d3b199f3fc414478c7ac069bb5d13985 /plugins/org.eclipse.osee.ats.client.integration.tests/src
parent39e025164fe358dc8748763da5e32beb8d5fee94 (diff)
downloadorg.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.tar.gz
org.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.tar.xz
org.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.zip
refactor: Rename AtsUtilCore to AtsUtilClient
Diffstat (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests/src')
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java9
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java12
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java2
6 files changed, 17 insertions, 16 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 f7a9749d85..54b505d25e 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -49,7 +49,7 @@ 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.core.client.util.AtsChangeSet;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
+import org.eclipse.osee.ats.core.client.util.AtsUtilClient;
import org.eclipse.osee.ats.core.client.workflow.ChangeType;
import org.eclipse.osee.ats.core.config.AtsVersionService;
import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption;
@@ -505,7 +505,7 @@ public class AtsTestUtil {
public static void cleanupSimpleTest(Collection<String> titles) throws Exception {
List<Artifact> artifacts = new ArrayList<Artifact>();
for (String title : titles) {
- artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED,
+ artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsUtilClient.getAtsBranch(), EXCLUDE_DELETED,
QueryOptions.CONTAINS_MATCH_OPTIONS));
}
Operations.executeWorkAndCheckStatus(new PurgeArtifacts(artifacts));
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 f39e5ecf30..52e316fb76 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -19,8 +19,8 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes;
import org.eclipse.osee.ats.api.version.IAtsVersion;
import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
import org.eclipse.osee.ats.core.client.util.AtsChangeSet;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
import org.eclipse.osee.ats.core.config.IAtsConfig;
+import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
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 2ddced2e71..e46dda8066 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
@@ -33,8 +33,9 @@ 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.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.core.client.util.AtsChangeSet;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
+import org.eclipse.osee.ats.core.client.util.AtsUtilClient;
import org.eclipse.osee.ats.core.client.workflow.ChangeType;
+import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.ats.core.workflow.state.TeamState;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.util.Result;
@@ -57,7 +58,7 @@ public class AtsNotificationManagerTest {
@BeforeClass
public static void setup() {
- AtsUtilCore.setEmailEnabled(true);
+ AtsUtilClient.setEmailEnabled(true);
}
@AfterClass
@@ -69,7 +70,7 @@ public class AtsNotificationManagerTest {
AtsNotificationManager.setInTest(true);
AtsTestUtil.cleanup();
- AtsUtilCore.setEmailEnabled(false);
+ AtsUtilClient.setEmailEnabled(false);
}
@org.junit.Test
@@ -400,7 +401,7 @@ public class AtsNotificationManagerTest {
changes.execute();
SkynetTransaction transaction2 =
- TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
+ TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), getClass().getSimpleName());
actionArt.getTeams().iterator().next().deleteAndPersist(transaction2);
actionArt.deleteAndPersist(transaction2);
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 3171ad60b7..23ba6d3759 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
@@ -28,7 +28,7 @@ import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager.Configurat
import org.eclipse.osee.ats.core.client.notify.AtsNotifyUsers;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.core.client.util.AtsChangeSet;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
+import org.eclipse.osee.ats.core.client.util.AtsUtilClient;
import org.eclipse.osee.ats.core.client.util.SubscribeManager;
import org.eclipse.osee.ats.core.client.workflow.ChangeType;
import org.eclipse.osee.ats.core.config.ActionableItems;
@@ -57,7 +57,7 @@ import org.junit.Assert;
public class AtsNotifyUsersTest {
@org.junit.BeforeClass
public static void setup() throws OseeCoreException {
- AtsUtilCore.setEmailEnabled(true);
+ AtsUtilClient.setEmailEnabled(true);
AtsTestUtil.cleanupAndReset(AtsNotificationManagerTest.class.getSimpleName());
cleanUpAction();
}
@@ -72,18 +72,18 @@ public class AtsNotifyUsersTest {
AtsTestUtil.cleanup();
cleanUpAction();
- AtsUtilCore.setEmailEnabled(false);
+ AtsUtilClient.setEmailEnabled(false);
AtsTestUtil.validateArtifactCache();
- AtsUtilCore.setEmailEnabled(false);
+ AtsUtilClient.setEmailEnabled(false);
}
private static void cleanUpAction() throws OseeCoreException {
SkynetTransaction changes =
- TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), AtsNotifyUsersTest.class.getSimpleName());
+ TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), AtsNotifyUsersTest.class.getSimpleName());
for (Artifact art : ArtifactQuery.getArtifactListFromAttribute(CoreAttributeTypes.Name,
- AtsNotifyUsersTest.class.getSimpleName(), AtsUtilCore.getAtsBranch(), QueryOptions.CONTAINS_MATCH_OPTIONS)) {
+ AtsNotifyUsersTest.class.getSimpleName(), AtsUtilClient.getAtsBranch(), QueryOptions.CONTAINS_MATCH_OPTIONS)) {
art.deleteAndPersist(changes);
}
changes.execute();
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 9b5bed931c..8a66d16581 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -21,7 +21,7 @@ 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.AtsChangeSet;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
+import org.eclipse.osee.ats.core.client.util.AtsUtilClient;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -46,7 +46,7 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager {
public static void cleanup() throws Exception {
AtsTestUtil.cleanup();
SkynetTransaction transaction =
- TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
+ TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(),
PeerToPeerReviewManagerTest.class.getSimpleName());
for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.PeerToPeerReview,
"PeerToPeerReviewManagerTest", AtsUtil.getAtsBranchToken(), QueryOptions.CONTAINS_MATCH_OPTIONS)) {
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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 f32cf3d4de..4134e4f48b 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/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
@@ -16,9 +16,9 @@ import java.util.List;
import java.util.Map;
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.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;

Back to the top