prop_empty =
syncBiDir (emptymap::Map.Map Int ()) emptymap emptymap == ([], []) -- ([DeleteItem 5], [], [])
-prop_delAllFromChild :: SyncCollection Int -> Result
+prop_delAllFromChild :: SyncCollection Int () -> Result
prop_delAllFromChild inp =
let (resMaster, resChild) = syncBiDir emptymap inp inp
expectedResChild = sort . map DeleteItem . Map.keys $ inp
in ([], expectedResChild) @=?
(resMaster, sort resChild)
-prop_delAllFromMaster :: SyncCollection Int -> Result
+prop_delAllFromMaster :: SyncCollection Int () -> Result
prop_delAllFromMaster inp =
let (resMaster, resChild) = syncBiDir inp emptymap inp
expectedResMaster = sort . map DeleteItem . Map.keys $ inp
in (expectedResMaster, []) @=?
(sort resMaster, resChild)
-prop_addFromMaster :: SyncCollection Int -> Result
+prop_addFromMaster :: SyncCollection Int Float -> Result
prop_addFromMaster inp =
let (resMaster, resChild) = syncBiDir inp emptymap emptymap
- expectedResChild = sort . map CopyItem . Map.keys $ inp
+ expectedResChild = sort . map (\(k, v) -> CopyItem k v) . Map.toList $ inp
in ([], expectedResChild) @=?
(resMaster, sort resChild)
-prop_allChangesToChild :: SyncCollection Int -> SyncCollection Int -> Result
+-- FIXME: prop_addFromChild
+
+prop_allChangesToChild :: SyncCollection Int Float -> SyncCollection Int Float -> Result
prop_allChangesToChild master child =
let (resMaster, resChild) = syncBiDir master child child
expectedResChild = sort $
- (map CopyItem . Map.keys . Map.difference master $ child) ++
- (map DeleteItem . Map.keys . Map.difference child $ master)
- in ([], expectedResChild) @=?
- (resMaster, sort resChild)
-
-prop_allChangesToMaster :: SyncCollection Int -> SyncCollection Int -> Result
+ (map (\(k, v) -> CopyItem k v) . Map.toList . Map.difference master $ child) ++
+ (map DeleteItem . Map.keys . Map.difference child $ master) ++
+ (map (pairToFunc ModifyContent) changeList)
+ changeList = foldl changefunc [] (Map.toList child)
+ changefunc accum (k, v) =
+ case Map.lookup k master of
+ Nothing -> accum
+ Just x -> if x /= v
+ then (k, x) : accum
+ else accum
+ masterChanges = map (pairToFunc ModifyContent) . catMaybes .
+ map checkIt . Map.toList . Map.intersection child
+ $ master
+ where checkIt (k, v) =
+ case Map.lookup k master of
+ Nothing -> Nothing
+ Just v' -> if v /= v'
+ then Just (k, v)
+ else Nothing
+ in (sort masterChanges, expectedResChild) @=?
+ (sort resMaster, sort resChild)
+
+prop_allChangesToMaster :: SyncCollection Int Float -> SyncCollection Int Float -> Result
prop_allChangesToMaster master child =
let (resMaster, resChild) = syncBiDir master child master
expectedResMaster = sort $
- (map CopyItem . Map.keys . Map.difference child $ master) ++
- (map DeleteItem . Map.keys . Map.difference master $ child)
+ (map (pairToFunc CopyItem) . Map.toList . Map.difference child $ master) ++
+ (map DeleteItem . Map.keys . Map.difference master $ child) ++
+ (map (pairToFunc ModifyContent) changeList)
+ changeList = foldl changefunc [] (Map.toList child)
+ changefunc accum (k, v) =
+ case Map.lookup k master of
+ Nothing -> accum
+ Just x -> if x /= v
+ then (k, v) : accum
+ else accum
in (expectedResMaster, []) @=?
(sort resMaster, resChild)
-prop_allChanges :: SyncCollection Int -> SyncCollection Int -> SyncCollection Int -> Result
+-- FIXME: test findModified
+
+prop_allChanges :: SyncCollection Int Float -> SyncCollection Int Float -> SyncCollection Int Float -> Result
prop_allChanges master child lastchild =
let (resMaster, resChild) = syncBiDir master child lastchild
+
+ masterMods = catMaybes . map procKV $ (Map.toList master)
+ where procKV (k, m) =
+ case (Map.lookup k child, Map.lookup k lastchild) of
+ (Just c, Just lc) ->
+ if c == lc -- child didn't change
+ then Nothing
+ else if c == m -- child and master changed
+ then Nothing
+ else Just (k, c) -- child changed, master didn't
+ (Nothing, Just lc) -> Nothing -- deleted on child
+ (Just c, Nothing) -> -- New on both c and m
+ if c == m -- Added the same
+ then Nothing
+ else Just (k, c) -- Added but differ
+ (Nothing, Nothing) -> Nothing -- New to master only
+
+ childMods = catMaybes . map procKV $ (Map.toList child)
+ where procKV (k, c) =
+ case (Map.lookup k master, Map.lookup k lastchild) of
+ (Just m, Just lc) ->
+ if lc == c
+ then if c == m
+ then Nothing
+ else Just (k, m)
+ else Nothing
+ (Nothing, Just lc) -> -- deleted; nothing to see here
+ Nothing
+ (Just m, Nothing) -> -- New on both; child takes precedence
+ Nothing
+ (Nothing, Nothing) -> Nothing -- New to child only
+
expectedResMaster = sort $
- (map CopyItem . Map.keys . Map.difference child $ Map.union master lastchild) ++
- (map DeleteItem . Map.keys . Map.intersection master $ Map.difference lastchild child)
+ (map (pairToFunc CopyItem) . Map.toList . Map.difference child $ Map.union master lastchild) ++
+ (map DeleteItem . Map.keys . Map.intersection master $ Map.difference lastchild child) ++
+ (map (pairToFunc ModifyContent) masterMods)
+
expectedResChild = sort $
- (map CopyItem . Map.keys . Map.difference master $ Map.union child lastchild) ++
- (map DeleteItem . Map.keys . Map.intersection child $ Map.difference lastchild master)
+ (map (pairToFunc CopyItem) . Map.toList . Map.difference master $ Map.union child lastchild) ++
+ (map DeleteItem . Map.keys . Map.intersection child $ Map.difference lastchild master) ++
+ (map (pairToFunc ModifyContent) childMods)
+
in (expectedResMaster, expectedResChild) @=?
(sort resMaster, sort resChild)
{- | Basic validation that unaryApplyChanges works -}
-prop_unaryApplyChanges :: SyncCollection Int -> [(Bool, Int)] -> Result
+prop_unaryApplyChanges :: SyncCollection Int Float -> [(Bool, Int, Float)] -> Result
prop_unaryApplyChanges collection randcommands =
let -- We use nubBy to make sure we don't get input that has reference
-- to the same key more than once. We then convert True/False to
-- commands.
- commands = map toCommand . nubBy (\x y -> snd x == snd y) $ randcommands
- toCommand (True, x) = CopyItem x
- toCommand (False, x) = DeleteItem x
+ commands = map toCommand . nubBy (\(x1, y1, z1) (x2, y2, z2) -> y1 == y2) $ randcommands
+ toCommand (True, x, v) = CopyItem x v
+ toCommand (False, x, _) = DeleteItem x
- addedKeys = catMaybes . map (\x -> case x of CopyItem y -> Just y; _ -> Nothing) $ commands
+ addedItems = catMaybes . map (\x -> case x of CopyItem y v -> Just (y, v); _ -> Nothing) $ commands
deletedKeys = catMaybes . map (\x -> case x of DeleteItem y -> Just y; _ -> Nothing) $ commands
- collection' = Map.difference collection (keysToMap deletedKeys)
+ collection' = foldl (flip Map.delete) collection deletedKeys
expectedCollection =
- Map.union collection' (keysToMap addedKeys)
+ Map.union collection' (Map.fromList addedItems)
in (sort . Map.keys $ expectedCollection) @=?
(sort . Map.keys $ unaryApplyChanges collection commands)
{- | Should validate both that unaryApplyChanges works, and that it is
an identify -}
-prop_unaryApplyChangesId :: SyncCollection Int -> SyncCollection Int -> Result
+prop_unaryApplyChangesId :: SyncCollection Int Float -> SyncCollection Int Float -> Result
prop_unaryApplyChangesId master child =
let (resMaster, resChild) = syncBiDir master child child
newMaster = unaryApplyChanges master resMaster
in (True, sort (Map.keys master), sort (Map.keys master)) @=?
(newMasterKeys == newChildKeys, newMasterKeys, newChildKeys)
+prop_unaryApplyChanges3 :: SyncCollection Int Float -> SyncCollection Int Float -> SyncCollection Int Float -> Result
+prop_unaryApplyChanges3 master child lastChild =
+ let (resMaster, resChild) = syncBiDir master child lastChild
+ newMaster = unaryApplyChanges master resMaster
+ newChild = unaryApplyChanges child resChild
+ in newMaster @=? newChild
+
+prop_diffCollection :: SyncCollection Int Float -> SyncCollection Int Float -> Result
+prop_diffCollection coll1 coll2 =
+ let commands = diffCollection coll1 coll2
+ newcoll2 = unaryApplyChanges coll1 commands
+ in coll2 @=? newcoll2
+
allt = [qctest "Empty" prop_empty,
qctest "Del all from child" prop_delAllFromChild,
qctest "Del all from master" prop_delAllFromMaster,
qctest "All changes to master" prop_allChangesToMaster,
qctest "All changes" prop_allChanges,
qctest "unaryApplyChanges" prop_unaryApplyChanges,
- qctest "unaryApplyChangesId" prop_unaryApplyChangesId
+ qctest "unaryApplyChangesId" prop_unaryApplyChangesId,
+ qctest "unaryApplyChanges3" prop_unaryApplyChanges3,
+ qctest "diffCollection" prop_diffCollection
]
testh = HU.runTestTT $ HU.TestList allt