Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-07-21 19:48:51 -0400
committerRoberto E. Escobar2014-08-28 19:59:37 -0400
commitd0fe47df4dbfcf28443380c4ad8b7e2f8d1a0a63 (patch)
tree447e54b6ed6a86d1e52e59522f6548f82504cefa /plugins/org.eclipse.osee.orcs.core.test
parent9b38953459291fd0aec45887e63e4e460030fda9 (diff)
downloadorg.eclipse.osee-d0fe47df4dbfcf28443380c4ad8b7e2f8d1a0a63.tar.gz
org.eclipse.osee-d0fe47df4dbfcf28443380c4ad8b7e2f8d1a0a63.tar.xz
org.eclipse.osee-d0fe47df4dbfcf28443380c4ad8b7e2f8d1a0a63.zip
bug[ats_ATS64228]: Server side relations undelete issue
During transactions, server side code fails to see undeleted items if artifacts are pre-loaded and used as writeables for the transaction. Change-Id: Iaf01dfa42d0260e47ea289166013c414a7626f31
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.core.test')
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
index 2a699f9a6f..95ae043cdf 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
@@ -240,6 +240,7 @@ public class TxDataManagerTest {
public void testGetForWriteReadableButIsFromDifferentBranch() throws OseeCoreException {
when(readable1.getBranch()).thenReturn(CoreBranches.COMMON);
when(txData.getWriteable(readable1)).thenReturn(null);
+ when(proxyManager.asInternalArtifact(readable1)).thenReturn(artifact1);
ResultSet<Artifact> loaded = ResultSets.singleton(artifact1);
when(loader.loadArtifacts(eq(session), eq(graph), anyCollectionOf(ArtifactId.class))).thenReturn(loaded);
@@ -247,7 +248,8 @@ public class TxDataManagerTest {
Artifact actual = txDataManager.getForWrite(txData, readable1);
verify(txData).getWriteable(readable1);
- verify(readable1).getBranch();
+ verify(proxyManager).asInternalArtifact(readable1);
+ verify(artifact1).getBranch();
verify(loader).loadArtifacts(eq(session), eq(graph), idCaptor.capture());
assertEquals(readable1, idCaptor.getValue().iterator().next());

Back to the top