From b878d5daa9e7210c35b2d06e1680f22eb6701c6f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 12 Jun 2012 00:35:45 -0400
Subject: [ticket/10933] Update template locator test to use style resource
 locator.

There is no reason for it to go through a template instance to test
resource locator functionality.

PHPBB3-10933
---
 tests/template/template_locate_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index be9ae06809..851dcae8ea 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -62,7 +62,7 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 		$this->setup_engine();
 
 		// Locate template
-		$result = $this->template->locate($files, $return_default, $return_full_path);
+		$result = $this->style_resource_locator->get_first_template_location($files, $return_default, $return_full_path);
 		$this->assertSame($expected, $result);
 	}
 }
-- 
cgit v1.2.1


From f7f21fa6927eab5fcff7d51d3618d2c48bd4e29d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Nov 2012 14:34:52 +0100
Subject: [ticket/11186] Database unit tests fail on windows using sqlite2

The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 25e0972f42..a43215bcf2 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -166,12 +166,6 @@ class phpbb_database_test_connection_manager
 		switch ($this->config['dbms'])
 		{
 			case 'sqlite':
-				if (file_exists($this->config['dbhost']))
-				{
-					unlink($this->config['dbhost']);
-				}
-			break;
-
 			case 'firebird':
 				$this->connect();
 				// Drop all of the tables
-- 
cgit v1.2.1


From e3b0e1a8a23b5627388df2b57ef82737c01dd1a1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 11 Nov 2012 10:44:47 +0000
Subject: [ticket/11190] Functional tests purge cache before running.

Added functions to get and purge cache to functional framework also.

PHPBB3-11190
---
 .../test_framework/phpbb_functional_test_case.php  | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d35913e415..bd248a662e 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -9,11 +9,14 @@
 use Symfony\Component\BrowserKit\CookieJar;
 
 require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
+require_once __DIR__ . '/../../phpBB/includes/acm/acm_file.php';
+require_once __DIR__ . '/../../phpBB/includes/cache.php';
 
 class phpbb_functional_test_case extends phpbb_test_case
 {
 	protected $client;
 	protected $root_url;
+	protected $cache = null;
 
 	/**
 	* Session ID for current test's session (each test makes its own)
@@ -47,6 +50,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// that were added in other tests are gone
 		$this->lang = array();
 		$this->add_lang('common');
+		$this->purge_cache();
 	}
 
 	public function request($method, $path)
@@ -61,6 +65,25 @@ class phpbb_functional_test_case extends phpbb_test_case
 	{
 	}
 
+	protected function get_cache_driver()
+	{
+		if (!$this->cache)
+		{
+			$this->cache = new cache();
+		}
+
+		return $this->cache;
+	}
+
+	protected function purge_cache()
+	{
+		$cache = $this->get_cache_driver();
+
+		$cache->purge();
+		$cache->unload();
+		$cache->load();
+	}
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
-- 
cgit v1.2.1


From db0cc74af073ede415b1ff21556a31f01ecfbe8f Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 11 Nov 2012 10:51:53 +0000
Subject: [ticket/11190-develop] Functional tests purge cache before running.

PHPBB3-11190
---
 tests/test_framework/phpbb_functional_test_case.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 41edb3e6af..eb2b497708 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -51,6 +51,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// that were added in other tests are gone
 		$this->lang = array();
 		$this->add_lang('common');
+		$this->purge_cache();
 	}
 
 	public function request($method, $path)
-- 
cgit v1.2.1


From 4ab178f3efd2ec497081bc1b3e57e4566d2eee6d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:19:40 -0500
Subject: [ticket/11202] Add a heuristic function to check for response
 success.

This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d35913e415..09f52effec 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -182,7 +182,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
 
 		$cookies = $this->cookieJar->all();
-		
+
 		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
 		foreach ($cookies as $cookie);
 		{
@@ -229,4 +229,19 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		return call_user_func_array('sprintf', $args);
 	}
+
+	/**
+	* Heuristic function to check that the response is success.
+	*
+	* When php decides to die with a fatal error, it still sends 200 OK
+	* status code. This assertion tries to catch that.
+	*
+	* @param string $message Optional failure message
+	*/
+	public function assert_response_success($message = null)
+	{
+		$this->assertEquals(200, $this->client->getResponse()->getStatus());
+		$content = $this->client->getResponse()->getContent();
+		$this->assertNotContains('Fatal error:', $content);
+	}
 }
-- 
cgit v1.2.1


From dc61fd1091d7cf7994eb1559691c4dfabec740f5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:20:07 -0500
Subject: [ticket/11202] Check response success before content assertions.

This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
---
 tests/functional/browse_test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 26c18c4c1f..b5748059c6 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -15,18 +15,21 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 	public function test_index()
 	{
 		$crawler = $this->request('GET', 'index.php');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewforum()
 	{
 		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewtopic()
 	{
 		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
 }
-- 
cgit v1.2.1


From af7ab2d3ac287db1a2c9ed623e21393cb429203f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:40:29 -0500
Subject: [ticket/11202] Custom message does not make sense here, delete it.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 09f52effec..de04783bce 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -236,9 +236,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* When php decides to die with a fatal error, it still sends 200 OK
 	* status code. This assertion tries to catch that.
 	*
-	* @param string $message Optional failure message
+	* @return null
 	*/
-	public function assert_response_success($message = null)
+	public function assert_response_success()
 	{
 		$this->assertEquals(200, $this->client->getResponse()->getStatus());
 		$content = $this->client->getResponse()->getContent();
-- 
cgit v1.2.1


From ec06d5c5d9f23b6419f048b885b689aa0ab4b351 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:18:55 -0500
Subject: [ticket/11204] Reindent.

PHPBB3-11204
---
 .../test_framework/phpbb_functional_test_case.php  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 8a329d43b1..16e1ccaff9 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -332,17 +332,17 @@ class phpbb_functional_test_case extends phpbb_test_case
 		return call_user_func_array('sprintf', $args);
 	}
 
-    /**
-     * assertContains for language strings
-     *
-     * @param string $needle Search string
-     * @param string $haystack Search this
-     * @param string $message Optional failure message
-     */
-    public function assertContainsLang($needle, $haystack, $message = null)
-    {
-        $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
-    }
+	/**
+	 * assertContains for language strings
+	 *
+	 * @param string $needle Search string
+	 * @param string $haystack Search this
+	 * @param string $message Optional failure message
+	 */
+	public function assertContainsLang($needle, $haystack, $message = null)
+	{
+		$this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+	}
 
 	/**
 	* Heuristic function to check that the response is success.
-- 
cgit v1.2.1


From 8917b31e31e117e9ded9558a065986bfb4a672ac Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:20:07 -0500
Subject: [ticket/11202] Check response success before content assertions.

This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
---
 tests/functional/extension_controller_test.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index e9409d9d3f..d92a830365 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -82,6 +82,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foobar');
 		$crawler = $this->request('GET', 'index.php?ext=foobar');
+		$this->assert_response_success();
 		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
 		$this->phpbb_extension_manager->purge('foobar');
 	}
@@ -94,6 +95,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'index.php?ext=foo/bar');
+		$this->assert_response_success();
 		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
-- 
cgit v1.2.1


From c15b98999ef1ba26531e3d6e20695a8f2672f5a4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 23:57:55 -0500
Subject: [ticket/11192] Add tests.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 50 +++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/functions/get_formatted_filesize_test.php

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
new file mode 100644
index 0000000000..1cc7ddf9ec
--- /dev/null
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_get_formatted_filesize_test extends phpbb_test_case
+{
+	public function get_formatted_filesize_test_data()
+	{
+		return array(
+			// exact powers of 2
+			array(1, '1 BYTES'),
+			array(1024, '1 KIB'),
+			array(1048576, '1 MIB'),
+			array(1073741824, '1 GIB'),
+			array(1099511627776, '1 TIB'),
+
+			array(0, '0 BYTES'),
+			array(2, '2 BYTES'),
+			array(-2, '-2 BYTES'),
+
+			array(1023, '1023 BYTES'),
+			array(1025, '1 KIB'),
+			array(-1023, '-1023 BYTES'),
+			array(-1025, '-1025 BYTES'),
+
+			array(1048575, '1024 KIB'),
+
+			// large negatives
+			array(-1073741824, '-1073741824 BYTES'),
+			array(-1099511627776, '-1099511627776 BYTES'),
+		);
+	}
+
+	/**
+	* @dataProvider get_formatted_filesize_test_data
+	*/
+	public function test_get_formatted_filesize($input, $expected)
+	{
+		$output = get_formatted_filesize($input);
+
+		$this->assertEquals($expected, $output);
+	}
+}
-- 
cgit v1.2.1


From b7ec639945a4667508e4a3d1f8ac73da94809b21 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Nov 2012 07:43:24 +0100
Subject: [ticket/11192] Also test powers of 10 / 1000.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index 1cc7ddf9ec..802f82d126 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -21,6 +21,13 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 			array(1073741824, '1 GIB'),
 			array(1099511627776, '1 TIB'),
 
+			// exact powers of 10
+			array(1000, '1000 BYTES'),
+			array(1000000, '976.56 KIB'),
+			array(1000000000, '953.67 MIB'),
+			array(1000000000000, '931.32 GIB'),
+			array(100000000000000, '90.95 TIB'),
+
 			array(0, '0 BYTES'),
 			array(2, '2 BYTES'),
 			array(-2, '-2 BYTES'),
-- 
cgit v1.2.1


From 09c8c58a5c9602a665519586b75ae3e9831367c8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Nov 2012 08:00:12 +0100
Subject: [ticket/11192] Also test strings, e.g. sums returned by the database.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index 802f82d126..85b06b723d 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -54,4 +54,14 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $output);
 	}
