git.iko.soy/project-m36
on master help sign in
compilation checkpoint- merge tests passing
dcb8584AgentM
ProjectM36/TransactionGraph.hs+1−1
compare with master
unifiedsplit
@@ -315,7 +315,7 @@ pathToTransaction graph currentTransaction targetTransaction accumTransSet = do
315 if length currentTransChildren == 0 then
315 if length currentTransChildren == 0 then
316 Left (FailedToFindTransactionError targetId)
316 Left (FailedToFindTransactionError targetId)
317 else do
317 else do
318− let searches = map (\t -> pathToTransaction graph targetTransaction t (S.insert t accumTransSet)) currentTransChildren
318+ let searches = map (\t -> pathToTransaction graph t targetTransaction (S.insert t accumTransSet)) currentTransChildren
319 let realErrors = filter (/= FailedToFindTransactionError targetId) (lefts searches)
319 let realErrors = filter (/= FailedToFindTransactionError targetId) (lefts searches)
320 paths = rights searches
320 paths = rights searches
321 if length realErrors > 0 then -- found some real errors
321 if length realErrors > 0 then -- found some real errors
test/TransactionGraph/Merge.hs+3−11
@@ -24,9 +24,9 @@ main = do
24
24
25testList :: Test
25testList :: Test
26testList = TestList [
26testList = TestList [
27− testSubGraphToFirstAncestorBasic
27+ testSubGraphToFirstAncestorBasic,
28− --testSubGraphToFirstAncestorSnipBranch,
28+ testSubGraphToFirstAncestorSnipBranch,
29− --testSelectedBranchMerge
29+ testSelectedBranchMerge
30 ]
30 ]
31
31
32-- | Create a transaction graph with two branches and no changes between them.
32-- | Create a transaction graph with two branches and no changes between them.
@@ -79,7 +79,6 @@ assertMaybe x msg = case x of
79testSubGraphToFirstAncestorBasic :: Test
79testSubGraphToFirstAncestorBasic :: Test
80testSubGraphToFirstAncestorBasic = TestCase $ do
80testSubGraphToFirstAncestorBasic = TestCase $ do
81 graph <- basicTransactionGraph
81 graph <- basicTransactionGraph
82− putStrLn $ showGraphStructure graph
83 assertGraph graph
82 assertGraph graph
84 transA <- assertMaybe (transactionForHead "branchA" graph) "failed to get branchA"
83 transA <- assertMaybe (transactionForHead "branchA" graph) "failed to get branchA"
85 transB <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB"
84 transB <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB"
@@ -128,15 +127,8 @@ testSelectedBranchMerge = TestCase $ do
128 --create the merge transaction in the graph
127 --create the merge transaction in the graph
129 let eGraph' = mergeTransactions (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB") graph'
128 let eGraph' = mergeTransactions (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB") graph'
130
129
131− case eGraph' of
132− Left err -> assertFailure ("poop" ++ show err)
133− Right (_, pgraph) -> putStrLn (showGraphStructure pgraph)
134−
135− putStrLn "SPAMMO"
136−
137 (DisconnectedTransaction _ mergedContext, graph'') <- assertEither eGraph'
130 (DisconnectedTransaction _ mergedContext, graph'') <- assertEither eGraph'
138
131
139− putStrLn "SPAMMO2"
140 assertGraph graph''
132 assertGraph graph''
141 --validate that the branchB was removed
133 --validate that the branchB was removed
142 rootTrans <- assertEither $ transactionForUUID (fakeUUID 1) graph''
134 rootTrans <- assertEither $ transactionForUUID (fakeUUID 1) graph''