diff options
| author | David W. Miller | 2016-02-09 16:48:48 +0000 |
|---|---|---|
| committer | David Miller | 2016-02-10 20:24:48 +0000 |
| commit | 8b396aa891cc81db57d409655dc24c1143119075 (patch) | |
| tree | 651a77271592410387d2411c0e9a6bd32cf895ca /plugins/org.eclipse.osee.client.integration.tests/src | |
| parent | fbb119ec50ee190493b6b124c76b8f4a5f169497 (diff) | |
| download | org.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.tar.gz org.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.tar.xz org.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.zip | |
bug[ats_ATS265142]: Update sql for conflict multiplicity detection0.23.1.v201602182221_NRB
Change-Id: Ifdcb4c1e3aad76866adabb5296bfaddce802aa34
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests/src')
| -rw-r--r-- | plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java index bb7bc754531..9c60f1ae41c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java @@ -46,6 +46,7 @@ import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal; import org.eclipse.osee.framework.skynet.core.conflict.RelationConflict; import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal; import org.eclipse.osee.framework.skynet.core.utility.ConnectionHandler; +import org.eclipse.osee.framework.skynet.core.utility.OseeInfo; import org.eclipse.osee.jdbc.JdbcStatement; import org.junit.AfterClass; import org.junit.Assert; @@ -242,6 +243,9 @@ public class ConflictTest { Assert.assertNotEquals(child1AttrId, child2AttrId); + // enable multiplicity conflict checking + OseeInfo.setValue("osee.disable.multiplicity.conflicts", "false"); + mgr = new ConflictManagerExternal(parent, child2); Assert.assertTrue(mgr.originalConflictsExist()); List<Conflict> conflicts = mgr.getOriginalConflicts(); |