+
+	/**
+	* @dataProvider get_formatted_filesize_test_data
+	*/
+	public function test_get_formatted_filesize_string($input, $expected)
+	{
+		$output = get_formatted_filesize("$input");
+
+		$this->assertEquals($expected, $output);
+	}
 }
-- 
cgit v1.2.1


From 4e3a42f59fa32fb1a3e14cff959b19576e5ba7cf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Nov 2012 08:20:58 +0100
Subject: [ticket/11192] Test strings not converted to int/float before.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 38 +++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index 85b06b723d..88866f90ac 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -45,6 +45,40 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 		);
 	}
 
+	public function get_formatted_filesize_test_data_string()
+	{
+		return array(
+			// exact powers of 2
+			array('1', '1 BYTES'),
+			array('1024', '1 KIB'),
+			array('1048576', '1 MIB'),
+			array('1073741824', '1 GIB'),
+			array('1099511627776', '1 TIB'),
+
+			// exact powers of 10
+			array('1000', '1000 BYTES'),
+			array('1000000', '976.56 KIB'),
+			array('1000000000', '953.67 MIB'),
+			array('1000000000000', '931.32 GIB'),
+			array('100000000000000', '90.95 TIB'),
+
+			array('0', '0 BYTES'),
+			array('2', '2 BYTES'),
+			array('-2', '-2 BYTES'),
+
+			array('1023', '1023 BYTES'),
+			array('1025', '1 KIB'),
+			array('-1023', '-1023 BYTES'),
+			array('-1025', '-1025 BYTES'),
+
+			array('1048575', '1024 KIB'),
+
+			// large negatives
+			array('-1073741824', '-1073741824 BYTES'),
+			array('-1099511627776', '-1099511627776 BYTES'),
+		);
+	}
+
 	/**
 	* @dataProvider get_formatted_filesize_test_data
 	*/
@@ -56,11 +90,11 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 	}
 
 	/**
-	* @dataProvider get_formatted_filesize_test_data
+	* @dataProvider get_formatted_filesize_test_data_string
 	*/
 	public function test_get_formatted_filesize_string($input, $expected)
 	{
-		$output = get_formatted_filesize("$input");
+		$output = get_formatted_filesize($input);
 
 		$this->assertEquals($expected, $output);
 	}
-- 
cgit v1.2.1


