Improve test coverage.

commerceguys · Aug 12, 2017 · f437ccf · f437ccf
1 parent 03a5155
commit f437ccf
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 42 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# PHP PSR-2 Coding Standards
+# http://www.php-fig.org/psr/psr-2/
+
+root = true
+
+[*.php]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
diff --git a/src/CreateCustomerProfileRequest.php b/src/CreateCustomerProfileRequest.php
@@ -33,14 +33,6 @@ public function setProfile($profile)
         $this->profile = $profile;
     }
 
-    /**
-     * @return string
-     */
-    public function getValidationMode()
-    {
-        return $this->validationMode;
-    }
-
     /**
      * @param string $validationMode
      */

diff --git a/src/DataTypes/BaseDataType.php b/src/DataTypes/BaseDataType.php
@@ -46,6 +46,17 @@ public function __set($name, $value)
         $this->properties[$name] = $value;
     }
 
+    public function __get($name)
+    {
+        return $this->properties[$name];
+    }
+
+    public function __isset($name)
+    {
+        return isset($this->properties[$name]);
+    }
+
+
     public function __unset($name)
     {
         unset($this->properties[$name]);

diff --git a/src/DataTypes/TransactionRequest.php b/src/DataTypes/TransactionRequest.php
@@ -52,10 +52,12 @@ public function addPayment(PaymentMethodInterface $paymentMethod)
     {
         $this->properties['payment'][$paymentMethod->getType()] = $paymentMethod->toArray();
     }
+
     public function addOrder(Order $order)
     {
         $this->addDataType($order);
     }
+
     public function addLineItem(LineItem $lineItem)
     {
         $this->properties['lineItems'][$lineItem->getType()] = $lineItem->toArray();

diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
@@ -29,5 +29,12 @@ public function testConfiguration()
 
         $config->setTransactionKey('test');
         $this->assertEquals('test', $config->getTransactionKey());
+
+        $config->setRequestMode('json');
+        $this->assertEquals('json', $config->getRequestMode());
+
+        $this->assertTrue(strpos($config->getCertificateVerify(), 'resources/cert.pem') !== FALSE);
+        $config->setCertificateVerify('/path/to/some/cert.pem');
+        $this->assertTrue(strpos($config->getCertificateVerify(), 'resources/cert.pem') === FALSE);
     }
-}
+}
diff --git a/tests/CreateTransactionRequest/VoidTest.php b/tests/CreateTransactionRequest/VoidTest.php
@@ -57,9 +57,6 @@ public function testVoidTransaction()
 
         $response = $request->execute();
         $this->assertTrue(isset($response->transactionResponse));
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.',
-          $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
     }
 }
diff --git a/tests/CustomerPaymentProfileRequestTest.php b/tests/CustomerPaymentProfileRequestTest.php
@@ -20,12 +20,13 @@ class CustomerPaymentProfileRequestTest extends TestBase
     public function testCreateCustomerPaymentProfileWithCreditCard()
     {
         $profile = new Profile([
-            'email' => 'example+' . rand(0, 10000) . '@example.com',
+            'email' => 'example+' . mt_rand() . '@example.com',
         ]);
         $request = new CreateCustomerProfileRequest($this->configurationXml, $this->client);
         $request->setProfile($profile);
         $request->setValidationMode('none');
         $response = $request->execute();
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
         $customerProfileId = $response->customerProfileId;
 
         $request = new CreateCustomerPaymentProfileRequest($this->configurationXml, $this->client);
@@ -53,9 +54,7 @@ public function testCreateCustomerPaymentProfileWithCreditCard()
         $request->setPaymentProfile($paymentProfile);
 
         $response = $request->execute();
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
         $this->assertTrue(isset($response->customerPaymentProfileId));
 
         $customerPaymentProfileId = $response->customerPaymentProfileId;
@@ -65,6 +64,18 @@ public function testCreateCustomerPaymentProfileWithCreditCard()
         $request->setCustomerPaymentProfileId($customerPaymentProfileId);
         $response = $request->execute();
         $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
+        $this->assertEquals('XXXX1111', $response->paymentProfile->payment->creditCard->cardNumber);
+        $this->assertEquals('XXXX', $response->paymentProfile->payment->creditCard->expirationDate);
+
+        // Get profile again, with unmasked credit card expiration date.
+        $request = new GetCustomerPaymentProfileRequest($this->configurationXml, $this->client);
+        $request->setCustomerProfileId($customerProfileId);
+        $request->setCustomerPaymentProfileId($customerPaymentProfileId);
+        $request->setUnmaskExpirationDate(TRUE);
+        $response = $request->execute();
+        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
+        $this->assertEquals('XXXX1111', $response->paymentProfile->payment->creditCard->cardNumber);
+        $this->assertEquals('2020-12', $response->paymentProfile->payment->creditCard->expirationDate);
 
         $request = new ValidateCustomerPaymentProfileRequest($this->configurationXml, $this->client);
         $request->setCustomerProfileId($customerProfileId);
@@ -127,6 +138,7 @@ public function testCreateCustomerPaymentProfileWithBankAccount()
         $customerProfileId = $response->customerProfileId;
 
         $request = new CreateCustomerPaymentProfileRequest($this->configurationXml, $this->client);
+        $request->setValidationMode('testMode');
         $request->setCustomerProfileId($customerProfileId);
 
         $paymentProfile = new PaymentProfile([
@@ -155,9 +167,7 @@ public function testCreateCustomerPaymentProfileWithBankAccount()
         $request->setPaymentProfile($paymentProfile);
 
         $response = $request->execute();
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
         $this->assertTrue(isset($response->customerPaymentProfileId));
 
         $customerPaymentProfileId = $response->customerPaymentProfileId;

diff --git a/tests/CustomerProfileRequestTest.php b/tests/CustomerProfileRequestTest.php
@@ -20,9 +20,7 @@ public function testGetCustomerProfileIdsRequest()
         $request = new GetCustomerProfileIdsRequest($this->configurationXml, $this->client);
         $response = $request->execute();
         $this->assertTrue(isset($response->ids));
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
     }
 
     public function testCreateCustomerProfileCRUDRequests()
@@ -47,22 +45,21 @@ public function testCreateCustomerProfileCRUDRequests()
         ]));
 
         $profile = new Profile([
-          'email' => 'example+' . rand(0, 10000) . '@example.com',
+          'email' => 'example+' . mt_rand() . '@example.com',
         ]);
         $profile->addPaymentProfile($paymentProfile);
 
         $request = new CreateCustomerProfileRequest($this->configurationXml, $this->client);
         $request->setProfile($profile);
         $response = $request->execute();
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
         $this->assertTrue(isset($response->customerProfileId));
         $this->assertTrue(isset($response->customerPaymentProfileIdList));
         $this->assertTrue(isset($response->validationDirectResponseList));
 
         $request = new GetCustomerProfileRequest($this->configurationXml, $this->client, $response->customerProfileId);
         $response = $request->execute();
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
         $this->assertTrue(isset($response->profile));
 
         $customerProfileId = $response->profile->customerProfileId;
