From c4f82d3ee2488f8574e4719ec3c0f99b52ff649b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 13 Jan 2014 16:57:01 -0500
Subject: [PATCH] Add a test for unpickling large Odds_XML files. Disable DTD
 validation so the new test passes. Add a TODO item to re-enable validation.

---
 doc/TODO            |  2 ++
 src/TSN/XML/Odds.hs | 10 ++++++++--
 src/Xml.hs          |  4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 doc/TODO

diff --git a/doc/TODO b/doc/TODO
new file mode 100644
index 0000000..58423f7
--- /dev/null
+++ b/doc/TODO
@@ -0,0 +1,2 @@
+1. Re-enable DTD validation once
+   https://github.com/UweSchmidt/hxt/issues/15 is fixed.
diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs
index dde6a09..3aef4f1 100644
--- a/src/TSN/XML/Odds.hs
+++ b/src/TSN/XML/Odds.hs
@@ -549,7 +549,10 @@ test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests"
           "test/xml/Odds_XML-noninteger-team-id.xml",
 
     check "pickle composed with unpickle is the identity (positive(+) line)"
-          "test/xml/Odds_XML-positive-line.xml" ]
+          "test/xml/Odds_XML-positive-line.xml",
+
+    check "pickle composed with unpickle is the identity (large file)"
+          "test/xml/Odds_XML-largefile.xml" ]
   where
     check desc path = testCase desc $ do
       (expected, actual) <- pickle_unpickle pickle_message path
@@ -565,7 +568,10 @@ test_unpickle_succeeds = testGroup "unpickle tests"
           "test/xml/Odds_XML-noninteger-team-id.xml",
 
     check "unpickling succeeds (positive(+) line)"
-          "test/xml/Odds_XML-positive-line.xml" ]
+          "test/xml/Odds_XML-positive-line.xml",
+
+    check "unpickling succeeds (large file)"
+          "test/xml/Odds_XML-largefile.xml" ]
   where
     check desc path = testCase desc $ do
       actual <- unpickleable path pickle_message
diff --git a/src/Xml.hs b/src/Xml.hs
index 1444c67..3242dac 100644
--- a/src/Xml.hs
+++ b/src/Xml.hs
@@ -18,9 +18,11 @@ import Text.XML.HXT.Core (
   PU,
   SysConfigList,
   isElem,
+  no,
   readDocument,
   runX,
   withRemoveWS,
+  withValidate,
   xpickleVal,
   xunpickleVal,
   yes )
@@ -54,7 +56,7 @@ newtype DtdName = DtdName String
 --   would have to parse whitespace in each (un)pickler.
 --
 parse_opts :: SysConfigList
-parse_opts = [ withRemoveWS yes ]
+parse_opts = [ withRemoveWS yes, withValidate no ]
 
 
 -- | Given an @unpickler@ and a @filepath@, attempt to unpickle the
-- 
2.44.2