[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit d928c6e1efd3862760d06dd33e8fe81986708118
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sat Dec 4 09:01:12 2004 +0100

    Checkpointing some more
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-30)

diff --git a/ChangeLog b/ChangeLog
index 9757cae..815805a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,25 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-04 02:01:12 GMT	John Goerzen <jgoerzen at complete.org>	patch-30
+
+    Summary:
+      Checkpointing some more
+    Revision:
+      missingh--head--0.7--patch-30
+
+
+    new files:
+     testsrc/CRC32GZIPtest.hs
+
+    modified files:
+     ChangeLog libsrc/MissingH/FileArchive/GZip.hs testsrc/Tests.hs
+
+    renamed files:
+     testsrc/CRC32test.hs
+       ==> testsrc/CRC32POSIXtest.hs
+
+
 2004-12-04 01:58:16 GMT	John Goerzen <jgoerzen at complete.org>	patch-29
 
     Summary:
diff --git a/libsrc/MissingH/FileArchive/GZip.hs b/libsrc/MissingH/FileArchive/GZip.hs
index e8396e5..93159a0 100644
--- a/libsrc/MissingH/FileArchive/GZip.hs
+++ b/libsrc/MissingH/FileArchive/GZip.hs
@@ -25,7 +25,7 @@ module MissingH.FileArchive.GZip (
 where
 
 import MissingH.Compression.Inflate
-import MissingH.Checksum.CRC32
+import MissingH.Checksum.CRC32.POSIX
 import Data.List
 import Data.Bits
 import Control.Monad.Error
diff --git a/testsrc/CRC32test.hs b/testsrc/CRC32GZIPtest.hs
similarity index 64%
copy from testsrc/CRC32test.hs
copy to testsrc/CRC32GZIPtest.hs
index be28507..f08c4f9 100644
--- a/testsrc/CRC32test.hs
+++ b/testsrc/CRC32GZIPtest.hs
@@ -1,4 +1,4 @@
-{- arch-tag: Tests for CRC-32 module
+{- arch-tag: Tests for Gzip CRC-32 module
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
 This program is free software; you can redistribute it and/or modify
@@ -16,21 +16,21 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
-module CRC32POSIXtest(tests) where
+module CRC32GZIPtest(tests) where
 import HUnit
-import MissingH.Checksum.CRC32.POSIX
+import MissingH.Checksum.CRC32.GZip
 
-test_crc32 =
-    let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp (crc32 inp) in
-        [
-         f "Empty" "" 4294967295,
-         f "1" "1" 433426081,
-         f "some numbers" "153141341309874102987412" 2083856642,
-         f "Some text" "This is a test of the crc32 thing\n" 2449124888
+test_crcgzip =
+    let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp (calc_crc32 inp) in
+        [f "Simple" "Test 1" 0x9927f819
+         --f "Empty" "" 4294967295,
+         --f "1" "1" 433426081,
+         --f "some numbers" "153141341309874102987412" 2083856642,
+         --f "Some text" "This is a test of the crc32 thing\n" 2449124888
 
         ]
 
-tests = TestList [TestLabel "crc32" (TestList test_crc32)
+tests = TestList [TestLabel "crcgzip" (TestList test_crcgzip)
 
                  ]
 
diff --git a/testsrc/CRC32test.hs b/testsrc/CRC32POSIXtest.hs
similarity index 100%
rename from testsrc/CRC32test.hs
rename to testsrc/CRC32POSIXtest.hs
diff --git a/testsrc/Tests.hs b/testsrc/Tests.hs
index 85b3891..63b40b6 100644
--- a/testsrc/Tests.hs
+++ b/testsrc/Tests.hs
@@ -30,7 +30,8 @@ import qualified Network.FTP.Parsertest
 import qualified Eithertest
 import qualified ConfigParser.Parsertest
 import qualified ConfigParser.Maintest
-import qualified CRC32test
+import qualified CRC32POSIXtest
+import qualified CRC32GZIPtest
 import qualified GZiptest
 
 test1 = TestCase ("x" @=? "x")
@@ -47,7 +48,8 @@ tests = TestList [TestLabel "test1" test1,
                  TestLabel "Eithertest" Eithertest.tests,
                  TestLabel "ConfigParser.RunParser" ConfigParser.Parsertest.tests,
                  TestLabel "ConfigParser.Main" ConfigParser.Maintest.tests,
-                 TestLabel "CRC32test" CRC32test.tests,
+                 TestLabel "CRC32POSIXtest" CRC32POSIXtest.tests,
+                 TestLabel "CRC32GZIPtest" CRC32GZIPtest.tests,
                  TestLabel "GZiptest" GZiptest.tests]
 
 

-- 
haskell-testpack