Improve test (#2121)

SemanticMediaWiki · Dec 18, 2016 · e5842a0 · e5842a0
1 parent a212e30
commit e5842a0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 41 deletions.
diff --git a/tests/phpunit/Unit/MediaWiki/Hooks/NewRevisionFromEditCompleteTest.php b/tests/phpunit/Unit/MediaWiki/Hooks/NewRevisionFromEditCompleteTest.php
@@ -7,8 +7,7 @@
 use SMW\ApplicationFactory;
 use SMW\DIProperty;
 use SMW\MediaWiki\Hooks\NewRevisionFromEditComplete;
-use SMW\Settings;
-use SMW\Tests\Utils\Validators\SemanticDataValidator;
+use SMW\Tests\TestEnvironment;
 use Title;
 use WikiPage;
 
@@ -23,25 +22,25 @@
  */
 class NewRevisionFromEditCompleteTest extends \PHPUnit_Framework_TestCase {
 
-	private $applicationFactory;
 	private $semanticDataValidator;
+	private $testEnvironment;
 
 	protected function setUp() {
 		parent::setUp();
 
-		$this->applicationFactory = ApplicationFactory::getInstance();
-		$this->semanticDataValidator = new SemanticDataValidator();
+		$this->testEnvironment = new TestEnvironment();
+
+		$this->semanticDataValidator = $this->testEnvironment->getUtilityFactory()->newValidatorFactory()->newSemanticDataValidator();
 
 		$store = $this->getMockBuilder( '\SMW\Store' )
 			->disableOriginalConstructor()
 			->getMockForAbstractClass();
 
-		$this->applicationFactory->registerObject( 'Store', $store );
+		$this->testEnvironment->registerObject( 'Store', $store );
 	}
 
 	protected function tearDown() {
-		$this->applicationFactory->clear();
-
+		$this->testEnvironment->tearDown();
 		parent::tearDown();
 	}
 
@@ -70,9 +69,8 @@ public function testCanConstruct() {
 	 */
 	public function testProcess( $parameters, $expected ) {
 
-		$this->applicationFactory->registerObject(
-			'Settings',
-			Settings::newFromArray( $parameters['settings'] )
+		$this->testEnvironment->withConfiguration(
+			$parameters['settings']
 		);
 
 		$instance = new NewRevisionFromEditComplete(
@@ -87,7 +85,7 @@ public function testProcess( $parameters, $expected ) {
 
 		if ( $editInfo && $editInfo->output instanceof ParserOutput ) {
 
-			$parserData = $this->applicationFactory->newParserData(
+			$parserData = ApplicationFactory::getInstance()->newParserData(
 				$parameters['wikiPage']->getTitle(),
 				$editInfo->output
 			);
@@ -158,10 +156,7 @@ public function wikiPageDataProvider() {
 				'revision' => $this->newRevisionStub(),
 				'settings' => array(
 					'smwgPageSpecialProperties' => array( DIProperty::TYPE_MODIFICATION_DATE ),
-					'smwgDVFeatures' => '',
-					'smwgQueryResultCacheType' => 'hash',
-					'smwgQueryResultCacheLifetime' => 60,
-					'smwgQueryResultNonEmbeddedCacheLifetime' => 60
+					'smwgDVFeatures' => ''
 				)
 			),
 			array(

diff --git a/tests/phpunit/Unit/MediaWiki/Hooks/TitleMoveCompleteTest.php b/tests/phpunit/Unit/MediaWiki/Hooks/TitleMoveCompleteTest.php
@@ -4,7 +4,7 @@
 
 use SMW\ApplicationFactory;
 use SMW\MediaWiki\Hooks\TitleMoveComplete;
-use SMW\Settings;
+use SMW\Tests\TestEnvironment;
 use SMW\Tests\Utils\Mock\MockSuperUser;
 use SMW\Tests\Utils\Mock\MockTitle;
 
@@ -19,19 +19,28 @@
  */
 class TitleMoveCompleteTest extends \PHPUnit_Framework_TestCase {
 
-	private $applicationFactory;
 	private $user;
+	private $testEnvironment;
 
 	protected function setUp() {
 		parent::setUp();
 
+		$this->testEnvironment = new TestEnvironment();
 		$this->user = new MockSuperUser();
-		$this->applicationFactory = ApplicationFactory::getInstance();
+
+		$settings = array(
+			'smwgCacheType'             => 'hash',
+			'smwgAutoRefreshOnPageMove' => true,
+			'smwgNamespacesWithSemanticLinks' => array( NS_MAIN => true, NS_HELP => false )
+		);
+
+		$this->testEnvironment->withConfiguration(
+			$settings
+		);
 	}
 
 	protected function tearDown() {
-		$this->applicationFactory->clear();
-
+		$this->testEnvironment->tearDown();
 		parent::tearDown();
 	}
 
@@ -66,16 +75,7 @@ public function testChangeSubjectForSupportedSemanticNamespace() {
 		$store->expects( $this->never() )
 			->method( 'changeTitle' );
 
-		$this->applicationFactory->registerObject( 'Settings', Settings::newFromArray( array(
-			'smwgCacheType'             => 'hash',
-			'smwgAutoRefreshOnPageMove' => true,
-			'smwgNamespacesWithSemanticLinks' => array( NS_MAIN => true ),
-			'smwgQueryResultCacheType' => 'hash',
-			'smwgQueryResultCacheLifetime' => 60,
-			'smwgQueryResultNonEmbeddedCacheLifetime' => 60
-		) ) );
-
-		$this->applicationFactory->registerObject( 'Store', $store );
+		$this->testEnvironment->registerObject( 'Store', $store );
 
 		$instance = new TitleMoveComplete(
 			$oldTitle,
@@ -104,16 +104,7 @@ public function testDeleteSubjectForNotSupportedSemanticNamespace() {
 			->with(
 				$this->equalTo( $oldTitle ) );
 
-		$this->applicationFactory->registerObject( 'Settings', Settings::newFromArray( array(
-			'smwgCacheType'             => 'hash',
-			'smwgAutoRefreshOnPageMove' => true,
-			'smwgNamespacesWithSemanticLinks' => array( NS_MAIN => true, NS_HELP => false ),
-			'smwgQueryResultCacheType' => 'hash',
-			'smwgQueryResultCacheLifetime' => 60,
-			'smwgQueryResultNonEmbeddedCacheLifetime' => 60
-		) ) );
-
-		$this->applicationFactory->registerObject( 'Store', $store );
+		$this->testEnvironment->registerObject( 'Store', $store );
 
 		$instance = new TitleMoveComplete(
 			$oldTitle,