Merge pull request #5 from Mastercard/feature/fixing-code-smells

Add test coverage for __construct methods

Author: danny-gallagher

src/Developer/Encryption/FieldLevelEncryption.php

@@ -12,7 +12,6 @@
  */
 class FieldLevelEncryption {
 
-    //NOSONAR
     private function __construct() {
         // This class can't be instantiated
     }

src/Developer/Json/JsonPath.php

@@ -16,7 +16,6 @@ class JsonPath {
     const FIRST_CHILD_KEY = "/(?:\[')([^\[\]]*)(?:'\])/"; // Returns "obj1" for "$['obj1']['obj2']"
     const FIRST_TOKEN_IN_PATH = "/(\['[^\[\]]*'\])/";     // Returns "['obj1']" for "$['obj1']['obj2']"
 
-    //NOSONAR
     private function __construct() {
         // This class can't be instantiated
     }

src/Developer/Utils/EncodingUtils.php

@@ -5,7 +5,6 @@
 
 class EncodingUtils {
 
-    //NOSONAR
     private function __construct() {
         // This class can't be instantiated
     }

src/Developer/Utils/EncryptionUtils.php

@@ -14,7 +14,6 @@ class EncryptionUtils {
     const PKCS_8_PEM_HEADER = '-----BEGIN PRIVATE KEY-----';
     const PKCS_8_PEM_FOOTER = '-----END PRIVATE KEY-----';
 
-    //NOSONAR
     private function __construct() {
         // This class can't be instantiated
     }

tests/Developer/Encryption/FieldLevelEncryptionTest.php

@@ -9,6 +9,22 @@
 
 class FieldLevelEncryptionTest extends TestCase {
 
+    public function testConstruct_ShouldBePrivate() {
+        // GIVEN
+        $class = new ReflectionClass('Mastercard\Developer\Encryption\FieldLevelEncryption');
+        $constructor = $class->getConstructor();
+
+        // WHEN
+        $isPrivate = $constructor->isPrivate();
+
+        // THEN
+        $this->assertTrue($isPrivate);
+
+        // COVERAGE
+        $constructor->setAccessible(true);
+        $constructor->invoke($class->newInstanceWithoutConstructor());
+    }
+
     private static function callEncryptBytes($params) {
         return TestUtils::callPrivateStatic('\FieldLevelEncryption', 'encryptBytes', $params);
     }
@@ -53,7 +69,7 @@ public function testDecryptBytes_InteroperabilityTest() {
     }
 
     public function testDecryptPayload_InteroperabilityTest() {
-    
+
         // GIVEN
         $encryptedPayload = '{"data":"WtBPYHL5jdU/BsECYzlyRUPIElWCwSCgKhk5RPy2AMZBGmC8OUJ1L9HC/SF2QpCU+ucZTmo7XOjhSdVi0/yrdZP1OG7dVWcW4MEWpxiU1gl0fS0LKKPOFjEymSP5f5otdTFCp00xPfzp+l6K3S3kZTAuSG1gh6TaRL+qfC1POz8KxhCEL8D1MDvxnlmchPx/hEyAzav0AID3T7T4WomzUXErNrnbDCCiL6pm4IBR8cDAzU4eSmTxdzZFyvTpBQDXVyFdkaNTo3GXk837wujVK8EX3c+gsJvMq4XVJFwGmPNhPM6P7OmdK45cldWrD5j2gO2VBH5aW1EXfot7d11bjJC9T8D/ZOQFF6uLIG7J9x9R0Ts0zXD/H24y9/jF30rKKX7TNmKHn5uh1Czd+h7ryIAqaQsOu6ILBKfH7W/NIR5qYN1GiL/kOYwx2pdIGQdcdolVdxV8Z6bt4Tcvq3jSZaCbhJI/kphZL7QHJgcG6luz9k0457x/0QCDPlve6JNgUQzAOYC64X0a07JpERH0O08/YbntKEq6qf7UhloyI5A="}';
         $config = TestUtils::getTestFieldLevelEncryptionConfigBuilder()
@@ -65,11 +81,11 @@ public function testDecryptPayload_InteroperabilityTest() {
         $oaepPaddingDigest = 'SHA256';
         $encryptedKey = 'dobCRy+NUxdQdN0oMLT4dXUzQ+We7BahMfJunoAmwwUpk9jJrW66BASPalS2QWChPaKDM4Ft/BeNsu0wBoUZ0hHIT9ftx5g4tY6Xu2iLRiFWFDCHYOSdL+yVv98FcM6fxc34FNyg3/rOPWeyS3Q9YAOgcqiCwWYu4kqa34tNWCW1vnTmtz+dCKiiCZo/uHUkCtoAI5fEe+inHHToZL+LFlQ2Xd0u/nsu5Ep14Il5mTv8FyfLgwRgfilcqy4t2Kh3bpZ46LllO36DHXtQoI1e0ayMFfKTO87++NWxYNOilrverJ01WHnA+PyXhg4XU3RlU0CVWBN06fKbHBDH6GCmOA==';
         $iv = '+yBXlo+gYGe2q0xzLDLLzQ==';
-        
+
         // WHEN
         $params = new FieldLevelEncryptionParams($config, $iv, $encryptedKey, $oaepPaddingDigest);
         $payload = FieldLevelEncryption::decryptPayload($encryptedPayload, $config, $params);
-        
+
         // THEN
         $this->assertTrue(StringUtils::contains($payload, 'account'));
     }

tests/Developer/Json/JsonPathTest.php

@@ -5,6 +5,22 @@
 
 class JsonPathTest extends TestCase {
 
+    public function testConstruct_ShouldBePrivate() {
+        // GIVEN
+        $class = new ReflectionClass('Mastercard\Developer\Json\JsonPath');
+        $constructor = $class->getConstructor();
+
+        // WHEN
+        $isPrivate = $constructor->isPrivate();
+
+        // THEN
+        $this->assertTrue($isPrivate);
+
+        // COVERAGE
+        $constructor->setAccessible(true);
+        $constructor->invoke($class->newInstanceWithoutConstructor());
+    }
+
     public function testNormalizePath() {
 
         // GIVEN
@@ -59,7 +75,7 @@ public function testNormalizePath_ShouldThrowInvalidArgumentException_WhenJsonPa
     }
 
     public function testGetElementKey() {
-        
+
         // GIVEN
         $jsonPath1 = '$[\'obj0\'][\'obj1\'][\'obj2\']';
         $jsonPath2 = 'obj1.obj2';
@@ -220,7 +236,7 @@ public function testGetElementKey_ShouldThrowInvalidArgumentException_WhenJsonPa
     }
 
     public function testGetParentPath_ShouldThrowInvalidArgumentException_WhenNoParent() {
-        
+
         // GIVEN
         $jsonPath = '$';
 
@@ -233,7 +249,7 @@ public function testGetParentPath_ShouldThrowInvalidArgumentException_WhenNoPare
     }
 
     public function testGetElementKey_ShouldThrowInvalidArgumentException_WhenNoKey() {
-        
+
         // GIVEN
         $jsonPath = '$';
 

tests/Developer/Utils/EncodingUtilsTest.php

@@ -6,6 +6,22 @@
 
 class EncodingUtilsTest extends TestCase {
 
+    public function testConstruct_ShouldBePrivate() {
+        // GIVEN
+        $class = new ReflectionClass('Mastercard\Developer\Utils\EncodingUtils');
+        $constructor = $class->getConstructor();
+
+        // WHEN
+        $isPrivate = $constructor->isPrivate();
+
+        // THEN
+        $this->assertTrue($isPrivate);
+
+        // COVERAGE
+        $constructor->setAccessible(true);
+        $constructor->invoke($class->newInstanceWithoutConstructor());
+    }
+
     public function testHexEncode() {
         $this->assertEquals('00', EncodingUtils::hexEncode("\0"));
         $this->assertEquals('736f6d652064617461', EncodingUtils::hexEncode('some data'));
@@ -41,4 +57,4 @@ public function testHexDecode_ShouldThrowInvalidArgumentException_WhenNullValue(
         $this->expectExceptionMessage('Can\'t hex decode an empty value!');
         EncodingUtils::hexDecode(null);
     }
-}
+}

tests/Developer/Utils/EncryptionUtilsTest.php

@@ -5,6 +5,22 @@
 
 class EncryptionUtilsTest extends TestCase {
 
+    public function testConstruct_ShouldBePrivate() {
+        // GIVEN
+        $class = new ReflectionClass('Mastercard\Developer\Utils\EncryptionUtils');
+        $constructor = $class->getConstructor();
+
+        // WHEN
+        $isPrivate = $constructor->isPrivate();
+
+        // THEN
+        $this->assertTrue($isPrivate);
+
+        // COVERAGE
+        $constructor->setAccessible(true);
+        $constructor->invoke($class->newInstanceWithoutConstructor());
+    }
+
     public function testLoadEncryptionCertificate_ShouldSupportPem() {
 
         // GIVEN