Bug 1602816 - reinstate charset detection related tests: test_detectAttachmentCharset.js, test_messageHeaders.js, test_shiftjis_csv.js.

mailnews/compose/test/unit/data/test-windows-1252.txt

@@ -1 +1,2 @@
-ä - This is text in windows-1252.
+Buenos días - François a été à Paris - Budapester Straße, Berlin.
+This is text in windows-1252.

mailnews/compose/test/unit/test_detectAttachmentCharset.js

@@ -40,33 +40,25 @@ async function testUTF16LE() {
 }
 
 async function testShiftJIS() {
-  Services.prefs.setStringPref(
-    "intl.charset.detector",
-    "ja_parallel_state_machine"
-  );
   await createMessage(do_get_file("data/test-SHIFT_JIS.txt"));
   checkAttachmentCharset("Shift_JIS");
 }
 
 async function testISO2022JP() {
-  Services.prefs.setStringPref(
-    "intl.charset.detector",
-    "ja_parallel_state_machine"
-  );
   await createMessage(do_get_file("data/test-ISO-2022-JP.txt"));
   checkAttachmentCharset("ISO-2022-JP");
 }
 
 async function testKOI8R() {
-  Services.prefs.setStringPref("intl.charset.detector", "ruprob");
+  // NOTE: KOI8-R is detected as KOI8-U which is a superset covering both
+  // Russian and Ukrainian (a few box-drawing characters are repurposed).
   await createMessage(do_get_file("data/test-KOI8-R.txt"));
-  checkAttachmentCharset("KOI8-R");
+  checkAttachmentCharset("KOI8-U");
 }
 
 async function testWindows1252() {
-  Services.prefs.clearUserPref("intl.charset.detector");
   await createMessage(do_get_file("data/test-windows-1252.txt"));
-  checkAttachmentCharset(null); // windows-1252 is not directly detected.
+  checkAttachmentCharset("windows-1252");
 }
 
 var tests = [

mailnews/compose/test/unit/xpcshell.ini

@@ -11,11 +11,9 @@ skip-if = os == 'mac'
 [test_bug235432.js]
 [test_bug474774.js]
 [test_detectAttachmentCharset.js]
-skip-if = true # See bug 1602816.
 [test_expandMailingLists.js]
 [test_mailtoURL.js]
 [test_messageHeaders.js]
-skip-if = true # See bug 1602816.
 [test_nsIMsgCompFields.js]
 [test_nsMsgCompose1.js]
 [test_nsMsgCompose2.js]

mailnews/import/test/unit/xpcshell.ini

@@ -16,7 +16,6 @@ run-if = os == 'win'
 [test_outlook_settings.js]
 run-if = os == 'win'
 [test_shiftjis_csv.js]
-skip-if = true # See bug 1602816.
 [test_utf16_csv.js]
 [test_vcard_import.js]
 [test_winmail.js]