From c14f7371cfa067a1f39306c7ab0d26afc9820e21 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 8 Mar 2014 10:38:44 -0800
Subject: [PATCH 1/2] Add test for loading extension language files to the
 example branch

---
 language/en/test_language.php            | 25 ++++++++++++++++++++++++
 tests/functional/extension_base_test.php | 14 +++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 language/en/test_language.php

diff --git a/language/en/test_language.php b/language/en/test_language.php
new file mode 100644
index 0000000..8f4baee
--- /dev/null
+++ b/language/en/test_language.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+$lang = array_merge($lang, array(
+	'FOO' => 'BAR',
+));
diff --git a/tests/functional/extension_base_test.php b/tests/functional/extension_base_test.php
index 7f4317c..ab6fe79 100644
--- a/tests/functional/extension_base_test.php
+++ b/tests/functional/extension_base_test.php
@@ -35,4 +35,18 @@ public function test_enable_disable_purge_extension()
 		$this->purge_extension();
 		$this->assertTrue($this->is_available());
 	}
+
+	/**
+	* Test loading of extension language files
+	*
+	* @access public
+	*/
+	public function test_extension_language()
+	{
+		// Add the language file
+		$this->add_lang_ext('test_language');
+		
+		// Test the language file was successfully loaded
+		$this->assertEquals($this->lang('FOO'), 'BAR');
+	}
 }

From 6022f37997c861b0c0910a0bcbf4cb12a46b8e29 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 12 Mar 2014 17:20:55 -0700
Subject: [PATCH 2/2] Order the expected vs test correctly in assertEquals()

---
 tests/functional/extension_base_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/extension_base_test.php b/tests/functional/extension_base_test.php
index ab6fe79..1aff440 100644
--- a/tests/functional/extension_base_test.php
+++ b/tests/functional/extension_base_test.php
@@ -47,6 +47,6 @@ public function test_extension_language()
 		$this->add_lang_ext('test_language');
 		
 		// Test the language file was successfully loaded
-		$this->assertEquals($this->lang('FOO'), 'BAR');
+		$this->assertEquals('BAR', $this->lang('FOO'));
 	}
 }