From 689eaab3e2139d6e485d4cd0da1248f4a8de2404 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Thu, 7 Aug 2014 16:41:16 +0200
Subject: [PATCH] [ticket/12657] The test does not need to depend on the
database
PHPBB3-12657
---
tests/console/cache/fixtures/config.xml | 8 --------
tests/console/cache/purge_test.php | 11 ++---------
2 files changed, 2 insertions(+), 17 deletions(-)
delete mode 100644 tests/console/cache/fixtures/config.xml
diff --git a/tests/console/cache/fixtures/config.xml b/tests/console/cache/fixtures/config.xml
deleted file mode 100644
index 2cb683d409..0000000000
--- a/tests/console/cache/fixtures/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<dataset>
- <table name="phpbb_config">
- <column>config_name</column>
- <column>config_value</column>
- <column>is_dynamic</column>
- </table>
-</dataset>
diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php
index c950919cc2..ee4e8f5d50 100644
--- a/tests/console/cache/purge_test.php
+++ b/tests/console/cache/purge_test.php
@@ -17,7 +17,7 @@ use phpbb\console\command\cache\purge;
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
-class phpbb_console_command_cache_purge_test extends phpbb_database_test_case
+class phpbb_console_command_cache_purge_test extends phpbb_test_case
{
protected $cache_dir;
protected $cache;
@@ -30,15 +30,8 @@ class phpbb_console_command_cache_purge_test extends phpbb_database_test_case
$this->cache_dir = dirname(__FILE__) . '/tmp/cache/';
}
- public function getDataSet()
- {
- return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
- }
-
protected function setUp()
{
- parent::setUp();
-
if (file_exists($this->cache_dir))
{
// cache directory possibly left after aborted
@@ -49,7 +42,7 @@ class phpbb_console_command_cache_purge_test extends phpbb_database_test_case
$this->cache = new \phpbb\cache\driver\file($this->cache_dir);
- $this->db = $this->new_dbal();
+ $this->db = $this->getMock('\phpbb\db\driver\driver_interface');
$this->config = new \phpbb\config\config(array('assets_version' => 1));
}