4 files changed, 8 insertions, 56 deletions

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 4a7484321c..a8248ae62c 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_create_test extends phpbb_database_test_case
+class phpbb_session_create_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
 	}
 
-	public function 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);
-	}
-
 	static function bot($bot_agent, $user_id, $bot_ip)
 	{
 		return array(array(
diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index cd71f82b17..5ff43cbb60 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_extract_hostname_test extends phpbb_database_test_case
+class phpbb_session_extract_hostname_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function 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);
-	}
-
 	static public function extract_current_hostname_data()
 	{
 		return array (
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index c17845526f..9346973bc4 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_extract_page_test extends phpbb_database_test_case
+class phpbb_session_extract_page_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function 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);
-	}
-
 	static public function extract_current_page_data()
 	{
 		return array(
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index 1428187f27..f91ac5f1f9 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_validate_referrer_test extends phpbb_database_test_case
+class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function 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);
-	}
-
 	static function referrer_inputs() {
 		$ex = "example.org";
 		$alt = "example.com";