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

diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs
index cb3afea..bb529d0 100644
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -40,6 +40,7 @@ import Text.XML.HXT.Core (
   xp6Tuple,
   xp10Tuple,
   xpElem,
+  xpInt,
   xpList,
   xpPrim,
   xpText,
@@ -48,7 +49,7 @@ import Text.XML.HXT.Core (
 
 import TSN.DbImport ( DbImport(..), import_generic )
 import TSN.Picklers( xp_date, xp_team_id )
-import Xml ( pickle_unpickle )
+import Xml ( pickle_unpickle, unpickleable )
 
 
 data PlayerListing =
@@ -95,14 +96,14 @@ pickle_player_listing =
   xpElem "PlayerListing" $
     xpWrap (from_tuple, to_tuple) $
     xp10Tuple (xpElem "TeamID" xp_team_id)
-              (xpElem "PlayerID" xpPrim)
+              (xpElem "PlayerID" xpInt)
               (xpElem "Date" xp_date)
               (xpElem "Pos" xpText)
               (xpElem "Name" xpText)
               (xpElem "Injury" xpText)
               (xpElem "Status" xpText)
               (xpElem "Fantasy" xpText0)
-              (xpElem "Injured" xpickle)
+              (xpElem "Injured" xpPrim)
               (xpElem "Type" xpText)
   where
     from_tuple = uncurryN PlayerListing
@@ -139,7 +140,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)
@@ -166,12 +167,24 @@ injuries_detail_tests :: TestTree
 injuries_detail_tests =
   testGroup
     "InjuriesDetail 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/Injuries_Detail_XML.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/Injuries_Detail_XML.xml"
+  actual <- unpickleable path pickle_message
+  let expected = True
+  actual @?= expected