magento/community-features#259: Customer :: MyAccount :: Reset password for MyAccount

- fix tests to be compatible with PHPUnit 9

Author: lenaorobei

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RequestPasswordResetEmailTest.php

@@ -42,12 +42,11 @@ public function testCustomerAccountWithEmailAvailable()
 
     /**
      * Check if customer account is not available
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage Cannot reset the customer's password
      */
     public function testCustomerAccountWithEmailNotAvailable()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Cannot reset the customer\'s password');
         $query =
             <<<QUERY
 mutation {
@@ -59,12 +58,11 @@ public function testCustomerAccountWithEmailNotAvailable()
 
     /**
      * Check if email value empty
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage You must specify an email address.
      */
     public function testEmailAvailableEmptyValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('You must specify an email address.');
         $query = <<<QUERY
 mutation {
   requestPasswordResetEmail(email: "")
@@ -75,12 +73,11 @@ public function testEmailAvailableEmptyValue()
 
     /**
      * Check if email is invalid
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage The email address has an invalid format.
      */
     public function testEmailAvailableInvalidValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The email address has an invalid format.');
         $query = <<<QUERY
 mutation {
   requestPasswordResetEmail(email: "invalid-email")
@@ -93,12 +90,11 @@ public function testEmailAvailableInvalidValue()
      * Check if email was sent for lock customer
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage The account is locked
      */
     public function testRequestPasswordResetEmailForLockCustomer()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The account is locked');
         $this->lockCustomer->execute(1);
         $query =
             <<<QUERY

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ResetPasswordTest.php

@@ -80,15 +80,14 @@ public function testResetCustomerAccountPasswordSuccessfully(): void
     /**
      * @magentoApiDataFixture    Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage You must specify an email address.
-     *
      * @throws NoSuchEntityException
      * @throws Exception
      * @throws LocalizedException
      */
     public function testEmailAvailableEmptyValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('You must specify an email address.');
         $query = <<<QUERY
 mutation {
     resetPassword (
@@ -104,15 +103,14 @@ public function testEmailAvailableEmptyValue()
     /**
      * @magentoApiDataFixture    Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage The email address has an invalid format.
-     *
      * @throws NoSuchEntityException
      * @throws Exception
      * @throws LocalizedException
      */
     public function testEmailInvalidValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The email address has an invalid format.');
         $query = <<<QUERY
 mutation {
     resetPassword (
@@ -128,15 +126,14 @@ public function testEmailInvalidValue()
     /**
      * @magentoApiDataFixture    Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage resetPasswordToken must be specified
-     *
      * @throws NoSuchEntityException
      * @throws Exception
      * @throws LocalizedException
      */
     public function testResetPasswordTokenEmptyValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('resetPasswordToken must be specified');
         $query = <<<QUERY
 mutation {
     resetPassword (
@@ -152,15 +149,14 @@ public function testResetPasswordTokenEmptyValue()
     /**
      * @magentoApiDataFixture    Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage Cannot set the customer's password
-     *
      * @throws NoSuchEntityException
      * @throws Exception
      * @throws LocalizedException
      */
     public function testResetPasswordTokenMismatched()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Cannot set the customer\'s password');
         $query = <<<QUERY
 mutation {
     resetPassword (
@@ -176,15 +172,14 @@ public function testResetPasswordTokenMismatched()
     /**
      * @magentoApiDataFixture    Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage newPassword must be specified
-     *
      * @throws NoSuchEntityException
      * @throws Exception
      * @throws LocalizedException
      */
     public function testNewPasswordEmptyValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('newPassword must be specified');
         $query = <<<QUERY
 mutation {
     resetPassword (
@@ -202,14 +197,13 @@ public function testNewPasswordEmptyValue()
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
-     * @expectedExceptionMessage The account is locked
-     *
      * @throws LocalizedException
      * @throws NoSuchEntityException
      */
     public function testPasswordResetForLockCustomer()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The account is locked');
         $this->lockCustomer->execute(1);
         $query = <<<QUERY
 mutation {