aboutsummaryrefslogtreecommitdiffstats
path: root/tests/session
diff options
context:
space:
mode:
authorAndy Chase <asperous2@gmail.com>2013-06-27 15:57:58 -0700
committerAndy Chase <asperous2@gmail.com>2013-07-05 14:09:49 -0700
commit7fd03abcab531d3e989753492ab0cce78549c1a3 (patch)
tree91898d1c5c327a7dc92c3173caf3cfa12ec31183 /tests/session
parent9f156e995468d322a9b90f188cb31df059b03d82 (diff)
downloadforums-7fd03abcab531d3e989753492ab0cce78549c1a3.tar
forums-7fd03abcab531d3e989753492ab0cce78549c1a3.tar.gz
forums-7fd03abcab531d3e989753492ab0cce78549c1a3.tar.bz2
forums-7fd03abcab531d3e989753492ab0cce78549c1a3.tar.xz
forums-7fd03abcab531d3e989753492ab0cce78549c1a3.zip
[ticket/11620] Add data provider to extract_page
These test cases were taken from a live session, more test cases should be added to test specific functionality in this function. PHPBB3-11620
Diffstat (limited to 'tests/session')
-rw-r--r--tests/session/extract_page_test.php105
1 files changed, 91 insertions, 14 deletions
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index fca7763bc3..24fcb98164 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -14,6 +14,88 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
public $session_factory;
public $db;
+ static public function extract_current_page_data()
+ {
+ return array(
+ array(
+ './',
+ '/phpBB/index.php',
+ '',
+ '/phpBB/',
+ array(
+ 'page_name' => 'index.php',
+ 'page_dir' => '',
+ 'query_string' => '',
+ 'script_path' => '/phpBB/',
+ 'root_script_path' => '/phpBB/',
+ 'page' => 'index.php',
+ 'forum' => 0
+ )
+ ) ,
+ array(
+ './',
+ '/phpBB/ucp.php',
+ 'mode=login',
+ '/phpBB/ucp.php?mode=login',
+ array(
+ 'page_name' => 'ucp.php',
+ 'page_dir' => '',
+ 'query_string' => 'mode=login',
+ 'script_path' => '/phpBB/',
+ 'root_script_path' => '/phpBB/',
+ 'page' => 'ucp.php?mode=login',
+ 'forum' => 0
+ )
+ ) ,
+ array(
+ './',
+ '/phpBB/ucp.php',
+ 'mode=register',
+ '/phpBB/ucp.php?mode=register',
+ array(
+ 'page_name' => 'ucp.php',
+ 'page_dir' => '',
+ 'query_string' => 'mode=register',
+ 'script_path' => '/phpBB/',
+ 'root_script_path' => '/phpBB/',
+ 'page' => 'ucp.php?mode=register',
+ 'forum' => 0
+ )
+ ) ,
+ array(
+ './',
+ '/phpBB/ucp.php',
+ 'mode=register',
+ '/phpBB/ucp.php?mode=register',
+ array(
+ 'page_name' => 'ucp.php',
+ 'page_dir' => '',
+ 'query_string' => 'mode=register',
+ 'script_path' => '/phpBB/',
+ 'root_script_path' => '/phpBB/',
+ 'page' => 'ucp.php?mode=register',
+ 'forum' => 0
+ )
+ ) ,
+ array(
+ './../',
+ '/phpBB/adm/index.php',
+ 'sid=e7215d958cdd41a6fc13509bebe53e42',
+ '/phpBB/adm/index.php?sid=e7215d958cdd41a6fc13509bebe53e42',
+ array(
+ 'page_name' => 'index.php',
+ //'page_dir' => 'adm',
+ // ^-- Ignored because .. returns different directory in live vs testing
+ 'query_string' => '',
+ 'script_path' => '/phpBB/adm/',
+ 'root_script_path' => '/phpBB/',
+ //'page' => 'adm/index.php',
+ 'forum' => 0
+ )
+ )
+ );
+ }
+
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
@@ -25,25 +107,20 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
$this->db = $this->new_dbal();
}
- function test_extract_current_page()
+ /** @dataProvider extract_current_page_data */
+ function test_extract_current_page($root_path, $php_self, $query_string, $request_uri, $expected)
{
- $expected_fields = array(
- 'page_name' => "index.php",
- 'script_path' => "/phpBB/"
- );
-
$output = phpbb_session_testable_facade::extract_current_page(
$this->db,
$this->session_factory,
- /* Root Path */ "./",
- /* PHP Self */ "/phpBB/index.php",
- /* Query String*/ "",
- /* Request URI */ "/phpBB/"
+ $root_path,
+ $php_self,
+ $query_string,
+ $request_uri
);
- foreach($expected_fields as $field => $expected_value)
- {
- $this->assertSame($expected_value, $output[$field]);
- }
+ // This compares the result of the output.
+ // Any keys that are not in the expected array are overwritten by the output (aka not checked).
+ $this->assert_array_content_equals(array_merge($output, $expected), $output);
}
}