use library implementation of Large

Author: Johannes Waldmann

containers-tests/tests/intset-properties.hs

@@ -26,9 +26,7 @@ main = defaultMain [ testCase "lookupLT" test_lookupLT
                    , testProperty "prop_SingletonValid" prop_SingletonValid
                    , testProperty "prop_InsertIntoEmptyValid" prop_InsertIntoEmptyValid
                    , testProperty "prop_instanceEqIntSet" prop_instanceEqIntSet
-                   , testProperty "prop_instanceEqIntSet'" prop_instanceEqIntSet'
                    , testProperty "prop_instanceOrdIntSet" prop_instanceOrdIntSet
-                   , testProperty "prop_instanceOrdIntSet'" prop_instanceOrdIntSet'
                    , testProperty "prop_Single" prop_Single
                    , testProperty "prop_Member" prop_Member
                    , testProperty "prop_NotMember" prop_NotMember
@@ -113,18 +111,9 @@ test_split = do
 --------------------------------------------------------------------}
 instance Arbitrary IntSet where
   arbitrary = do{ xs <- arbitrary
-                ; return (fromList xs)
+                ; return (fromList (fmap getLarge xs))
                 }
 
-newtype LargeInt = LargeInt { unLargeInt :: Int }
-
-instance Arbitrary LargeInt where
-  arbitrary = ( \ (x,y) -> LargeInt $ if x == 0 then y else signum x * (2 ^ abs x) * y) <$> arbitrary
-
-newtype LargeIntSet = LargeIntSet IntSet deriving Show
-instance Arbitrary LargeIntSet where
-  arbitrary = (LargeIntSet . fromList . fmap unLargeInt) <$> arbitrary
-
 {--------------------------------------------------------------------
   Valid IntMaps
 --------------------------------------------------------------------}
@@ -164,15 +153,9 @@ prop_InsertIntoEmptyValid x =
 prop_instanceEqIntSet :: IntSet -> IntSet -> Bool
 prop_instanceEqIntSet x y = (x == y) == (toAscList x == toAscList y)
 
-prop_instanceEqIntSet' :: LargeIntSet -> LargeIntSet -> Bool
-prop_instanceEqIntSet' (LargeIntSet x) (LargeIntSet y) = (x == y) == (toAscList x == toAscList y)
-
 prop_instanceOrdIntSet :: IntSet -> IntSet -> Bool
 prop_instanceOrdIntSet x y = (compare x y) == (compare (toAscList x) (toAscList y))
 
-prop_instanceOrdIntSet' :: LargeIntSet -> LargeIntSet -> Bool
-prop_instanceOrdIntSet' (LargeIntSet x) (LargeIntSet y) = (compare x y) == (compare (toAscList x) (toAscList y))
-
 {--------------------------------------------------------------------
   Single, Member, Insert, Delete, Member, FromList
 --------------------------------------------------------------------}