Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjphillips2011-03-08 12:35:05 -0500
committerRyan D. Brooks2011-03-08 12:35:05 -0500
commitc3d79217096c003de261d0f4dc8d38078e3c0913 (patch)
treee25faaef6645cb8f514ade2fcb4fd3be86d37973 /plugins/org.eclipse.osee.framework.skynet.core.test
parentb27c61f67c111c055430c91987f2171195a68d8f (diff)
downloadorg.eclipse.osee-c3d79217096c003de261d0f4dc8d38078e3c0913.tar.gz
org.eclipse.osee-c3d79217096c003de261d0f4dc8d38078e3c0913.tar.xz
org.eclipse.osee-c3d79217096c003de261d0f4dc8d38078e3c0913.zip
refactor: Separate access control refresh cache logic from purge branch
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
index 42775a0d61..ee68c7d791 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
@@ -15,7 +15,9 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import junit.framework.Assert;
+
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
@@ -134,10 +136,6 @@ public class BranchEventTest {
ConflictManagerExternal conflictManager = new ConflictManagerExternal(topLevel, workingBranch);
BranchManager.commitBranch(null, conflictManager, true, true);
- // if (isRemoteTest()) {
- // Thread.sleep(2000);
- // }
-
Assert.assertNotNull(resultBranchEvent);
Assert.assertEquals(BranchEventType.Committed, resultBranchEvent.getEventType());
if (isRemoteTest()) {
@@ -164,10 +162,6 @@ public class BranchEventTest {
BranchManager.purgeBranchPending(workingBranch);
- // if (isRemoteTest()) {
- // Thread.sleep(2000);
- // }
-
Assert.assertNotNull(resultBranchEvent);
Assert.assertEquals(BranchEventType.Purged, resultBranchEvent.getEventType());
if (isRemoteTest()) {

Back to the top