From c37d974e476dd25e0229cfdfefabe1ec130877a4 Mon Sep 17 00:00:00 2001
From: Jez Higgins <jez@jezuk.co.uk>
Date: Thu, 25 Jun 2020 15:09:50 +0100
Subject: [PATCH] Properly parameterise PYXWriter and SAX tests on string type

---
 include/SAX/filter/PYXWriter.hpp      |   7 +-
 tests/SAX/test_WhitespaceStripper.hpp | 115 ++++++++++++++------------
 2 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/include/SAX/filter/PYXWriter.hpp b/include/SAX/filter/PYXWriter.hpp
index ab7d1f05..a978f32e 100644
--- a/include/SAX/filter/PYXWriter.hpp
+++ b/include/SAX/filter/PYXWriter.hpp
@@ -18,9 +18,8 @@ class PYXWriter : public XMLFilterImpl<string_type, string_adaptor>
     typedef XMLReaderInterface<string_type, string_adaptor> XMLReaderT;
     typedef XMLFilterImpl<string_type, string_adaptor> XMLFilterT;
     typedef typename XMLFilterT::AttributesT AttributesT;
-    typedef typename string_type::value_type charT;
-    typedef typename string_type::traits_type traitsT;
-    typedef std::basic_ostream<charT, traitsT> ostreamT;
+    typedef typename string_adaptor::value_type charT;
+    typedef std::basic_ostream<charT> ostreamT;
     typedef Arabica::text::Unicode<charT> UnicodeT;
   private:
     using XMLFilterT::getParent;
@@ -103,7 +102,7 @@ void PYXWriter<string_type, string_adaptor>::processingInstruction(const string_
 template<class string_type, class string_adaptor>
 void PYXWriter<string_type, string_adaptor>::escape(const string_type& ch)
 {
-  for(typename string_type::const_iterator s = ch.begin(), se = ch.end(); s != se; ++s)
+  for(typename string_adaptor::const_iterator s = string_adaptor::begin(ch), se = string_adaptor::end(ch); s != se; ++s)
     if(*s == UnicodeT::LINE_FEED)
       *stream_ << UnicodeT::BACK_SLASH << UnicodeT::LOWERCASE_N;
     else
diff --git a/tests/SAX/test_WhitespaceStripper.hpp b/tests/SAX/test_WhitespaceStripper.hpp
index ab6b8e2e..499da27e 100644
--- a/tests/SAX/test_WhitespaceStripper.hpp
+++ b/tests/SAX/test_WhitespaceStripper.hpp
@@ -29,107 +29,114 @@ class WhitespaceStripperTest : public TestCase
     {
     } // setUp
 
+    void expect(char const* expected, std::basic_ostringstream<typename string_adaptor::value_type>& result) {
+        assertEquals(
+            expected,
+            string_adaptor::asStdString(string_adaptor::construct(result.str().c_str()))
+        );
+    }
+
     void testNoStrip() 
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::PYXWriter<std::string> writer(o, parser);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, parser);
       writer.parse(*source("<test><p>  Woo baby   hooray    </p></test>"));
-      assertEquals("(test\n(p\n-  Woo baby   hooray    \n)p\n)test\n", o.str());
+      expect("(test\n(p\n-  Woo baby   hooray    \n)p\n)test\n", o);
     } // testNoStrip
 
-    void testStripLeading() 
+    void testStripLeading()
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::WhitespaceStripper<std::string> stripper(parser);
-      Arabica::SAX::PYXWriter<std::string> writer(o, stripper);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::WhitespaceStripper<string_type, string_adaptor> stripper(parser);
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, stripper);
       writer.parse(*source("<test><p>Woo</p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p> Woo</p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>      Woo</p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
     } // testStripLeading
 
-    void testStripTrailing() 
+    void testStripTrailing()
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::WhitespaceStripper<std::string> stripper(parser);
-      Arabica::SAX::PYXWriter<std::string> writer(o, stripper);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::WhitespaceStripper<string_type, string_adaptor> stripper(parser);
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, stripper);
       writer.parse(*source("<test><p>Woo</p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo </p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo     </p></test>"));
-      assertEquals("(test\n(p\n-Woo\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo\n)p\n)test\n", o);
     } // testStripTrailing
 
     void testStripMid() 
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::WhitespaceStripper<std::string> stripper(parser);
-      Arabica::SAX::PYXWriter<std::string> writer(o, stripper);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::WhitespaceStripper<string_type, string_adaptor> stripper(parser);
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, stripper);
       writer.parse(*source("<test><p>Woo yea</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo yea\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo  yea</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo yea\n)p\n)test\n", o);
       
-      o.str("");
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo     yea</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo yea\n)p\n)test\n", o);
     } // testStripMid
 
     void testStripMid2() 
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::WhitespaceStripper<std::string> stripper(parser);
-      Arabica::SAX::PYXWriter<std::string> writer(o, stripper);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::WhitespaceStripper<string_type, string_adaptor> stripper(parser);
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, stripper);
       writer.parse(*source("<test><p>Woo yea man</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea man\n)p\n)test\n", o.str());
-      
-      o.str("");
+      expect("(test\n(p\n-Woo yea man\n)p\n)test\n", o);
+
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo yea  man</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea man\n)p\n)test\n", o.str());
-      
-      o.str("");
+      expect("(test\n(p\n-Woo yea man\n)p\n)test\n", o);
+
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo     yea man</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea man\n)p\n)test\n", o.str());
-      
-      o.str("");
+      expect("(test\n(p\n-Woo yea man\n)p\n)test\n", o);
+
+      o.str(string_adaptor::empty_string());
       writer.parse(*source("<test><p>Woo     yea    man</p></test>"));
-      assertEquals("(test\n(p\n-Woo yea man\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo yea man\n)p\n)test\n", o);
     } // testStripMid2
 
     void testStrip() 
     {
-      std::ostringstream o;
-      Arabica::SAX::XMLReader<std::string> parser;
-      Arabica::SAX::WhitespaceStripper<std::string> stripper(parser);
-      Arabica::SAX::PYXWriter<std::string> writer(o, stripper);
+      std::basic_ostringstream<typename string_adaptor::value_type> o;
+      Arabica::SAX::XMLReader<string_type, string_adaptor> parser;
+      Arabica::SAX::WhitespaceStripper<string_type, string_adaptor> stripper(parser);
+      Arabica::SAX::PYXWriter<string_type, string_adaptor> writer(o, stripper);
       writer.parse(*source("<test><p>  Woo baby   hooray    </p><!-- yo mama --></test>"));
-      assertEquals("(test\n(p\n-Woo baby hooray\n)p\n)test\n", o.str());
+      expect("(test\n(p\n-Woo baby hooray\n)p\n)test\n", o);
     } // testStrip
 
   private:
-    std::unique_ptr<Arabica::SAX::InputSource<std::string> > source(const std::string& str)
+    std::unique_ptr<Arabica::SAX::InputSource<string_type, string_adaptor> > source(const std::string& str)
     {
       std::unique_ptr<std::iostream> ss(new std::stringstream());
       (*ss) << str;
-      return std::make_unique<Arabica::SAX::InputSource<std::string>>(std::move(ss));
+      return std::make_unique<Arabica::SAX::InputSource<string_type, string_adaptor>>(std::move(ss));
     } // source
 }; // WhitespaceStripperTest