From 5936872c5130f48ee96a571bd0ed63dabf3cd663 Mon Sep 17 00:00:00 2001
From: execjosh <buildjosh@gmail.com>
Date: Sun, 7 Apr 2013 00:54:42 +0900
Subject: [PATCH] Improve WebPage CJK support tests.

This is for issue #10249: https://github.com/ariya/phantomjs/issues/10249.
---
 test/cjk-text-codecs.js | 48 +++++++++++++++++++++++++++++++++++++++++
 test/run-tests.js       |  1 +
 test/webpage-spec.js    | 25 ---------------------
 3 files changed, 49 insertions(+), 25 deletions(-)
 create mode 100644 test/cjk-text-codecs.js

diff --git a/test/cjk-text-codecs.js b/test/cjk-text-codecs.js
new file mode 100644
index 00000000..17b52d59
--- /dev/null
+++ b/test/cjk-text-codecs.js
@@ -0,0 +1,48 @@
+describe("WebPage CJK support", function () {
+    var texts = [
+        new Text("Shift_JIS", "g3SDQIOTg2eDgA==", "ファントム")
+    ,   new Text("EUC-JP", "pdWloaXzpcil4A0K", "ファントム")
+    ,   new Text("ISO-2022-JP", "GyRCJVUlISVzJUglYBsoQg0K", "ファントム")
+    ,   new Text("Big5", "pNu2SA0K", "幻象")
+    ,   new Text("GBK", "u8PP8w0K", "幻象")
+    ,   new Text("EUC-KR", "yK+/tQ==", "환영")
+    ];
+
+    texts.forEach(function (t) {
+        it(t.codec, function() {
+            var decodedText = -1;
+            var page = new WebPage();
+
+            page.open(t.dataUrl(), function(status) {
+                decodedText = page.evaluate(function() {
+                    return document.getElementsByTagName("pre")[0].innerText;
+                });
+                page.close();
+            });
+
+            waitsFor(function () {
+                return -1 !== decodedText;
+            }, "Text not decoded within three seconds", 3000);
+
+            runs(function () {
+                expect(t.check(decodedText)).toBeTruthy();
+            });
+        });
+    });
+
+    function Text(codec, base64, reference) {
+        this.codec = codec;
+        this.base64 = base64;
+        this.reference = reference;
+    }
+
+    Text.prototype.dataUrl = function () {
+        return "data:text/plain;charset=" + this.codec + ";base64," + this.base64;
+    };
+
+    Text.prototype.check = function (decodedText) {
+        return decodedText.match("^" + this.reference) == this.reference;
+    };
+});
+
+// vim:ts=4:sw=4:sts=4:et:
diff --git a/test/run-tests.js b/test/run-tests.js
index e7bb7750..83ae13d7 100644
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -72,6 +72,7 @@ phantom.injectJs("./system-spec.js");
 phantom.injectJs("./webkit-spec.js");
 require("./module_spec.js");
 require("./require/require_spec.js");
+require("./cjk-text-codecs.js");
 
 // Launch tests
 var jasmineEnv = jasmine.getEnv();
diff --git a/test/webpage-spec.js b/test/webpage-spec.js
index 4d7919ac..7e8659a8 100644
--- a/test/webpage-spec.js
+++ b/test/webpage-spec.js
@@ -1401,31 +1401,6 @@ describe("WebPage construction with options", function () {
         };
         checkViewportSize(new WebPage(opts), opts.viewportSize);
     });
-
-    var texts = [
-        { codec: 'Shift_JIS', base64: 'g3SDQIOTg2eDgA==', reference: 'ファントム'},
-        { codec: 'EUC-JP', base64: 'pdWloaXzpcil4A0K', reference: 'ファントム'},
-        { codec: 'ISO-2022-JP', base64: 'GyRCJVUlISVzJUglYBsoQg0K', reference: 'ファントム'},
-        { codec: 'Big5', base64: 'pNu2SA0K', reference: '幻象'},
-        { codec: 'GBK', base64: 'u8PP8w0K', reference: '幻象'}
-    ];
-    for (var i = 0; i < texts.length; ++i) {
-        describe("Text codec support", function() {
-            var text = texts[i];
-            var dataUrl = 'data:text/plain;charset=' + text.codec + ';base64,' + text.base64;
-            var page = new WebPage();
-            var decodedText;
-            page.open(dataUrl, function(status) {
-                decodedText = page.evaluate(function() {
-                    return document.getElementsByTagName('pre')[0].innerText;
-                });
-                page.close();
-            });
-            it("Should support text codec " + text.codec, function() {
-                expect(decodedText.match("^" + text.reference) == text.reference).toEqual(true);
-            });
-        });
-    }
 });
 
 describe("WebPage switch frame of execution (deprecated API)", function(){