From: addshore <addshorewiki@gmail.com>
Date: Fri, 18 Nov 2016 19:25:47 +0000 (+0000)
Subject: Add 'tests' testsuite
X-Git-Tag: 1.31.0-rc.0~4818^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=87b59b2b9171a93967f53fbe5a3a02f8ff832b35;p=lhc%2Fweb%2Fwiklou.git

Add 'tests' testsuite

This also fixed the testLoggersAreRestoredOnTearDown
test which was broken, and factors it out into
3 seperate tests

Bug: T151081
Change-Id: I00d29b501fa84db22e3bcd3d5642c49b2e99d4a0
---

diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 16299aa7f6..11a25c4105 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -43,6 +43,9 @@
 		<testsuite name="structure">
 			<directory>structure</directory>
 		</testsuite>
+		<testsuite name="tests">
+			<directory>tests</directory>
+		</testsuite>
 		<testsuite name="uploadfromurl">
 			<file>suites/UploadFromUrlTestSuite.php</file>
 		</testsuite>
diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php b/tests/phpunit/tests/MediaWikiTestCaseTest.php
index 5d2f37e6a6..c005fe2c77 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseTest.php
+++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php
@@ -134,8 +134,7 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 	 * @covers MediaWikiTestCase::setLogger
 	 * @covers MediaWikiTestCase::restoreLogger
 	 */
-	public function testLoggersAreRestoredOnTearDown() {
-		// replacing an existing logger
+	public function testLoggersAreRestoredOnTearDown_replacingExistingLogger() {
 		$logger1 = LoggerFactory::getInstance( 'foo' );
 		$this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) );
 		$logger2 = LoggerFactory::getInstance( 'foo' );
@@ -144,17 +143,27 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 
 		$this->assertSame( $logger1, $logger3 );
 		$this->assertNotSame( $logger1, $logger2 );
+	}
 
-		// replacing a non-existing logger
+	/**
+	 * @covers MediaWikiTestCase::setLogger
+	 * @covers MediaWikiTestCase::restoreLogger
+	 */
+	public function testLoggersAreRestoredOnTearDown_replacingNonExistingLogger() {
 		$this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) );
-		$logger1 = LoggerFactory::getInstance( 'bar' );
+		$logger1 = LoggerFactory::getInstance( 'foo' );
 		$this->tearDown();
-		$logger2 = LoggerFactory::getInstance( 'bar' );
+		$logger2 = LoggerFactory::getInstance( 'foo' );
 
 		$this->assertNotSame( $logger1, $logger2 );
 		$this->assertInstanceOf( '\Psr\Log\LoggerInterface', $logger2 );
+	}
 
-		// replacing same logger twice
+	/**
+	 * @covers MediaWikiTestCase::setLogger
+	 * @covers MediaWikiTestCase::restoreLogger
+	 */
+	public function testLoggersAreRestoredOnTearDown_replacingSameLoggerTwice() {
 		$logger1 = LoggerFactory::getInstance( 'baz' );
 		$this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) );
 		$this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) );