unit test

Author: thirdwing

inst/include/Rcpp/String.h

@@ -373,9 +373,11 @@ namespace Rcpp {
         }
 
         inline void set_encoding( cetype_t encoding ) {
-            enc = encoding;
-            if (data != NULL)
-                data = Rf_mkCharCE(Rf_translateCharUTF8(data), enc);
+            if (enc != encoding) {
+			    enc = encoding;
+                if (data != NULL)
+                    data = Rf_mkCharCE(Rf_translateCharUTF8(data), enc);	
+			}
         }
 
         inline void set_encoding(const char* encoding) {

inst/unitTests/cpp/String.cpp

@@ -61,3 +61,21 @@ String test_push_front(String x) {
     x.push_front("abc");
     return x;
 }
+
+// [[Rcpp::export]]
+String test_String_encoding(String x) {
+    return x.get_encoding();
+}
+
+// [[Rcpp::export]]
+String test_String_set_encoding(String x) {
+    String y(x);
+    y.set_encoding("UTF-8");
+    return y;
+}
+
+// [[Rcpp::export]]
+String test_String_ctor_encoding(String x) {
+    String y(x, "UTF-8");
+    return y;
+}

inst/unitTests/runit.String.R

@@ -54,4 +54,15 @@ if (.runThisTest) {
         res <- test_push_front("def")
         checkIdentical(res, "abcdef")
     }
+
+    test.String.encoding <- function() {
+        a <- b <- "å"
+        Encoding(a) <- "unknown"
+        Encoding(b) <- "UTF-8"
+        checkEquals(test_String_encoding(a), "unknown")
+        checkEquals(test_String_encoding(b), "UTF-8")
+        checkEquals(Encoding(test_String_set_encoding(a)), "UTF-8")
+        checkEquals(Encoding(test_String_ctor_encoding(a)), "UTF-8")
+    }
+
 }