From 9f3a02d4755409407a26bf75324ac0a8a15d87e2 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 9 Jul 2012 00:10:41 +0100
Subject: [PATCH] [ticket/10941] Removed manual includes of mock classes

Also marked a test as incomplete even though this appears to be
ignored when actually running the tests.

PHPBB3-10941
---
 tests/functional/fileupload_test_form.php | 5 +++--
 tests/upload/filespec_test.php            | 2 --
 tests/upload/fileupload_test.php          | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/functional/fileupload_test_form.php b/tests/functional/fileupload_test_form.php
index 48fa75ca4b..87979e6a68 100644
--- a/tests/functional/fileupload_test_form.php
+++ b/tests/functional/fileupload_test_form.php
@@ -43,11 +43,12 @@ class phpbb_functional_fileupload_test_form extends phpbb_functional_test_case
 	{
 		// Cannot be tested by an admin account which this functional framework
 		// provides
-		/*$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
+		$this->markTestIncomplete();
+		$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
 		$form = $crawler->selectButton('add_file')->form();
 		$form['fileupload']->upload($path . 'too-large.png');
 		$crawler = $this->client->submit($form);
-		$this->assertEquals(1, $crawler->filter('div#message')->count());*/
+		$this->assertEquals(1, $crawler->filter('div#message')->count());
 	}
 
 	public function test_valid_file()
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 7961e8ed64..fc6409999f 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -10,8 +10,6 @@
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
-require_once __DIR__ . '/../mock/fileupload.php';
-require_once __DIR__ . '/../mock/request.php';
 
 class phpbb_filespec_test extends phpbb_test_case
 {
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 2b3c17b8e0..076855ab56 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -10,7 +10,6 @@
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
-require_once __DIR__ . '/../mock/filespec.php';
 
 class phpbb_fileupload_test extends phpbb_test_case
 {