From 7cbd440e7a69eb836eb9d58800f1c535d41b83ab Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Nov 2012 08:28:35 +0100
Subject: [ticket/11192] Mark negative byte numbers as unsupported.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index 88866f90ac..c4793e8073 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -30,18 +30,10 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 
 			array(0, '0 BYTES'),
 			array(2, '2 BYTES'),
-			array(-2, '-2 BYTES'),
 
 			array(1023, '1023 BYTES'),
 			array(1025, '1 KIB'),
-			array(-1023, '-1023 BYTES'),
-			array(-1025, '-1025 BYTES'),
-
 			array(1048575, '1024 KIB'),
-
-			// large negatives
-			array(-1073741824, '-1073741824 BYTES'),
-			array(-1099511627776, '-1099511627776 BYTES'),
 		);
 	}
 
@@ -64,18 +56,10 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 
 			array('0', '0 BYTES'),
 			array('2', '2 BYTES'),
-			array('-2', '-2 BYTES'),
 
 			array('1023', '1023 BYTES'),
 			array('1025', '1 KIB'),
-			array('-1023', '-1023 BYTES'),
-			array('-1025', '-1025 BYTES'),
-
 			array('1048575', '1024 KIB'),
-
-			// large negatives
-			array('-1073741824', '-1073741824 BYTES'),
-			array('-1099511627776', '-1099511627776 BYTES'),
 		);
 	}
 
-- 
cgit v1.2.1


From 8851f9589a5295d569316e76b366f1b16f1a9a96 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Nov 2012 16:20:55 +0100
Subject: [ticket/11192] Merge dataProvider arrays because the test is the same
 now.

PHPBB3-11192
---
 tests/functions/get_formatted_filesize_test.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index c4793e8073..96ea2be132 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -34,12 +34,8 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 			array(1023, '1023 BYTES'),
 			array(1025, '1 KIB'),
 			array(1048575, '1024 KIB'),
-		);
-	}
 
-	public function get_formatted_filesize_test_data_string()
-	{
-		return array(
+			// String values
 			// exact powers of 2
 			array('1', '1 BYTES'),
 			array('1024', '1 KIB'),
@@ -72,14 +68,4 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $output);
 	}
-
-	/**
-	* @dataProvider get_formatted_filesize_test_data_string
-	*/
-	public function test_get_formatted_filesize_string($input, $expected)
-	{
-		$output = get_formatted_filesize($input);
-
-		$this->assertEquals($expected, $output);
-	}
 }
-- 
cgit v1.2.1


From 06158693c7b846518abfe9d72491fc7376e457f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 19 Oct 2012 19:54:19 -0400
Subject: [feature/controller] Implement a front controller

PHPBB3-10864
---
 tests/controller/config/routing.yml          |  3 ++
 tests/controller/config/services.yml         |  3 ++
 tests/controller/controller_test.php         | 75 ++++++++++++++++++++++++++++
 tests/controller/ext/foo/config/routing.yml  |  3 ++
 tests/controller/ext/foo/config/services.yml |  3 ++
 tests/controller/ext/foo/controller.php      | 23 +++++++++
 tests/controller/includes/controller/foo.php | 23 +++++++++
 7 files changed, 133 insertions(+)
 create mode 100644 tests/controller/config/routing.yml
 create mode 100644 tests/controller/config/services.yml
 create mode 100644 tests/controller/controller_test.php
 create mode 100644 tests/controller/ext/foo/config/routing.yml
 create mode 100644 tests/controller/ext/foo/config/services.yml
 create mode 100644 tests/controller/ext/foo/controller.php
 create mode 100644 tests/controller/includes/controller/foo.php

(limited to 'tests')

diff --git a/tests/controller/config/routing.yml b/tests/controller/config/routing.yml
new file mode 100644
index 0000000000..175b11f130
--- /dev/null
+++ b/tests/controller/config/routing.yml
@@ -0,0 +1,3 @@
+core_controller:
+    pattern: /core_foo
+    defaults: { _controller: core_foo.controller:bar }
diff --git a/tests/controller/config/services.yml b/tests/controller/config/services.yml
new file mode 100644
index 0000000000..f1bd047489
--- /dev/null
+++ b/tests/controller/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    core_foo.controller:
+        class: phpbb_controller_foo
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
new file mode 100644
index 0000000000..38f58c80a0
--- /dev/null
+++ b/tests/controller/controller_test.php
@@ -0,0 +1,75 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class phpbb_controller_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			dirname(__FILE__) . '/',
+			array(
+				'foo' => array(
+					'ext_name' => 'foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/foo/',
+				),
+			));
+	}
+
+	public function test_provider()
+	{
+		$provider = new phpbb_controller_provider;
+		$routes = $provider
+			->get_paths($this->extension_manager->get_finder())
+			->find('./tests/controller/');
+
+		// This will need to be updated if any new routes are defined
+		$this->assertEquals(2, count($routes));
+	}
+
+	public function test_controller_resolver()
+	{
+		$container = new ContainerBuilder();
+		// For some reason, I cannot get it to load more than one services
+		// file at a time, even when givein multiple paths
+		// So instead, I am looping through all of the paths
+		foreach (array(__DIR__.'/config', __DIR__.'/ext/foo/config') as $path)
+		{
+			$loader = new YamlFileLoader($container, new FileLocator($path));
+			$loader->load('services.yml');
+		}
+
+		// Autoloading classes within the tests folder does not work
+		// so I'll include them manually
+		if (!class_exists('phpbb_ext_foo_controller'))
+		{
+			include(__DIR__.'/ext/foo/controller.php');
+		}
+		if (!class_exists('phpbb_controller_foo'))
+		{
+			include(__DIR__.'/includes/controller/foo.php');
+		}
+
+		$resolver = new phpbb_controller_resolver(new phpbb_user, $container);
+		$symfony_request = new Request(array(), array(), array('_controller' => 'foo.controller:handle'));
+
+		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_ext_foo_controller, 'handle'));
+
+		$symfony_request = new Request(array(), array(), array('_controller' => 'core_foo.controller:bar'));
+
+		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_controller_foo, 'bar'));
+	}
+}
diff --git a/tests/controller/ext/foo/config/routing.yml b/tests/controller/ext/foo/config/routing.yml
new file mode 100644
index 0000000000..4799fec37d
--- /dev/null
+++ b/tests/controller/ext/foo/config/routing.yml
@@ -0,0 +1,3 @@
+controller1:
+    pattern: /foo
+    defaults: { _controller: foo.controller:handle }
diff --git a/tests/controller/ext/foo/config/services.yml b/tests/controller/ext/foo/config/services.yml
new file mode 100644
index 0000000000..ce0e18c610
--- /dev/null
+++ b/tests/controller/ext/foo/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    foo.controller:
+        class: phpbb_ext_foo_controller
diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/foo/controller.php
new file mode 100644
index 0000000000..72b8560c20
--- /dev/null
+++ b/tests/controller/ext/foo/controller.php
@@ -0,0 +1,23 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Response;
+
+class phpbb_ext_foo_controller
+{
+	/**
+	* Constructor
+	*/
+	public function __construct()
+	{
+	}
+
+	/**
+	* Handle method
+	*
+	* @return null
+	*/
+	public function handle()
+	{
+		return new Response('Test', 200);
+	}
+}
diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/includes/controller/foo.php
new file mode 100644
index 0000000000..cd1c4849cb
--- /dev/null
+++ b/tests/controller/includes/controller/foo.php
@@ -0,0 +1,23 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Response;
+
+class phpbb_controller_foo
+{
+	/**
+	* Constructor
+	*/
+	public function __construct()
+	{	
+	}
+
+	/**
+	* Bar method
+	*
+	* @return null
+	*/
+	public function bar()
+	{
+		return new Response('bar()', 200);
+	}
+}
-- 
cgit v1.2.1


