From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 26 Jul 2011 01:42:40 +0000 (-0400)
Subject: Use assertEqualUTF8String instead of assertEqualString for comparing UTF-8 file names.
X-Git-Tag: v3.0.0a~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2fdb20e5f81f276ab47d262d0f6ffb68774c7e;p=thirdparty%2Flibarchive.git

Use assertEqualUTF8String instead of assertEqualString for comparing UTF-8 file names.

SVN-Revision: 3501
---

diff --git a/libarchive/test/test_read_format_rar.c b/libarchive/test/test_read_format_rar.c
index 7a3b64679..9d895d199 100644
--- a/libarchive/test/test_read_format_rar.c
+++ b/libarchive/test/test_read_format_rar.c
@@ -190,7 +190,7 @@ test_unicode(void)
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
-  assertEqualString("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
+  assertEqualUTF8String("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
       "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x95\xE3\x82"
       "\xA9\xE3\x83\xAB\xE3\x83\x80/\xE6\x96\xB0\xE8\xA6\x8F"
       "\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88 "
@@ -202,7 +202,7 @@ test_unicode(void)
 
   /* Second header. */
   assertA(0 == archive_read_next_header(a, &ae));
-  assertEqualString("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
+  assertEqualUTF8String("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
       "\xE6\xBC\xA2\xE5\xAD\x97\xE9\x95\xB7\xE3\x81\x84\xE3\x83\x95"
       "\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE5\x90\x8Dlong-filename-in-"
       "\xE6\xBC\xA2\xE5\xAD\x97.txt", archive_entry_pathname(ae));
@@ -214,7 +214,7 @@ test_unicode(void)
 
   /* Third header. */
   assertA(0 == archive_read_next_header(a, &ae));
-  assertEqualString("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
+  assertEqualUTF8String("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88/"
       "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x95\xE3\x82"
       "\xA9\xE3\x83\xAB\xE3\x83\x80", archive_entry_pathname(ae));
   assertA((int)archive_entry_mtime(ae));
@@ -223,7 +223,7 @@ test_unicode(void)
 
   /* Fourth header. */
   assertA(0 == archive_read_next_header(a, &ae));
-  assertEqualString("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88",
+  assertEqualUTF8String("\xE8\xA1\xA8\xE3\x81\xA0\xE3\x82\x88",
       archive_entry_pathname(ae));
   assertA((int)archive_entry_mtime(ae));
   assertEqualInt(0, archive_entry_size(ae));