summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-13 21:51:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-13 21:51:52 -0400
commit66f5b390fe761946280c8999648d13e917fba45b (patch)
tree65422301fa45585554efbf83aa374c8dfdd91f74 /test.hs
parentd0482d4154e90e7e5c3d70113a760eb76e5d4e83 (diff)
fix test suite
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs20
1 files changed, 10 insertions, 10 deletions
diff --git a/test.hs b/test.hs
index 221607755..498c7b680 100644
--- a/test.hs
+++ b/test.hs
@@ -31,7 +31,7 @@ import qualified Backend
import qualified GitRepo as Git
import qualified Locations
import qualified Utility
-import qualified Type.Backend
+import qualified Types.Backend
import qualified Types
import qualified GitAnnex
import qualified LocationLog
@@ -40,20 +40,20 @@ import qualified Trust
import qualified Remote
import qualified Content
import qualified Command.DropUnused
-import qualified Type.Key
+import qualified Types.Key
import qualified Config
import qualified Crypto
-- for quickcheck
-instance Arbitrary Key.Key where
+instance Arbitrary Types.Key.Key where
arbitrary = do
n <- arbitrary
b <- elements ['A'..'Z']
- return $ Key.Key {
- Key.keyName = n,
- Key.keyBackendName = [b],
- Key.keySize = Nothing,
- Key.keyMtime = Nothing
+ return $ Types.Key.Key {
+ Types.Key.keyName = n,
+ Types.Key.keyBackendName = [b],
+ Types.Key.keySize = Nothing,
+ Types.Key.keyMtime = Nothing
}
main :: IO ()
@@ -72,7 +72,7 @@ quickcheck :: Test
quickcheck = TestLabel "quickcheck" $ TestList
[ qctest "prop_idempotent_deencode" Git.prop_idempotent_deencode
, qctest "prop_idempotent_fileKey" Locations.prop_idempotent_fileKey
- , qctest "prop_idempotent_key_read_show" Key.prop_idempotent_key_read_show
+ , qctest "prop_idempotent_key_read_show" Types.Key.prop_idempotent_key_read_show
, qctest "prop_idempotent_shellEscape" Utility.prop_idempotent_shellEscape
, qctest "prop_idempotent_shellEscape_multiword" Utility.prop_idempotent_shellEscape_multiword
, qctest "prop_idempotent_configEscape" Remote.prop_idempotent_configEscape
@@ -139,7 +139,7 @@ test_add = "git-annex add" ~: TestList [basic, sha1dup]
test_setkey :: Test
test_setkey = "git-annex setkey/fromkey" ~: TestCase $ inmainrepo $ do
writeFile tmp $ content sha1annexedfile
- r <- annexeval $ BackendClass.getKey backendSHA1 tmp
+ r <- annexeval $ Types.Backend.getKey backendSHA1 tmp
let key = show $ fromJust r
git_annex "setkey" ["-q", "--key", key, tmp] @? "setkey failed"
git_annex "fromkey" ["-q", "--key", key, sha1annexedfile] @? "fromkey failed"