From 79bcbd3691a91e213a860dbcd1b11330752bd076 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 13 Nov 2012 09:48:12 -0500
Subject: [feature/controller] Add _controller attribute to Request after
 instantiation

PHPBB3-10864
---
 tests/controller/controller_test.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 38f58c80a0..b73019a6a0 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -64,11 +64,13 @@ class phpbb_controller_test extends phpbb_test_case
 		}
 
 		$resolver = new phpbb_controller_resolver(new phpbb_user, $container);
-		$symfony_request = new Request(array(), array(), array('_controller' => 'foo.controller:handle'));
+		$symfony_request = new Request();
+		$symfony_request->attributes->set('_controller', 'foo.controller:handle');
 
 		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_ext_foo_controller, 'handle'));
 
-		$symfony_request = new Request(array(), array(), array('_controller' => 'core_foo.controller:bar'));
+		$symfony_request = new Request();
+		$symfony_request->attributes->set('_controller', 'core_foo.controller:bar');
 
 		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_controller_foo, 'bar'));
 	}
-- 
cgit v1.2.1


From 1c5a82c4110cfbc328281d832bb38387df95c39d Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 13 Nov 2012 09:48:42 -0500
Subject: [feature/controller] Remove empty __construct() method

PHPBB3-10864
---
 tests/controller/ext/foo/controller.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'tests')

diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/foo/controller.php
index 72b8560c20..cfc5c20622 100644
--- a/tests/controller/ext/foo/controller.php
+++ b/tests/controller/ext/foo/controller.php
@@ -4,13 +4,6 @@ use Symfony\Component\HttpFoundation\Response;
 
 class phpbb_ext_foo_controller
 {
-	/**
-	* Constructor
-	*/
-	public function __construct()
-	{
-	}
-
 	/**
 	* Handle method
 	*
-- 
cgit v1.2.1


From 46cb0fb068feeb89c939d8b145808d2a786de8dd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 13 Nov 2012 10:57:24 -0500
Subject: [feature/controller] Removed another empty construct method

PHPBB3-10864
---
 tests/controller/includes/controller/foo.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'tests')

diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/includes/controller/foo.php
index cd1c4849cb..04576e16c4 100644
--- a/tests/controller/includes/controller/foo.php
+++ b/tests/controller/includes/controller/foo.php
@@ -4,13 +4,6 @@ use Symfony\Component\HttpFoundation\Response;
 
 class phpbb_controller_foo
 {
-	/**
-	* Constructor
-	*/
-	public function __construct()
-	{	
-	}
-
 	/**
 	* Bar method
 	*
-- 
cgit v1.2.1


From a87a5dd566bd4b9481cdca86fa6f4bc3363d58de Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Nov 2012 16:31:32 -0500
Subject: [feature/controller] Fix tests

PHPBB3-10864
---
 tests/controller/controller_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index b73019a6a0..577feee517 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -33,7 +33,7 @@ class phpbb_controller_test extends phpbb_test_case
 	{
 		$provider = new phpbb_controller_provider;
 		$routes = $provider
-			->get_paths($this->extension_manager->get_finder())
+			->import_paths_from_finder($this->extension_manager->get_finder())
 			->find('./tests/controller/');
 
 		// This will need to be updated if any new routes are defined
-- 
cgit v1.2.1


From 76917558832b0102716448770f365585aac224e9 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 09:23:57 -0500
Subject: [feature/controller] Adapt functional tests given new controller
 framework

PHPBB3-10864
---
 tests/functional/extension_controller_test.php     | 129 ++++++++-------------
 .../fixtures/ext/error/class/controller.php        |  14 ---
 tests/functional/fixtures/ext/error/class/ext.php  |   6 -
 .../fixtures/ext/error/classtype/controller.php    |  15 ---
 .../fixtures/ext/error/classtype/ext.php           |   6 -
 .../fixtures/ext/error/disabled/controller.php     |  14 ---
 .../functional/fixtures/ext/error/disabled/ext.php |   6 -
 .../fixtures/ext/foo/bar/config/routing.yml        |   3 +
 .../fixtures/ext/foo/bar/config/services.yml       |   3 +
 .../functional/fixtures/ext/foo/bar/controller.php |  14 ---
 .../fixtures/ext/foo/bar/controller/controller.php |  10 ++
 tests/functional/fixtures/ext/foo/bar/ext.php      |  12 +-
 .../bar/styles/prosilver/template/foobar_body.html |   5 -
 .../functional/fixtures/ext/foobar/controller.php  |  14 ---
 tests/functional/fixtures/ext/foobar/ext.php       |   6 -
 .../styles/prosilver/template/foobar_body.html     |   5 -
 16 files changed, 69 insertions(+), 193 deletions(-)
 delete mode 100644 tests/functional/fixtures/ext/error/class/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/class/ext.php
 delete mode 100644 tests/functional/fixtures/ext/error/classtype/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/classtype/ext.php
 delete mode 100644 tests/functional/fixtures/ext/error/disabled/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/disabled/ext.php
 create mode 100755 tests/functional/fixtures/ext/foo/bar/config/routing.yml
 create mode 100755 tests/functional/fixtures/ext/foo/bar/config/services.yml
 delete mode 100644 tests/functional/fixtures/ext/foo/bar/controller.php
 create mode 100755 tests/functional/fixtures/ext/foo/bar/controller/controller.php
 mode change 100644 => 100755 tests/functional/fixtures/ext/foo/bar/ext.php
 delete mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
 delete mode 100644 tests/functional/fixtures/ext/foobar/controller.php
 delete mode 100644 tests/functional/fixtures/ext/foobar/ext.php
 delete mode 100644 tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index d92a830365..2f07c8a70f 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -13,6 +13,14 @@
 class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
 {
 	protected $phpbb_extension_manager;
+
+	static protected $fixtures = array(
+		'foo/bar/config/routing.yml',
+		'foo/bar/config/services.yml',
+		'foo/bar/controller/controller.php',
+		'foo/bar/ext.php',
+	);
+
 	/**
 	* This should only be called once before the tests are run.
 	* This is used to copy the fixtures to the phpBB install
@@ -22,15 +30,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
-		// these directories need to be created before the files can be copied
 		$directories = array(
-			$phpbb_root_path . 'ext/error/class/',
-			$phpbb_root_path . 'ext/error/classtype/',
-			$phpbb_root_path . 'ext/error/disabled/',
 			$phpbb_root_path . 'ext/foo/bar/',
-			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template/',
-			$phpbb_root_path . 'ext/foobar/',
-			$phpbb_root_path . 'ext/foobar/styles/prosilver/template/',
+			$phpbb_root_path . 'ext/foo/bar/config/',
+			$phpbb_root_path . 'ext/foo/bar/controller/',
 		);
 
 		foreach ($directories as $dir)
@@ -40,23 +43,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 				mkdir($dir, 0777, true);
 			}
 		}
-
-		$fixtures = array(
-			'error/class/controller.php',
-			'error/class/ext.php',
-			'error/classtype/controller.php',
-			'error/classtype/ext.php',
-			'error/disabled/controller.php',
-			'error/disabled/ext.php',
-			'foo/bar/controller.php',
-			'foo/bar/ext.php',
-			'foo/bar/styles/prosilver/template/foobar_body.html',
-			'foobar/controller.php',
-			'foobar/ext.php',
-			'foobar/styles/prosilver/template/foobar_body.html',
-		);
-
-		foreach ($fixtures as $fixture)
+	
+		foreach (self::$fixtures as $fixture)
 		{
 			if (!copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture"))
 			{
@@ -65,6 +53,27 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		}
 	}
 
+	/**
+	* This should only be called once after the tests are run.
+	* This is used to remove the fixtures from the phpBB install
+	*/
+	static public function tearDownAfterClass()
+	{
+		global $phpbb_root_path;
+		foreach (self::$fixtures as $fixture)
+		{
+			if (!unlink("{$phpbb_root_path}ext/$fixture"))
+			{
+				echo 'Could not delete file ' . $fixture;
+			}
+		}
+
+		rmdir("{$phpbb_root_path}ext/foo/bar/config");
+		rmdir("{$phpbb_root_path}ext/foo/bar/controller");
+		rmdir("{$phpbb_root_path}ext/foo/bar");
+		rmdir("{$phpbb_root_path}ext/foo");
+	}
+
 	public function setUp()
 	{
 		parent::setUp();
@@ -75,72 +84,28 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check an extension at ./ext/foobar/ which should have the class
-	* phpbb_ext_foobar_controller
-	*/
-	public function test_foobar()
-	{
-		$this->phpbb_extension_manager->enable('foobar');
-		$crawler = $this->request('GET', 'index.php?ext=foobar');
-		$this->assert_response_success();
-		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
-		$this->phpbb_extension_manager->purge('foobar');
-	}
-
-	/**
-	* Check an extension at ./ext/foo/bar/ which should have the class
-	* phpbb_ext_foo_bar_controller
+	* Check a controller for extension foo/bar
 	*/
 	public function test_foo_bar()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'index.php?ext=foo/bar');
-		$this->assert_response_success();
-		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
-		$this->phpbb_extension_manager->purge('foo/bar');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/class which has class
-	* phpbb_ext_foobar_controller
-	*/
-	public function test_error_class_name()
-	{
-		$this->phpbb_extension_manager->enable('error/class');
-		$crawler = $this->request('GET', 'index.php?ext=error/class');
-		$this->assertContains("The extension error/class is missing a controller class and cannot be accessed through the front-end.", $crawler->filter('#message')->text());
-		$this->phpbb_extension_manager->purge('error/class');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/classtype which has class
-	* phpbb_ext_error_classtype_controller but does not implement phpbb_extension_controller_interface
-	*/
-	public function test_error_class_type()
-	{
-		$this->phpbb_extension_manager->enable('error/classtype');
-		$crawler = $this->request('GET', 'index.php?ext=error/classtype');
-		$this->assertContains("The extension controller class phpbb_ext_error_classtype_controller is not an instance of the phpbb_extension_controller_interface.", $crawler->filter('#message')->text());
-		$this->phpbb_extension_manager->purge('error/classtype');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/disabled that is (obviously)
-	* a disabled extension
-	*/
-	public function test_error_ext_disabled()
-	{
-		$crawler = $this->request('GET', 'index.php?ext=error/disabled');
-		$this->assertContains("The extension error/disabled is not enabled", $crawler->filter('#message')->text());
+		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foobar');
 	}
 
 	/**
-	* Check the error produced by extension at ./ext/error/404 that is (obviously)
-	* not existant
+	* Check the error produced by extension at ./ext/does/not/exist
+	*
+	* If an extension is disabled, its routes are not loaded. Because we
+	* are not looking for a controller based on a specified extension,
+	* we don't know the difference between a route in a disabled
+	* extension and a route that is not defined anyway; it is the same
+	* error message.
 	*/
-	public function test_error_ext_missing()
+	public function test_error_ext_disabled_or_404()
 	{
-		$crawler = $this->request('GET', 'index.php?ext=error/404');
-		$this->assertContains("The extension error/404 does not exist.", $crawler->filter('#message')->text());
+		$crawler = $this->request('GET', 'app.php/does/not/exist');
+		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/error/class/controller.php b/tests/functional/fixtures/ext/error/class/controller.php
deleted file mode 100644
index 74bbbee540..0000000000
--- a/tests/functional/fixtures/ext/error/class/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/class/ext.php b/tests/functional/fixtures/ext/error/class/ext.php
deleted file mode 100644
index f97ad2b838..0000000000
--- a/tests/functional/fixtures/ext/error/class/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_class_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/error/classtype/controller.php b/tests/functional/fixtures/ext/error/classtype/controller.php
deleted file mode 100644
index 55ac651bdf..0000000000
--- a/tests/functional/fixtures/ext/error/classtype/controller.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class phpbb_ext_error_classtype_controller
-{
-	public function handle()
-	{
-		global $template;
-		$template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/classtype/ext.php b/tests/functional/fixtures/ext/error/classtype/ext.php
deleted file mode 100644
index 35b1cd15a2..0000000000
--- a/tests/functional/fixtures/ext/error/classtype/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_classtype_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/error/disabled/controller.php b/tests/functional/fixtures/ext/error/disabled/controller.php
deleted file mode 100644
index 57b913f377..0000000000
--- a/tests/functional/fixtures/ext/error/disabled/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_error_disabled_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{		
-		$this->template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/disabled/ext.php b/tests/functional/fixtures/ext/error/disabled/ext.php
deleted file mode 100644
index aec8051848..0000000000
--- a/tests/functional/fixtures/ext/error/disabled/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_disabled_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
new file mode 100755
index 0000000000..7ecaba9e71
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -0,0 +1,3 @@
+foo_bar_controller:
+    pattern: /foo/bar
+    defaults: { _controller: foo_bar.controller:handle }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
new file mode 100755
index 0000000000..d1db6fcb1d
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    foo_bar.controller:
+        class: phpbb_ext_foo_bar_controller
diff --git a/tests/functional/fixtures/ext/foo/bar/controller.php b/tests/functional/fixtures/ext/foo/bar/controller.php
deleted file mode 100644
index 3375e317b3..0000000000
--- a/tests/functional/fixtures/ext/foo/bar/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foo_bar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'foobar_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
new file mode 100755
index 0000000000..4c5274951f
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -0,0 +1,10 @@
+<?php
+use Symfony\Component\HttpFoundation\Response;
+
+class phpbb_ext_foo_bar_controller
+{
+	public function handle()
+	{
+		return new Response('foo/bar controller handle() method', 200);
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
old mode 100644
new mode 100755
index 3a2068631e..b50f95990e
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-	
-}
+<?php
+
+class phpbb_ext_foobar_ext extends phpbb_extension_base
+{
+
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
deleted file mode 100644
index 4addf2666f..0000000000
--- a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="welcome">This is for testing purposes.</div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/ext/foobar/controller.php b/tests/functional/fixtures/ext/foobar/controller.php
deleted file mode 100644
index ff35f12ee0..0000000000
--- a/tests/functional/fixtures/ext/foobar/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'foobar_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/foobar/ext.php b/tests/functional/fixtures/ext/foobar/ext.php
deleted file mode 100644
index 7cf443d369..0000000000
--- a/tests/functional/fixtures/ext/foobar/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_ext extends phpbb_extension_base
-{
-
-}
diff --git a/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
deleted file mode 100644
index 4addf2666f..0000000000
--- a/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="welcome">This is for testing purposes.</div>
-
-<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From e516680859744e69b696ac0054ec3aefd94175b7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:28:35 -0500
Subject: [feature/controller] Use sizeof() instead of count() as per
 guidelines

PHPBB3-10864
---
 tests/controller/controller_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 577feee517..5a4c65e109 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -37,7 +37,7 @@ class phpbb_controller_test extends phpbb_test_case
 			->find('./tests/controller/');
 
 		// This will need to be updated if any new routes are defined
-		$this->assertEquals(2, count($routes));
+		$this->assertEquals(2, sizeof($routes));
 	}
 
 	public function test_controller_resolver()
-- 
cgit v1.2.1


From 230897723c9e5fc5534d9781b04ffd8dac70d51b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:29:35 -0500
Subject: [feature/controller] Reword comment for clarification

PHPBB3-10864
---
 tests/controller/controller_test.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 5a4c65e109..198fb3c6dd 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -43,9 +43,8 @@ class phpbb_controller_test extends phpbb_test_case
 	public function test_controller_resolver()
 	{
 		$container = new ContainerBuilder();
-		// For some reason, I cannot get it to load more than one services
-		// file at a time, even when givein multiple paths
-		// So instead, I am looping through all of the paths
+		// YamlFileLoader only uses one path at a time, so we need to loop
+		// through all of the ones we are using.
 		foreach (array(__DIR__.'/config', __DIR__.'/ext/foo/config') as $path)
 		{
 			$loader = new YamlFileLoader($container, new FileLocator($path));
@@ -53,7 +52,7 @@ class phpbb_controller_test extends phpbb_test_case
 		}
 
 		// Autoloading classes within the tests folder does not work
-		// so I'll include them manually
+		// so I'll include them manually.
 		if (!class_exists('phpbb_ext_foo_controller'))
 		{
 			include(__DIR__.'/ext/foo/controller.php');
-- 
cgit v1.2.1


From 0c75d3d7da9c5fd7ee1560597db684c9d1704c22 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:30:50 -0500
Subject: [feature/controller] Add test for missing argument in controller
 class

PHPBB3-10864
---
 tests/functional/extension_controller_test.php                 | 10 +++++++++-
 tests/functional/fixtures/ext/foo/bar/config/routing.yml       |  4 ++++
 .../functional/fixtures/ext/foo/bar/controller/controller.php  |  5 +++++
 tests/functional/fixtures/ext/foo/bar/ext.php                  |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 2f07c8a70f..b1e910aeac 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,7 +91,15 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/bar');
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
-		$this->phpbb_extension_manager->purge('foobar');
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	public function test_missing_argument()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
 	/**
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 7ecaba9e71..945ef51366 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -1,3 +1,7 @@
 foo_bar_controller:
     pattern: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
+
+foo_baz_controller:
+    pattern: /foo/baz
+    defaults: { _controller: foo_bar.controller:baz }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 4c5274951f..def5184e8c 100755
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -7,4 +7,9 @@ class phpbb_ext_foo_bar_controller
 	{
 		return new Response('foo/bar controller handle() method', 200);
 	}
+
+	public function baz($test)
+	{
+		return new Response('Value of "test" URL argument is: ' . $test);
+	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
index b50f95990e..7170209d53 100755
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
 <?php
 
-class phpbb_ext_foobar_ext extends phpbb_extension_base
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
 {
 
 }
-- 
cgit v1.2.1


From ba1acdca0364a9cd54c705d946fbae2144c59554 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:42:10 -0500
Subject: [feature/controller] Use warning instead of echo for copy() and
 unlink()

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index b1e910aeac..65a9c80df6 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -46,10 +46,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	
 		foreach (self::$fixtures as $fixture)
 		{
-			if (!copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture"))
-			{
-				echo 'Could not copy file ' . $fixture;
-			}
+			copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture");
 		}
 	}
 
@@ -62,10 +59,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		global $phpbb_root_path;
 		foreach (self::$fixtures as $fixture)
 		{
-			if (!unlink("{$phpbb_root_path}ext/$fixture"))
-			{
-				echo 'Could not delete file ' . $fixture;
-			}
+			unlink("{$phpbb_root_path}ext/$fixture");
 		}
 
 		rmdir("{$phpbb_root_path}ext/foo/bar/config");
-- 
cgit v1.2.1


From 5b013ddf5c48e71166dcefd6d384aea1d801698a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 11:41:05 -0500
Subject: [feature/controller] Add controller functional test with template

PHPBB3-10864
---
 tests/functional/extension_controller_test.php     | 32 ++++++++++++++++++----
 .../fixtures/ext/foo/bar/config/routing.yml        |  4 +++
 .../fixtures/ext/foo/bar/config/services.yml       |  3 ++
 .../fixtures/ext/foo/bar/controller/controller.php | 15 ++++++++++
 .../styles/prosilver/template/foo_bar_body.html    |  3 ++
 5 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 65a9c80df6..9cc2e0e32f 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -18,7 +18,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		'foo/bar/config/routing.yml',
 		'foo/bar/config/services.yml',
 		'foo/bar/controller/controller.php',
-		'foo/bar/ext.php',
+		'foo/bar/styles/prosilver/template/foo_bar_body.html',
 	);
 
 	/**
@@ -34,6 +34,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 			$phpbb_root_path . 'ext/foo/bar/',
 			$phpbb_root_path . 'ext/foo/bar/config/',
 			$phpbb_root_path . 'ext/foo/bar/controller/',
+			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template',
 		);
 
 		foreach ($directories as $dir)
@@ -43,10 +44,12 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 				mkdir($dir, 0777, true);
 			}
 		}
-	
+
 		foreach (self::$fixtures as $fixture)
 		{
-			copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture");
+			copy(
+				"tests/functional/fixtures/ext/$fixture",
+				"{$phpbb_root_path}ext/$fixture");
 		}
 	}
 
@@ -57,6 +60,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	static public function tearDownAfterClass()
 	{
 		global $phpbb_root_path;
+
 		foreach (self::$fixtures as $fixture)
 		{
 			unlink("{$phpbb_root_path}ext/$fixture");
@@ -64,6 +68,9 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 
 		rmdir("{$phpbb_root_path}ext/foo/bar/config");
 		rmdir("{$phpbb_root_path}ext/foo/bar/controller");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver/template");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles");
 		rmdir("{$phpbb_root_path}ext/foo/bar");
 		rmdir("{$phpbb_root_path}ext/foo");
 	}
@@ -78,7 +85,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check a controller for extension foo/bar
+	* Check a controller for extension foo/bar.
 	*/
 	public function test_foo_bar()
 	{
@@ -88,6 +95,21 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
+	/**
+	* Check the output of a controller using the template system
+	*/
+	public function test_controller_with_template()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php/foo/template');
+		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	/**
+	* Check the error produced by calling a controller without a required
+	* argument.
+	*/
 	public function test_missing_argument()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
@@ -97,7 +119,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check the error produced by extension at ./ext/does/not/exist
+	* Check the error produced by extension at ./ext/does/not/exist.
 	*
 	* If an extension is disabled, its routes are not loaded. Because we
 	* are not looking for a controller based on a specified extension,
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 945ef51366..123f5f1b73 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -5,3 +5,7 @@ foo_bar_controller:
 foo_baz_controller:
     pattern: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
+
+foo_template_controller:
+    pattern: /foo/template
+    defaults: { _controller: foo_bar.controller:template }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index d1db6fcb1d..33ced55af9 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -1,3 +1,6 @@
 services:
     foo_bar.controller:
         class: phpbb_ext_foo_bar_controller
+        arguments:
+            - @controller.helper
+            - @template
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index def5184e8c..50ea5d034b 100755
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -3,6 +3,14 @@ use Symfony\Component\HttpFoundation\Response;
 
 class phpbb_ext_foo_bar_controller
 {
+	protected $template;
+
+	public function __construct(phpbb_controller_helper $helper, phpbb_template $template)
+	{
+		$this->template = $template;
+		$this->helper = $helper;
+	}
+
 	public function handle()
 	{
 		return new Response('foo/bar controller handle() method', 200);
@@ -12,4 +20,11 @@ class phpbb_ext_foo_bar_controller
 	{
 		return new Response('Value of "test" URL argument is: ' . $test);
 	}
+
+	public function template()
+	{
+		$this->template->assign_var('A_VARIABLE', 'I am a variable');
+
+		return $this->helper->render('foo_bar_body.html');
+	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html
new file mode 100644
index 0000000000..8fb6994d3d
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html
@@ -0,0 +1,3 @@
+<!-- INCLUDE overall_header.html -->
+<div id="content">{A_VARIABLE}</div>
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 4efbb893b7b8ada8766847dc59724faef9c18142 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 17:36:39 -0500
Subject: [feature/controller] Fix line endings and permissions, and check
 responses

PHPBB3-10864
---
 tests/functional/extension_controller_test.php               |  4 ++++
 tests/functional/fixtures/ext/foo/bar/config/routing.yml     |  0
 tests/functional/fixtures/ext/foo/bar/config/services.yml    |  0
 .../fixtures/ext/foo/bar/controller/controller.php           |  0
 tests/functional/fixtures/ext/foo/bar/ext.php                | 12 ++++++------
 5 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/routing.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/services.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/controller/controller.php
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/ext.php

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 9cc2e0e32f..ba4a4e8ef0 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,6 +91,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$this->assert_response_success();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -102,6 +103,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/template');
+		$this->assert_response_success();
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -114,6 +116,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -130,6 +133,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_error_ext_disabled_or_404()
 	{
 		$crawler = $this->request('GET', 'app.php/does/not/exist');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
old mode 100755
new mode 100644
index 7170209d53..74359d51ab
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-
-}
+<?php
+
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
+{
+
+}
-- 
cgit v1.2.1


From 7a3d9ed85dfd7f32a938070fff854e56bf39738e Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 13:11:24 -0500
Subject: [feature/controller] Fix functional tests to use query string for
 controllers

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index ba4a4e8ef0..482fe9dfd3 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -90,7 +90,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_foo_bar()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$crawler = $this->request('GET', 'app.php?controller=foo/bar');
 		$this->assert_response_success();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
@@ -102,7 +102,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_controller_with_template()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php/foo/template');
+		$crawler = $this->request('GET', 'app.php?controller=foo/template');
 		$this->assert_response_success();
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
@@ -115,7 +115,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_missing_argument()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$crawler = $this->request('GET', 'app.php?controller=foo/baz');
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
@@ -132,7 +132,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	*/
 	public function test_error_ext_disabled_or_404()
 	{
-		$crawler = $this->request('GET', 'app.php/does/not/exist');
+		$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
-- 
cgit v1.2.1


From f8614bfc84ba9b9cc814b8f78e343005620f18f8 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 12:37:20 -0500
Subject: [feature/controller] Check for proper status codes from controllers

PHPBB3-10864
---
 tests/functional/extension_controller_test.php              | 13 ++++++++++++-
 tests/functional/fixtures/ext/foo/bar/config/routing.yml    |  4 ++++
 .../fixtures/ext/foo/bar/controller/controller.php          |  5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 482fe9dfd3..c7b585354e 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -116,11 +116,20 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php?controller=foo/baz');
-		$this->assertEquals(404, $this->client->getResponse()->getStatus());
+		$this->assertEquals(500, $this->client->getResponse()->getStatus());
 		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
+	public function test_exception_thrown_status_code()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php?controller=foo/exception');
+		$this->assertEquals(500, $this->client->getResponse()->getStatus());
+		$this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
 	/**
 	* Check the error produced by extension at ./ext/does/not/exist.
 	*
@@ -133,6 +142,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_error_ext_disabled_or_404()
 	{
 		$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
+		// This is 500 response because the exception is thrown from within Symfony
+		// and does not provide a exception code, so we assign it 500 by default
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 123f5f1b73..7eb604f746 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -9,3 +9,7 @@ foo_baz_controller:
 foo_template_controller:
     pattern: /foo/template
     defaults: { _controller: foo_bar.controller:template }
+
+foo_exception_controller:
+    pattern: /foo/foo_exception
+    defaults: { _controller: foo_bar.controller:exception }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 50ea5d034b..5a91b5f681 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -27,4 +27,9 @@ class phpbb_ext_foo_bar_controller
 
 		return $this->helper->render('foo_bar_body.html');
 	}
+
+	public function exception()
+	{
+		throw new phpbb_controller_exception('Exception thrown from foo/exception route');
+	}
 }
-- 
cgit v1.2.1


From 01ec6085939d74e6a37c3ef041434db1c4b8f3e4 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 12:55:15 -0500
Subject: [feature/controller] Fix comments, check against more general
 HttpException

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index c7b585354e..f28b321942 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -121,7 +121,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
-	public function test_exception_thrown_status_code()
+	/**
+	* Check the status code resulting from an exception thrown by a controller
+	*/
+	public function test_exception_should_result_in_500_status_code()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php?controller=foo/exception');
@@ -142,8 +145,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_error_ext_disabled_or_404()
 	{
 		$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
-		// This is 500 response because the exception is thrown from within Symfony
-		// and does not provide a exception code, so we assign it 500 by default
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
-- 
cgit v1.2.1


From 305f41cf1a540984fd7a71b61a601b1794e3bd04 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 13:16:55 -0500
Subject: [feature/controller] Fix misnamed route for functional test

PHPBB3-10864
---
 tests/functional/fixtures/ext/foo/bar/config/routing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 7eb604f746..09a30a8c67 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -11,5 +11,5 @@ foo_template_controller:
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/foo_exception
+    pattern: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
-- 
cgit v1.2.1