[ticket/11174] Move assertion definition to base class.

PHPBB3-11174

2 files changed, 16 insertions, 16 deletions

diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 5f6d49c26c..21cbde496a 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -175,20 +175,4 @@ class phpbb_search_native_test extends phpbb_database_test_case
 		}
 		$this->assert_array_content_equals($common, $this->search->get_common_words());
 	}
-
-	public function assert_array_content_equals($one, $two)
-	{
-		// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important
-		// but one array_diff is not enough!
-		if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one)))
-		{
-			// get a nice error message
-			$this->assertEquals($one, $two);
-		}
-		else
-		{
-			// increase assertion count
-			$this->assertTrue(true);
-		}
-	}
 }
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 75a3c0944b..514619687a 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -141,4 +141,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	{
 		return $matches[1] . strtoupper($matches[2]) . $matches[3];
 	}
+
+	public function assert_array_content_equals($one, $two)
+	{
+		// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important
+		// but one array_diff is not enough!
+		if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one)))
+		{
+			// get a nice error message
+			$this->assertEquals($one, $two);
+		}
+		else
+		{
+			// increase assertion count
+			$this->assertTrue(true);
+		}
+	}
 }