From cde5411e8aad0436ca709a46e109cd38e4c21a9e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 8 Jul 2012 22:35:50 +0200
Subject: [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

PHPBB3-10974
---
 tests/bbcode/url_bbcode_test.php           |  2 +-
 tests/mock/user.php                        | 36 ++++++++++++++++++++++++++++++
 tests/mock_user.php                        | 36 ------------------------------
 tests/text_processing/censor_text_test.php |  2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 tests/mock/user.php
 delete mode 100644 tests/mock_user.php

diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 15bdfc434f..6b5afe5808 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
-require_once dirname(__FILE__) . '/../mock_user.php';
+require_once dirname(__FILE__) . '/../mock/user.php';
 
 class phpbb_url_bbcode_test extends phpbb_test_case
 {
diff --git a/tests/mock/user.php b/tests/mock/user.php
new file mode 100644
index 0000000000..ec14ce430e
--- /dev/null
+++ b/tests/mock/user.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* Mock user class.
+* This class is used when tests invoke phpBB code expecting to have a global
+* user object, to avoid instantiating the actual user object.
+* It has a minimum amount of functionality, just to make tests work.
+*/
+class phpbb_mock_user
+{
+	public $host = "testhost";
+	public $page = array('root_script_path' => '/');
+	
+	private $options = array();
+	public function optionget($item)
+	{
+		if (!isset($this->options[$item]))
+		{
+			throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item));
+		}
+		
+		return $this->options[$item];
+	}
+	
+	public function optionset($item, $value)
+	{
+		$this->options[$item] = $value;
+	}
+}
diff --git a/tests/mock_user.php b/tests/mock_user.php
deleted file mode 100644
index ec14ce430e..0000000000
--- a/tests/mock_user.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* Mock user class.
-* This class is used when tests invoke phpBB code expecting to have a global
-* user object, to avoid instantiating the actual user object.
-* It has a minimum amount of functionality, just to make tests work.
-*/
-class phpbb_mock_user
-{
-	public $host = "testhost";
-	public $page = array('root_script_path' => '/');
-	
-	private $options = array();
-	public function optionget($item)
-	{
-		if (!isset($this->options[$item]))
-		{
-			throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item));
-		}
-		
-		return $this->options[$item];
-	}
-	
-	public function optionset($item, $value)
-	{
-		$this->options[$item] = $value;
-	}
-}
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index 8fcdb7ef85..f0e13638a5 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
-require_once dirname(__FILE__) . '/../mock_user.php';
+require_once dirname(__FILE__) . '/../mock/user.php';
 require_once dirname(__FILE__) . '/../mock/cache.php';
 
 class phpbb_text_processing_censor_text_test extends phpbb_test_case
-- 
cgit v1.2.1