From f5bac7686b1678dbd33eddd368d845237bb18943 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 19:14:53 +0300
Subject: [ticket/10733] Removing static from data providers

Removing static from data provider functions

PHPBB3-10733
---
 tests/template/template_inheritance_test.php | 2 +-
 tests/template/template_locate_test.php      | 2 +-
 tests/template/template_test.php             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/template')

diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index 7348da9a4a..a76658701a 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -14,7 +14,7 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			// First element of the array is test name - keep them distinct
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 591a6afe0c..8edbd6a008 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/template_test_case.php';
 
 class phpbb_template_template_locate_test extends phpbb_template_template_test_case
 {
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			// First element of the array is test name - keep them distinct
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index edf621e16c..739bbe9387 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -15,7 +15,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			/*
@@ -394,7 +394,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
 	}
 
-	public static function alter_block_array_data()
+	public function alter_block_array_data()
 	{
 		return array(
 			array(
-- 
cgit v1.2.1


From eaba2ed9ca6025358de0432bb569cfb2e3ca6985 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 19:20:42 +0300
Subject: [ticket/10733] Fixing test

Changing expected and result in locator test

PHPBB3-10733
---
 tests/template/template_locate_test.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/template')

diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 8edbd6a008..89a4ae6fb1 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -17,38 +17,38 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 			// First element of the array is test name - keep them distinct
 			array(
 				'simple inheritance - only parent template exists',
+				dirname(__FILE__) . '/parent_templates/parent_only.html',
 				'parent_only.html',
 				false,
 				true,
-				dirname(__FILE__) . '/parent_templates/parent_only.html',
 			),
 			array(
 				'simple inheritance - only child template exists',
+				dirname(__FILE__) . '/templates/child_only.html',
 				'child_only.html',
 				false,
 				true,
-				dirname(__FILE__) . '/templates/child_only.html',
 			),
 			array(
 				'simple inheritance - both parent and child templates exist',
+				dirname(__FILE__) . '/templates/parent_and_child.html',
 				'parent_and_child.html',
 				false,
 				true,
-				dirname(__FILE__) . '/templates/parent_and_child.html',
 			),
 			array(
 				'find first template - only child template exists in main style',
+				'child_only.html',
 				array('parent_only.html', 'child_only.html'),
 				false,
 				false,
-				'child_only.html',
 			),
 			array(
 				'find first template - both templates exist in main style',
+				'parent_and_child.html',
 				array('parent_and_child.html', 'child_only.html'),
 				false,
 				false,
-				'parent_and_child.html',
 			),
 		);
 	}
@@ -56,14 +56,14 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 	/**
 	* @dataProvider template_data
 	*/
-	public function test_template($name, $files, $return_default, $return_full_path, $expected)
+	public function test_template($name, $expected, $files, $return_default, $return_full_path)
 	{
 		// Reset the engine state
 		$this->setup_engine();
 
 		// Locate template
 		$result = $this->template->locate($files, $return_default, $return_full_path);
-		$this->assertEquals($result, $expected);
+		$this->assertSame($expected, $result);
 	}
 
 	protected function setup_engine(array $new_config = array())
-- 
cgit v1.2.1