tests: Don't require C++17

kjellahl · kjellahl · commit 223ffdd9ba8e · 2018-07-14T10:49:32.000+02:00
Don't include glibmm.h and don't call Glib::init(). Then no included
header file requires C++17 support, just C++14 support.
Glib::init() is not necessary, because libxml++ uses only a small part
of glibmm, mainly Glib::ustring.
diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc
@@ -19,7 +19,6 @@
 #include <libxml++/libxml++.h>
 
 #include <cstdlib>
-#include <glibmm.h>
 #include <sstream>
 #include <stdexcept>
 
@@ -38,7 +37,9 @@ class MySaxParser : public xmlpp::SaxParser
 
 int main()
 {
-  Glib::init();
+  // Set the global C and C++ locale to the user-configured locale,
+  // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
+  std::locale::global(std::locale(""));
 
   {
     MySaxParser parser;
diff --git a/tests/saxparser_parse_double_free/main.cc b/tests/saxparser_parse_double_free/main.cc
@@ -19,7 +19,6 @@
 #include <libxml++/libxml++.h>
 
 #include <cstdlib>
-#include <glibmm.h>
 #include <stdexcept>
 
 class OnCdataBlockTestParser : public xmlpp::SaxParser
@@ -340,7 +339,9 @@ void test_on_start_element()
 
 int main()
 {
-  Glib::init();
+  // Set the global C and C++ locale to the user-configured locale,
+  // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
+  std::locale::global(std::locale(""));
 
   test_on_cdata_block();
   test_on_characters();
diff --git a/tests/saxparser_parse_stream_inconsistent_state/main.cc b/tests/saxparser_parse_stream_inconsistent_state/main.cc
@@ -19,7 +19,6 @@
 #include <libxml++/libxml++.h>
 
 #include <cstdlib>
-#include <glibmm.h>
 #include <sstream>
 #include <stdexcept>
 
@@ -34,7 +33,9 @@ class MySaxParser : public xmlpp::SaxParser
 
 int main()
 {
-  Glib::init();
+  // Set the global C and C++ locale to the user-configured locale,
+  // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
+  std::locale::global(std::locale(""));
 
   {
     MySaxParser parser;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`#include <libxml++/libxml++.h>`
`20`	`20`
`21`	`21`	`#include <cstdlib>`
`22`		`-#include <glibmm.h>`
`23`	`22`	`#include <sstream>`
`24`	`23`	`#include <stdexcept>`
`25`	`24`
`@@ -38,7 +37,9 @@ class MySaxParser : public xmlpp::SaxParser`
`38`	`37`
`39`	`38`	`int main()`
`40`	`39`	`{`
`41`		`- Glib::init();`
	`40`	`+ // Set the global C and C++ locale to the user-configured locale,`
	`41`	`+ // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.`
	`42`	`+ std::locale::global(std::locale(""));`
`42`	`43`
`43`	`44`	`{`
`44`	`45`	`MySaxParser parser;`