[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 de617fbba27348eb979469e85db4ca48cee50d44
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Nov 19 09:19:35 2004 +0100

    Slight adjustments
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-96)

diff --git a/ChangeLog b/ChangeLog
index 62eff41..b744936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-19 02:19:35 GMT	John Goerzen <jgoerzen at complete.org>	patch-96
+
+    Summary:
+      Slight adjustments
+    Revision:
+      missingh--head--0.5--patch-96
+
+
+    modified files:
+     ChangeLog testsrc/ConfigParser/Parsertest.hs
+
+
 2004-11-19 02:13:18 GMT	John Goerzen <jgoerzen at complete.org>	patch-95
 
     Summary:
diff --git a/testsrc/ConfigParser/Parsertest.hs b/testsrc/ConfigParser/Parsertest.hs
index f5e72aa..abb8a40 100644
--- a/testsrc/ConfigParser/Parsertest.hs
+++ b/testsrc/ConfigParser/Parsertest.hs
@@ -50,14 +50,15 @@ test_basic =
         ,f "default1" "v1: o1\n[sect1]\nv2: o2" [("DEFAULT", [("v1", "o1")]),
                                      ("sect1", [("v2", "o2")])]
         ,f "simple default" "foo: bar" [("DEFAULT", [("foo", "bar")])]
-{-
-        assertRaises "e test1" (ErrorCall "Lexer: \"(string)\" (line 1, column 5):\nunexpected \"\\n\"\nexpecting Option separator")
-                      (f "" "#foo\nthis is bad data" [])
+               ]
 
+test_asserts =
+        do
+        assertRaises "e test1" (ErrorCall "Lexer: \"(string)\" (line 1, column 5):\nunexpected \"\\n\"\nexpecting Option separator")
+                      ([] @=? parse_string "#foo\nthis is bad data")
+        
         assertRaises "e test2" (ErrorCall "Lexer: \"(string)\" (line 2, column 9):\nunexpected \"\\n\"\nexpecting Option separator")
-                     (f "" "[sect1]\n#iiiiii \n  extensionline\n#foo" [])
--}
-        ]
+                     ([] @=? parse_string "[sect1]\n#iiiiii \n  extensionline\n#foo")
 
 test_extensionlines =
     let f inp exp = exp @=? parse_string inp in
@@ -67,6 +68,7 @@ test_extensionlines =
                       ("baz", "l1\nl2\nl3"),
                       ("quux", "asdf")])]
 
-tests = TestList [TestLabel "test_basic" (TestList test_basic)
---                  TestLabel "test_extensionlines" (TestCase test_extensionlines)
+tests = TestList [TestLabel "test_basic" (TestList test_basic),
+--                  TestLabel "test_asserts" (TestCase test_asserts)
+                  TestLabel "test_extensionlines" (TestCase test_extensionlines)
                  ]
\ No newline at end of file

-- 
haskell-testpack