@@ -72,19 +69,15 @@ public function testCreateCustomerProfileCRUDRequests()
         ]);
         $request = new UpdateCustomerProfileRequest($this->configurationXml, $this->client, $profile);
         $response = $request->execute();
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
 
         $request = new DeleteCustomerProfileRequest(
             $this->configurationXml,
             $this->client,
             $customerProfileId
         );
         $response = $request->execute();
-        $this->assertEquals('I00001', $response->getMessages()[0]->getCode());
-        $this->assertEquals('Successful.', $response->getMessages()[0]->getText());
-        $this->assertEquals('Ok', $response->getResultCode());
+        $this->assertResponse($response, 'I00001', 'Successful.', 'Ok');
 
     }
 }
diff --git a/tests/DataTypeTest.php b/tests/DataTypeTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace CommerceGuys\AuthNet\Tests;
+
+use CommerceGuys\AuthNet\DataTypes\CreditCard;
+use CommerceGuys\AuthNet\DataTypes\Message;
+
+class DataTypeTest extends TestBase
+{
+    public function testBaseDataType()
+    {
+        // Tests methods provided by \CommerceGuys\AuthNet\DataTypes\BaseDataType
+        $creditCard = new CreditCard([
+            'cardNumber' => '4111111111111111',
+            'expirationDate' => '2020-12',
+        ]);
+        unset($creditCard->cardNumber);
+        $this->assertTrue(!isset($creditCard->cardNumber));
+        $creditCard->addData('cardNumber', '5424000000000015');
+        $this->assertEquals('5424000000000015', $creditCard->cardNumber);
+    }
+
+    public function testMessageValidationCode()
+    {
+        $this->setExpectedException(\InvalidArgumentException::class, 'Messages must have a code');
+        new Message(['message' => 'Test']);
+    }
+
+    public function testMessageValidationTest()
+    {
+        $this->setExpectedException(\InvalidArgumentException::class, 'Messages must have a text');
+        new Message(['code' => 'I00122']);
+    }
+}
diff --git a/tests/TestBase.php b/tests/TestBase.php
@@ -2,6 +2,7 @@
 
 namespace CommerceGuys\AuthNet\Tests;
 
+use CommerceGuys\AuthNet\Response\ResponseInterface;
 use GuzzleHttp\Client;
 use CommerceGuys\AuthNet\Configuration;
 use CommerceGuys\AuthNet\RequestFactory;
@@ -37,21 +38,30 @@ protected function setUp()
     {
         parent::setUp();
         $this->configurationXml = new Configuration([
-          'api_login' => AUTHORIZENET_API_LOGIN_ID,
-          'transaction_key' => AUTHORIZENET_TRANSACTION_KEY,
-          'sandbox' => true,
-          'certificate_verify' => TESTS_CERTIFICATE_VERIFY,
+            'api_login' => AUTHORIZENET_API_LOGIN_ID,
+            'transaction_key' => AUTHORIZENET_TRANSACTION_KEY,
+            'sandbox' => true,
+            'certificate_verify' => TESTS_CERTIFICATE_VERIFY,
         ]);
         $this->configurationJson = new Configuration([
-          'api_login' => AUTHORIZENET_API_LOGIN_ID,
-          'transaction_key' => AUTHORIZENET_TRANSACTION_KEY,
-          'sandbox' => true,
-          'certificate_verify' => TESTS_CERTIFICATE_VERIFY,
-          'request_mode' => 'json',
+            'api_login' => AUTHORIZENET_API_LOGIN_ID,
+            'transaction_key' => AUTHORIZENET_TRANSACTION_KEY,
+            'sandbox' => true,
+            'certificate_verify' => TESTS_CERTIFICATE_VERIFY,
+            'request_mode' => 'json',
         ]);
         $this->client = new Client();
 
         $this->xmlRequestFactory = new RequestFactory($this->configurationXml, $this->client);
         $this->jsonRequestFactory = new RequestFactory($this->configurationJson, $this->client);
     }
+
+    protected function assertResponse(ResponseInterface $response, $expectedCode, $expectedText, $expectedResultCode)
+    {
+        $message = $response->getMessages()[0];
+        // Since this is first possible assert failure, message with response text.
+        $this->assertEquals($expectedCode, $message->getCode(), $message->getText());
+        $this->assertEquals($expectedText, $message->getText());
+        $this->assertEquals($expectedResultCode, $response->getResultCode());
+    }
 }