Fortify tests against NDEBUG

13 files changed, 40 insertions, 22 deletions

diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
index cbeb864..35b3927 100644
--- a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test-pskel.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 using xml_schema::ro_string;
@@ -23,7 +26,7 @@ struct any_type_pimpl: xml_schema::any_type_pimpl
   }
 
   virtual void
-  _start_any_element (ro_string const&, 
+  _start_any_element (ro_string const&,
                       ro_string const& n,
 		      ro_string const*)
   {
diff --git a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
index 3fe20ec..b3f0dbf 100644
--- a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in base64Binary and hexBinary types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
index f1499cd..3b25ffe 100644
--- a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in boolean type validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 bool
diff --git a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
index b533cfd..9b0e9a1 100644
--- a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in byte and unsigned byte types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
index da02a50..36f384f 100644
--- a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in date and time types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
index e92c419..87a744d 100644
--- a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
@@ -4,11 +4,13 @@
 // Test the built-in float, double, and decimal types validation.
 //
 #include <math.h>
-#include <cassert>
 
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
index 270cd0e..7e68b35 100644
--- a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in int and unsigned int types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
index 3a5fdd5..4f8a80c 100644
--- a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
@@ -7,11 +7,13 @@
 
 #include <string>
 #include <sstream>
-#include <cassert>
 
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace xsd::cxx::parser::validating;
 
diff --git a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
index a4ab565..41feb0b 100644
--- a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in long and unsigned long types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
index 85acd1c..8845b38 100644
--- a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in QName type validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 bool
diff --git a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
index 7c79b22..f09f975 100644
--- a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in short and unsigned short types validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
index 920385a..d74ee52 100644
--- a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
@@ -4,11 +4,13 @@
 // Test the built-in string & friends types validation.
 //
 #include <string>
-#include <cassert>
 
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
index dcc9242..c296858 100644
--- a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
@@ -3,11 +3,12 @@
 
 // Test the built-in anyURI type validation.
 //
-#include <cassert>
-
 #include <xsd/cxx/parser/validating/exceptions.hxx>
 #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xsd::cxx::parser::validating;
 
 int