From 62d7a0570071bb572fa60e502596d21eaee57376 Mon Sep 17 00:00:00 2001 From: asperous Date: Thu, 11 Jul 2013 14:58:41 -0700 Subject: [ticket/11620] Abstracted session setUp into a test_case class When defining a database test case with a setUp function, it is important to call the parent's setup function, because that is when the database is setup. PHPBB3-11620 --- tests/test_framework/phpbb_session_test_case.php | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tests/test_framework/phpbb_session_test_case.php (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php new file mode 100644 index 0000000000..6ff7d8e2ef --- /dev/null +++ b/tests/test_framework/phpbb_session_test_case.php @@ -0,0 +1,27 @@ +session_factory = new phpbb_session_testable_factory; + $this->db = $this->new_dbal(); + $this->session_facade = + new phpbb_session_testable_facade($this->db, $this->session_factory); + } +} -- cgit v1.2.1 From 2fe2724e684304e1c8323c047d1dde6cd732afcd Mon Sep 17 00:00:00 2001 From: Andy Chase Date: Mon, 22 Jul 2013 17:39:45 -0700 Subject: [ticket/11620] Whitespace and combine function into test_case PHPBB3-11620 --- tests/test_framework/phpbb_session_test_case.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 6ff7d8e2ef..e6a2b03bba 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -24,4 +24,13 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case $this->session_facade = new phpbb_session_testable_facade($this->db, $this->session_factory); } + + protected function check_sessions_equals($expected_sessions, $message) + { + $sql = 'SELECT session_id, session_user_id + FROM phpbb_sessions + ORDER BY session_user_id'; + + $this->assertSqlResultEquals($expected_sessions, $sql, $message); + } } -- cgit v1.2.1 From 9c535da52888d60aecef9799062974e375f22f82 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 17 Sep 2013 22:00:06 -0500 Subject: [ticket/11850] page_name contains controller request rather than query string Fixing tests PHPBB3-11850 --- tests/test_framework/phpbb_session_test_case.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index e6a2b03bba..cfa8399c96 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -19,6 +19,13 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case function setUp() { parent::setUp(); + + global $symfony_request, $phpbb_filesystem, $request, $phpbb_root_path, $phpEx; + $symfony_request = new phpbb_symfony_request( + new phpbb_mock_request() + ); + $phpbb_filesystem = new phpbb_filesystem($symfony_request, $phpbb_root_path, $phpEx); + $this->session_factory = new phpbb_session_testable_factory; $this->db = $this->new_dbal(); $this->session_facade = -- cgit v1.2.1 From 85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 30 Sep 2013 18:31:26 -0500 Subject: [ticket/11850] Update for namespaces PHPBB3-11850 --- tests/test_framework/phpbb_session_test_case.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index cfa8399c96..36b4ff025f 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -20,11 +20,16 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case { parent::setUp(); - global $symfony_request, $phpbb_filesystem, $request, $phpbb_root_path, $phpEx; - $symfony_request = new phpbb_symfony_request( + global $symfony_request, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx; + $symfony_request = new \phpbb\symfony_request( new phpbb_mock_request() ); - $phpbb_filesystem = new phpbb_filesystem($symfony_request, $phpbb_root_path, $phpEx); + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + new \phpbb\filesystem(), + $phpbb_root_path, + $phpEx + ); $this->session_factory = new phpbb_session_testable_factory; $this->db = $this->new_dbal(); -- cgit v1.2.1 From 870c293bab260e1941c6c2e5fea1c11aa80472ec Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 30 Sep 2013 20:04:32 -0500 Subject: [ticket/11850] Fix tests PHPBB3-11850 --- tests/test_framework/phpbb_session_test_case.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 36b4ff025f..0a2f767845 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -20,13 +20,14 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case { parent::setUp(); - global $symfony_request, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx; + global $symfony_request, $phpbb_filesystem, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx; $symfony_request = new \phpbb\symfony_request( new phpbb_mock_request() ); + $phpbb_filesystem = new \phpbb\filesystem(); $phpbb_path_helper = new \phpbb\path_helper( $symfony_request, - new \phpbb\filesystem(), + $phpbb_filesystem, $phpbb_root_path, $phpEx ); -- cgit v1.2.1 From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Tue, 27 May 2014 20:18:06 +0200 Subject: [ticket/12594] Remove @package tags and update file headers PHPBB3-12594 --- tests/test_framework/phpbb_session_test_case.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 0a2f767845..8a5d582573 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -1,11 +1,15 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ require_once dirname(__FILE__) . '/../session/testable_factory.php'; require_once dirname(__FILE__) . '/../session/testable_facade.php'; -- cgit v1.2.1 From f383d4221ce085dc36ef4c04a0a2c7c3f381b108 Mon Sep 17 00:00:00 2001 From: Pico88 Date: Mon, 21 Apr 2014 19:53:46 +0200 Subject: [ticket/12099] Add request argument to path_helper service PHPBB3-12099 --- tests/test_framework/phpbb_session_test_case.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 8a5d582573..144e05b5fa 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -32,6 +32,8 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case $phpbb_path_helper = new \phpbb\path_helper( $symfony_request, $phpbb_filesystem, + $this->getMock('\phpbb\request\request'), + new \phpbb\config\config(array()), $phpbb_root_path, $phpEx ); -- cgit v1.2.1 From b7e1959d56a3334f730e5d0fd4194f5e4d0597a3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 7 May 2014 23:22:53 +0200 Subject: [ticket/12099] Remove config again PHPBB3-12099 --- tests/test_framework/phpbb_session_test_case.php | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 144e05b5fa..d4fc174a12 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -33,7 +33,6 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case $symfony_request, $phpbb_filesystem, $this->getMock('\phpbb\request\request'), - new \phpbb\config\config(array()), $phpbb_root_path, $phpEx ); -- cgit v1.2.1 From dec6c7ea8cd147e41a9095a77c1af41480dff654 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 17 Oct 2014 14:53:56 +0200 Subject: [ticket/13138] Type hint the variables for IDE usage PHPBB3-13138 --- tests/test_framework/phpbb_session_test_case.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index d4fc174a12..efad4d5166 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -16,8 +16,13 @@ require_once dirname(__FILE__) . '/../session/testable_facade.php'; abstract class phpbb_session_test_case extends phpbb_database_test_case { + /** @var phpbb_session_testable_factory */ protected $session_factory; + + /** @var phpbb_session_testable_facade */ protected $session_facade; + + /** @var \phpbb\db\driver\driver_interface */ protected $db; function setUp() -- cgit v1.2.1 From 21c8985fe85d54facc9dce59f6b7cbd293b21ade Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 14 Nov 2014 01:35:13 +0100 Subject: [ticket/13338] Add include statements for dependencies. PHPBB3-13338 --- tests/test_framework/phpbb_session_test_case.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/test_framework/phpbb_session_test_case.php') diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index efad4d5166..1bf0277fe0 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -11,6 +11,7 @@ * */ +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../session/testable_factory.php'; require_once dirname(__FILE__) . '/../session/testable_facade.php'; -- cgit v1.2.1