Added test case for #660

4 files changed, 58 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
index 9753fefb..4dc6438c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3001,6 +3001,8 @@ tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl -text
 tests/FunctionalTests/tickets/protected/pages/Ticket653/ticket653.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket656.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket659.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket660.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket660.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket669.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket670.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket671.page -text
@@ -3082,6 +3084,7 @@ tests/FunctionalTests/tickets/tests/Ticket595TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket622TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket653TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket659TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket660TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket700TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket703TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket708TestCase.php -text
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket660.page b/tests/FunctionalTests/tickets/protected/pages/Ticket660.page
new file mode 100644
index 00000000..baa9189c
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket660.page
@@ -0,0 +1,13 @@
+<com:TContent ID="Content">
+
+This page uses ISO-8859-1 encoding.
+<div>
+<com:TActiveTextBox ID="T" />
+<com:TActiveButton ID="CB" OnClick="changeA" Text="Perform CallBack"/>
+<com:TButton ID="PB" OnClick="changeA" Text="Perform PostBack"/>
+</div>
+<div id="output">
+<com:TActiveLabel ID="A" />
+</div>
+
+</com:TContent>
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket660.php b/tests/FunctionalTests/tickets/protected/pages/Ticket660.php
new file mode 100644
index 00000000..1f24f3cc
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket660.php
@@ -0,0 +1,16 @@
+<?php
+Prado::Using ('System.Web.UI.ActiveControls.*');
+class Ticket660 extends TPage {
+
+    public function __construct() {
+        Prado::getApplication()->getGlobalization()->setCharset('ISO-8859-1');
+        parent::__construct();
+    }
+
+    public function changeA($sender,$param) {
+        $iso_text=iconv('UTF-8', 'ISO-8859-1//IGNORE', 'ÄÖÜ äöü');
+        $this->A->setText($this->T->getText() . $iso_text);
+    }
+
+}
+?>
diff --git a/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php
new file mode 100644
index 00000000..5156d7b4
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php
@@ -0,0 +1,26 @@
+<?php
+class Ticket660TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base = 'ctl0_Content_';
+		$this->open('tickets/index.php?page=Ticket660');
+		$this->assertTitle("Verifying Ticket 660");
+		
+		$this->click($base.'PB');
+		$this->pause(800);
+		$this->assertText($base.'A','ÄÖÜ äöü');
+
+		$this->type($base.'T', 'äää');
+		$this->click($base.'PB');
+		$this->pause(800);
+		$this->assertText($base.'A','äääÄÖÜ äöü');
+
+		$this->type($base.'T', 'ööö');
+		$this->click($base.'CB');
+		$this->pause(800);
+		$this->assertText($base.'A','öööÄÖÜ äöü');
+	}
+
+}
+?>