diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 03:12:33 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 03:12:33 +0200 |
commit | 1004aaf7877f26685992c89532725296ce7f64d0 (patch) | |
tree | 4f97fc8cb8c534a55495c66c98b901170ecade13 /tests/test_framework | |
parent | 017d809e7495f86005a826ad555cbdfdbb308776 (diff) | |
parent | 2fe2724e684304e1c8323c047d1dde6cd732afcd (diff) | |
download | forums-1004aaf7877f26685992c89532725296ce7f64d0.tar forums-1004aaf7877f26685992c89532725296ce7f64d0.tar.gz forums-1004aaf7877f26685992c89532725296ce7f64d0.tar.bz2 forums-1004aaf7877f26685992c89532725296ce7f64d0.tar.xz forums-1004aaf7877f26685992c89532725296ce7f64d0.zip |
Merge remote-tracking branch 'asperous/ticket/11620' into develop
* asperous/ticket/11620: (46 commits)
[ticket/11620] Whitespace and combine function into test_case
[ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
[ticket/11620] Changed incorrect global variable
[ticket/11620] Minor indentation changes and comment clarity
[ticket/11620] Expected and actual test conditions wrongly swapped
[ticket/11620] Space between . in directory import concatenation
[ticket/11620] Changes to match merge
[ticket/11620] Changes for code guidelines consistency
[ticket/11620] Fix a static calls to non-static for session captcha
[ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
[ticket/11620] Update auth_provider for new interface
[ticket/11620] Added garbage_collection_test
[ticket/11620] Fixed check_ban_test errors with cache and ban warning message
[ticket/11620] Fixed a typo on check_ban_test
[ticket/11620] Refactored check_isvalid_test to use session_test_case
[ticket/11615] Refactored isvalid test to be more imperative
[ticket/11615] Rename continue -> check_isvalid for clarity
[ticket/11620] Added a test for checking if users are banned
[ticket/11620] Remove typo in beginning of session_key_test
[ticket/11620] Typo in file name session_key_tests -> test
...
Diffstat (limited to 'tests/test_framework')
-rw-r--r-- | tests/test_framework/phpbb_session_test_case.php | 36 |
1 files changed, 36 insertions, 0 deletions
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..e6a2b03bba --- /dev/null +++ b/tests/test_framework/phpbb_session_test_case.php @@ -0,0 +1,36 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2013 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +require_once dirname(__FILE__) . '/../session/testable_factory.php'; +require_once dirname(__FILE__) . '/../session/testable_facade.php'; + +abstract class phpbb_session_test_case extends phpbb_database_test_case +{ + protected $session_factory; + protected $session_facade; + protected $db; + + function setUp() + { + parent::setUp(); + $this->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); + } + + 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); + } +} |