[Tests] Streamline

Author: OskarStark

Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php

@@ -31,8 +31,7 @@ public function testCreateNewToken()
     public function testLoadTokenBySeriesThrowsNotFoundException()
     {
         $this->expectException(TokenNotFoundException::class);
-        $provider = new InMemoryTokenProvider();
-        $provider->loadTokenBySeries('foo');
+        (new InMemoryTokenProvider())->loadTokenBySeries('foo');
     }
 
     public function testUpdateToken()
@@ -50,12 +49,14 @@ public function testUpdateToken()
 
     public function testDeleteToken()
     {
-        $this->expectException(TokenNotFoundException::class);
         $provider = new InMemoryTokenProvider();
 
         $token = new PersistentToken('foo', 'foo', 'foo', 'foo', new \DateTimeImmutable());
         $provider->createNewToken($token);
         $provider->deleteTokenBySeries('foo');
+
+        $this->expectException(TokenNotFoundException::class);
+
         $provider->loadTokenBySeries('foo');
     }
 }

Tests/Authorization/Voter/VoterTest.php

@@ -67,8 +67,7 @@ public function testVoteWithTypeError()
     {
         $this->expectException(\TypeError::class);
         $this->expectExceptionMessage('Should error');
-        $voter = new TypeErrorVoterTest_Voter();
-        $voter->vote($this->token, new \stdClass(), ['EDIT']);
+        (new TypeErrorVoterTest_Voter())->vote($this->token, new \stdClass(), ['EDIT']);
     }
 }
 

Tests/User/ChainUserProviderTest.php

@@ -47,7 +47,6 @@ public function testLoadUserByIdentifier()
 
     public function testLoadUserByIdentifierThrowsUserNotFoundException()
     {
-        $this->expectException(UserNotFoundException::class);
         $provider1 = $this->createMock(InMemoryUserProvider::class);
         $provider1
             ->expects($this->once())
@@ -65,6 +64,9 @@ public function testLoadUserByIdentifierThrowsUserNotFoundException()
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2]);
+
+        $this->expectException(UserNotFoundException::class);
+
         $provider->loadUserByIdentifier('foo');
     }
 
@@ -141,7 +143,6 @@ public function testRefreshUserAgain()
 
     public function testRefreshUserThrowsUnsupportedUserException()
     {
-        $this->expectException(UnsupportedUserException::class);
         $provider1 = $this->createMock(InMemoryUserProvider::class);
         $provider1
             ->expects($this->once())
@@ -169,6 +170,9 @@ public function testRefreshUserThrowsUnsupportedUserException()
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2]);
+
+        $this->expectException(UnsupportedUserException::class);
+
         $provider->refreshUser($this->createMock(UserInterface::class));
     }
 

Tests/User/InMemoryUserCheckerTest.php

@@ -35,7 +35,6 @@ public function testCheckPostAuthPass()
     public function testCheckPreAuthDisabled()
     {
         $this->expectException(DisabledException::class);
-        $checker = new InMemoryUserChecker();
-        $checker->checkPreAuth(new InMemoryUser('John', 'password', [], false));
+        (new InMemoryUserChecker())->checkPreAuth(new InMemoryUser('John', 'password', [], false));
     }
 }

Tests/User/InMemoryUserProviderTest.php

@@ -62,16 +62,17 @@ public function testCreateUser()
 
     public function testCreateUserAlreadyExist()
     {
-        $this->expectException(\LogicException::class);
         $provider = new InMemoryUserProvider();
         $provider->createUser(new InMemoryUser('fabien', 'foo'));
+
+        $this->expectException(\LogicException::class);
+
         $provider->createUser(new InMemoryUser('fabien', 'foo'));
     }
 
     public function testLoadUserByIdentifierDoesNotExist()
     {
         $this->expectException(UserNotFoundException::class);
-        $provider = new InMemoryUserProvider();
-        $provider->loadUserByIdentifier('fabien');
+        (new InMemoryUserProvider())->loadUserByIdentifier('fabien');
     }
 }

Tests/Validator/Constraints/UserPasswordValidatorTestCase.php

@@ -113,13 +113,14 @@ public static function emptyPasswordData()
 
     public function testUserIsNotValid()
     {
-        $this->expectException(ConstraintDefinitionException::class);
         $user = new \stdClass();
 
         $this->tokenStorage = $this->createTokenStorage($user);
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
+        $this->expectException(ConstraintDefinitionException::class);
+
         $this->validator->validate('secret', new UserPassword());
     }