Static tests

Author: driusan

test/unittests/Database_Test.php

@@ -92,11 +92,7 @@ protected function setUp(): void
         $this->factory = NDB_Factory::singleton();
         $this->factory->reset();
         $this->config = $this->factory->Config(CONFIG_XML);
-        $database     = $this->config->getSetting('database');
         $this->DB     = $this->factory->database();
-
-        $this->factory->setDatabase($this->DB);
-        $this->factory->setConfig($this->config);
     }
 
     /**

test/unittests/UserTest.php

@@ -279,7 +279,6 @@ protected function setUp(): void
         $this->_factory = \NDB_Factory::singleton();
         $this->_factory->reset();
         $this->_configMock = $this->_factory->Config(CONFIG_XML);
-        $database          = $this->_configMock->getSetting('database');
         $this->_dbMock     = $this->_factory->database();
 
         $mockconfig = $this->getMockBuilder('NDB_Config')->getMock();
@@ -312,6 +311,7 @@ protected function setUp(): void
         $this->_userInfo['Password_hash']         = $passwordHash;
         $this->_userInfoComplete['Password_hash'] = $passwordHash;
 
+        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
     }
 
@@ -339,7 +339,6 @@ protected function tearDown(): void
      */
     public function testFactoryRetrievesUserInfo()
     {
-        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
         //validate _user Info
         $this->assertEquals($this->_userInfoComplete, $this->_user->getData());
@@ -354,7 +353,6 @@ public function testFactoryRetrievesUserInfo()
      */
     public function testGetDataForLanguagePreferences()
     {
-        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
         $this->assertEquals(
             $this->_userInfoComplete['language_preference'],
@@ -370,7 +368,6 @@ public function testGetDataForLanguagePreferences()
      */
     public function testGetFullname()
     {
-        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
         $this->assertEquals(
             $this->_userInfoComplete['Real_name'],
@@ -386,7 +383,6 @@ public function testGetFullname()
      */
     public function testGetId()
     {
-        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
         $this->assertEquals(
             $this->_userInfoComplete['ID'],
@@ -402,7 +398,6 @@ public function testGetId()
      */
     public function testGetUsername()
     {
-        $this->_setUpTestDoublesForFactoryUser();
         $this->_user = \User::factory(self::USERNAME);
         $this->assertEquals(
             $this->_userInfoComplete['UserID'],
@@ -662,10 +657,10 @@ public function testUpdatePasswordWithExpiration()
 
         // Cause usePwnedPasswordsAPI config option to return false.
         $mockConfig = &$this->_mockConfig;
-        '@phan-var \PHPUnit\Framework\MockObject\MockObject $mockConfig';
 
         $this->_factory->setConfig($mockConfig);
 
+        '@phan-var \PHPUnit\Framework\MockObject\MockObject $mockConfig';
         $mockConfig->expects($this->any())
             ->method('settingEnabled')
             ->willReturn(false);
@@ -701,6 +696,7 @@ public function testUpdatePasswordWithoutExpiry()
             ->method('settingEnabled')
             ->willReturn(false);
 
+        $mockConfig = &$this->_mockConfig;
         $this->_factory->setConfig($mockConfig);
 
         $this->_user->updatePassword(