From 225aba976e0603c24d4808ad71d6b00e86326400 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 17 May 2013 01:22:22 +0200
Subject: [PATCH 1/2] [ticket/11547] Set MySQL charset to UTF8 in
 database_test_connection_manager.

PHPBB3-11547
---
 .../phpbb_database_test_connection_manager.php            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 3b8c2e99ae..af7e6b1144 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -142,6 +142,14 @@ class phpbb_database_test_connection_manager
 		}
 
 		$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+		switch ($this->config['dbms'])
+		{
+			case 'mysql':
+			case 'mysqli':
+				$this->pdo->exec('SET NAMES utf8');
+			default:
+		}
 	}
 
 	/**

From 1ee2543309245d627c000bcd1b3d680ae7498123 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 17 May 2013 02:13:51 +0200
Subject: [PATCH 2/2] [ticket/11542] Use Czech as example as it contains
 non-latin characters

PHPBB3-11542
---
 tests/functions/fixtures/language_select.xml | 6 +++---
 tests/functions/language_select_test.php     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/functions/fixtures/language_select.xml b/tests/functions/fixtures/language_select.xml
index 921f2c0a3a..d7232a3d28 100644
--- a/tests/functions/fixtures/language_select.xml
+++ b/tests/functions/fixtures/language_select.xml
@@ -13,9 +13,9 @@
 		</row>
 		<row>
 			<value>2</value>
-			<value>de</value>
-			<value>Deutsch</value>
-			<value>German</value>
+			<value>cs</value>
+			<value>Čeština</value>
+			<value>Czech</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/functions/language_select_test.php b/tests/functions/language_select_test.php
index 3ec2bd4bc3..3341e2a256 100644
--- a/tests/functions/language_select_test.php
+++ b/tests/functions/language_select_test.php
@@ -19,10 +19,10 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case
 	static public function language_select_data()
 	{
 		return array(
-			array('', '<option value="en">English</option><option value="de">Deutsch</option>'),
-			array('en', '<option value="en" selected="selected">English</option><option value="de">Deutsch</option>'),
-			array('de', '<option value="en">English</option><option value="de" selected="selected">Deutsch</option>'),
-			array('cs', '<option value="en">English</option><option value="de">Deutsch</option>'),
+			array('', '<option value="cs">Čeština</option><option value="en">English</option>'),
+			array('en', '<option value="cs">Čeština</option><option value="en" selected="selected">English</option>'),
+			array('cs', '<option value="cs" selected="selected">Čeština</option><option value="en">English</option>'),
+			array('de', '<option value="cs">Čeština</option><option value="en">English</option>'),
 		);
 	}