Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-08-26 19:24:51 +0000
committerrescobar2010-08-26 19:24:51 +0000
commitc711dbb0766c4af335ae2f0f6011e0ae2b85654d (patch)
tree9ea377d7f7ab735f4ff75105bae3a300d3ca291b /plugins/org.eclipse.osee.framework.skynet.core.test
parenta6133c15531631aab9f824eeb2be337eddddf947 (diff)
downloadorg.eclipse.osee-c711dbb0766c4af335ae2f0f6011e0ae2b85654d.tar.gz
org.eclipse.osee-c711dbb0766c4af335ae2f0f6011e0ae2b85654d.tar.xz
org.eclipse.osee-c711dbb0766c4af335ae2f0f6011e0ae2b85654d.zip
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/cases/ConflictTest.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
index 7b7275f3cd..ddd324da44 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
/**
* @author Jeff C. Phillips
@@ -86,7 +85,6 @@ public class ConflictTest {
* {@link org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal#getConflictsPerBranch(org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.skynet.core.transaction.TransactionId)}
* .
*/
- @Ignore
@org.junit.Test
public void testGetConflictsPerBranch() {
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
@@ -113,7 +111,6 @@ public class ConflictTest {
*
* @throws Exception
*/
- @Ignore
@org.junit.Test
public void testGetMergeBranchCreated() throws Exception {
runMergeBranchCreated();

Back to the top