X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FInjuries.hs;h=2ea82c7ffe624b949d2697ced07d0f3d4e3f4edd;hb=bbe8b110b9468b022457457af808af678e1927f9;hp=92bf4e27757dca8c1de4320a920a982be609d1df;hpb=76cf3eee776d35ba2b18dd0d07df7496a083ae3a;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs
index 92bf4e2..2ea82c7 100644
--- a/src/TSN/XML/Injuries.hs
+++ b/src/TSN/XML/Injuries.hs
@@ -33,6 +33,7 @@ import Text.XML.HXT.Core (
   xp4Tuple,
   xp6Tuple,
   xpElem,
+  xpInt,
   xpList,
   xpPrim,
   xpText,
@@ -40,7 +41,7 @@ import Text.XML.HXT.Core (
 
 
 import TSN.DbImport ( DbImport(..), import_generic )
-import Xml ( pickle_unpickle )
+import Xml ( pickle_unpickle, unpickleable )
 
 
 data Listing =
@@ -73,7 +74,7 @@ pickle_listing =
   xpElem "listing" $
     xpWrap (from_tuple, to_tuple) $
     xp4Tuple (xpElem "team" xpText)
-             (xpElem "teamno" xpPrim)
+             (xpElem "teamno" xpInt)
              (xpElem "injuries" xpText)
              (xpElem "updated" xpPrim)
   where
@@ -88,7 +89,7 @@ pickle_message :: PU Message
 pickle_message =
   xpElem "message" $
     xpWrap (from_tuple, to_tuple) $
-    xp6Tuple (xpElem "XML_File_ID" xpPrim)
+    xp6Tuple (xpElem "XML_File_ID" xpInt)
              (xpElem "heading" xpText)
              (xpElem "category" xpText)
              (xpElem "sport" xpText)
@@ -116,12 +117,24 @@ injuries_tests :: TestTree
 injuries_tests =
   testGroup
     "Injuries tests"
-    [ test_pickle_of_unpickle_is_identity ]
+    [ test_pickle_of_unpickle_is_identity,
+      test_unpickle_succeeds ]
 
 
+-- | Warning, succeess of this test does not mean that unpickling
+--   succeeded.
 test_pickle_of_unpickle_is_identity :: TestTree
 test_pickle_of_unpickle_is_identity =
   testCase "pickle composed with unpickle is the identity" $ do
     let path = "test/xml/injuriesxml.xml"
     (expected :: [Message], actual) <- pickle_unpickle "message" path
     actual @?= expected
+
+
+test_unpickle_succeeds :: TestTree
+test_unpickle_succeeds =
+  testCase "unpickling succeeds" $ do
+  let path = "test/xml/injuriesxml.xml"
+  actual <- unpickleable path pickle_message
+  let expected = True
+  actual @?= expected