git.iko.soy/project-m36
on master help sign in
compilation checkpoint- merge tests passing
commitdcb8584ab933d14ba5590e44b6ffcb06e4689547 authorAgentM <agentm@themactionfaction.com> dateSat 25 Jun 2016, 23:40 (10 years ago) parent1044f86
2 files changed+4−12
compare with master
unifiedsplit
ProjectM36/TransactionGraph.hs+1−1 test/TransactionGraph/Merge.hs+3−11
ProjectM36/TransactionGraph.hs+1−1
@@ -315,7 +315,7 @@ pathToTransaction graph currentTransaction targetTransaction accumTransSet = do
315315 if length currentTransChildren == 0 then
316316 Left (FailedToFindTransactionError targetId)
317317 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
319319 let realErrors = filter (/= FailedToFindTransactionError targetId) (lefts searches)
320320 paths = rights searches
321321 if length realErrors > 0 then -- found some real errors
test/TransactionGraph/Merge.hs+3−11
@@ -24,9 +24,9 @@ main = do
2424
2525testList :: Test
2626testList = TestList [
27− testSubGraphToFirstAncestorBasic
28− --testSubGraphToFirstAncestorSnipBranch,
29− --testSelectedBranchMerge
27+ testSubGraphToFirstAncestorBasic,
28+ testSubGraphToFirstAncestorSnipBranch,
29+ testSelectedBranchMerge
3030 ]
3131
3232-- | Create a transaction graph with two branches and no changes between them.
@@ -79,7 +79,6 @@ assertMaybe x msg = case x of
7979testSubGraphToFirstAncestorBasic :: Test
8080testSubGraphToFirstAncestorBasic = TestCase $ do
8181 graph <- basicTransactionGraph
82− putStrLn $ showGraphStructure graph
8382 assertGraph graph
8483 transA <- assertMaybe (transactionForHead "branchA" graph) "failed to get branchA"
8584 transB <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB"
@@ -128,15 +127,8 @@ testSelectedBranchMerge = TestCase $ do
128127 --create the merge transaction in the graph
129128 let eGraph' = mergeTransactions (fakeUUID 4) (fakeUUID 10) (SelectedBranchMergeStrategy "branchA") ("branchA", "branchB") graph'
130129
131− case eGraph' of
132− Left err -> assertFailure ("poop" ++ show err)
133− Right (_, pgraph) -> putStrLn (showGraphStructure pgraph)
134−
135− putStrLn "SPAMMO"
136−
137130 (DisconnectedTransaction _ mergedContext, graph'') <- assertEither eGraph'
138131
139− putStrLn "SPAMMO2"
140132 assertGraph graph''
141133 --validate that the branchB was removed
142134 rootTrans <- assertEither $ transactionForUUID (fakeUUID 1) graph''