[commit: packages/containers] ghc-head: Fix and reinstate the recently commented tests. (ad7ed3b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branch  : ghc-head
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ad7ed3bb56e8d1dc8b54a09a7efa8c19fd5be5ba

>---------------------------------------------------------------

commit ad7ed3bb56e8d1dc8b54a09a7efa8c19fd5be5ba
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Dec 4 19:09:08 2013 +0100

    Fix and reinstate the recently commented tests.
    
    The not working tests were using the join function which we renamed to
    link because of Applicative being introduced to Prelude. Nevertheless,
    I forgot to update the tests. Fixing now.


>---------------------------------------------------------------

ad7ed3bb56e8d1dc8b54a09a7efa8c19fd5be5ba
 tests/map-properties.hs |    8 ++++----
 tests/set-properties.hs |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/map-properties.hs b/tests/map-properties.hs
index 3361e9f..27f08dc 100644
--- a/tests/map-properties.hs
+++ b/tests/map-properties.hs
@@ -137,7 +137,7 @@ main = defaultMain
          , testProperty "deleteMax"            prop_deleteMax
          , testProperty "split"                prop_split
          , testProperty "splitRoot"            prop_splitRoot
---         , testProperty "split then join"      prop_join
+         , testProperty "split then link"      prop_link
          , testProperty "split then merge"     prop_merge
          , testProperty "union"                prop_union
          , testProperty "union model"          prop_unionModel
@@ -870,9 +870,9 @@ prop_splitRoot s = loop ls && (s == unions ls)
                           , y <- toList (unions rst)
                           , x > y ]
 
--- prop_join :: Int -> UMap -> Bool
--- prop_join k t = let (l,r) = split k t
---                 in valid (join k () l r)
+prop_link :: Int -> UMap -> Bool
+prop_link k t = let (l,r) = split k t
+                in valid (link k () l r)
 
 prop_merge :: Int -> UMap -> Bool
 prop_merge k t = let (l,r) = split k t
diff --git a/tests/set-properties.hs b/tests/set-properties.hs
index 880f9c0..3ff6f73 100644
--- a/tests/set-properties.hs
+++ b/tests/set-properties.hs
@@ -31,7 +31,7 @@ main = defaultMain [ testCase "lookupLT" test_lookupLT
                    , testProperty "prop_InsertValid" prop_InsertValid
                    , testProperty "prop_InsertDelete" prop_InsertDelete
                    , testProperty "prop_DeleteValid" prop_DeleteValid
---                   , testProperty "prop_Join" prop_Join
+                   , testProperty "prop_Link" prop_Link
                    , testProperty "prop_Merge" prop_Merge
                    , testProperty "prop_UnionValid" prop_UnionValid
                    , testProperty "prop_UnionInsert" prop_UnionInsert
@@ -216,10 +216,10 @@ prop_DeleteValid k = forValidUnitTree $ \t -> valid (delete k (insert k t))
 {--------------------------------------------------------------------
   Balance
 --------------------------------------------------------------------}
--- prop_Join :: Int -> Property
--- prop_Join x = forValidUnitTree $ \t ->
---     let (l,r) = split x t
---     in valid (join x l r)
+prop_Link :: Int -> Property
+prop_Link x = forValidUnitTree $ \t ->
+    let (l,r) = split x t
+    in valid (link x l r)
 
 prop_Merge :: Int -> Property
 prop_Merge x = forValidUnitTree $ \t ->