test with current locale, dont fail on converterror in viewable_text

gauteh · Nov 5, 2014 · 416d6d3 · 416d6d3
1 parent 9d378f1
commit 416d6d3
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/site_scons/site_tools/unittest.py b/site_scons/site_tools/unittest.py
@@ -11,8 +11,13 @@ def unitTestAction(target, source, env):
   change.
   '''
 
+  # merge in os environ to get utf-8 or users settings
+  myenv = os.environ.copy ()
+  for k,v in env['ENV'].items():
+    myenv[k] = v
+
   app = str(source[0].abspath)
-  process = subprocess.Popen (app, shell = True, env = env['ENV'])
+  process = subprocess.Popen (app, shell = True, env = myenv)
   process.wait ()
   ret = process.returncode
   if ret == 0:

diff --git a/src/chunk.cc b/src/chunk.cc
@@ -268,7 +268,15 @@ namespace Astroid {
 
       stringstream sstr;
       sstr << io_stream.rdbuf();
-      return ustring (sstr.str());
+      ustring b;
+      try {
+        b = sstr.str();
+      } catch (Glib::ConvertError &ex) {
+        log << error << "could not convert chunk to utf-8, contents: " << sstr.str() << endl;
+        throw ex;
+      }
+
+      return b;
     } else {
       return ustring ("Error: Non-viewable part!");
       log << error << "chunk: tried to display non-viewable part." << endl;

diff --git a/src/message_thread.cc b/src/message_thread.cc
@@ -167,7 +167,7 @@ namespace Astroid {
      * html:      output html (using gmimes html filter)
      */
     refptr<Chunk> c = root;
-    stringstream body;
+    ustring body;
 
     function< void (refptr<Chunk>) > app_body =
       [&] (refptr<Chunk> c)
@@ -194,7 +194,7 @@ namespace Astroid {
 
       if (use) {
         if (c->viewable && (c->preferred || html)) {
-          body << c->viewable_text(html);
+          body += c->viewable_text (html);
         }
 
         for_each (c->kids.begin(),
@@ -205,7 +205,7 @@ namespace Astroid {
 
     app_body (c);
 
-    return ustring(body.str());
+    return body;
   }
 
   vector<refptr<Chunk>> Message::attachments () {

diff --git a/test/test_convert_error.cc b/test/test_convert_error.cc
@@ -6,6 +6,7 @@
 # include "db.hh"
 # include "message_thread.hh"
 # include "glibmm.h"
+
 using namespace std;
 
 
@@ -14,12 +15,33 @@ BOOST_AUTO_TEST_SUITE(Reading)
 
   BOOST_AUTO_TEST_CASE(glib_convert_error)
   {
+    cout << "the current user preferred locale is: "
+         << locale("").name() << endl;
+
+    setlocale (LC_ALL, "");
+
+    cout << "the current user preferred locale is: "
+         << locale("").name() << endl;
+
+    locale::global (locale (""));
+
+    cout << "the current user preferred locale is: "
+         << locale("").name() << endl;
+
+
+    Glib::init ();
+
     BOOST_TEST_MESSAGE ("testing glib conversion of: æøå..");
     const char * input = "æøå";
 
-  }
+    BOOST_WARN_MESSAGE (Glib::get_charset (), "The current locale is not utf8");
 
-  BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES (reading_convert_error, 1)
+    string current_locale;
+    Glib::get_charset (current_locale);
+    BOOST_TEST_MESSAGE ("locale: " + current_locale);
+
+    BOOST_CHECK_NO_THROW(ustring out = Glib::locale_to_utf8 (input));
+  }
 
   BOOST_AUTO_TEST_CASE(reading_convert_error)
   {