chore: cleanup tests

Author: bshaffer

.gitignore

@@ -3,3 +3,4 @@ phpunit.phar
 phpunit.phar.asc
 composer.phar
 composer.lock
+.phpunit.result.cache

tests/JWKTest.php

@@ -38,34 +38,34 @@ public function testParsePrivateKey()
             'UnexpectedValueException',
             'RSA private keys are not supported'
         );
-        
+
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
         $jwkSet['keys'][0]['d'] = 'privatekeyvalue';
-        
+
         JWK::parseKeySet($jwkSet);
     }
-    
+
     public function testParseKeyWithEmptyDValue()
     {
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
-        
+
         // empty or null values are ok
         $jwkSet['keys'][0]['d'] = null;
-        
+
         $keys = JWK::parseKeySet($jwkSet);
         $this->assertTrue(is_array($keys));
     }
 
     public function testParseJwkKeySet()
     {
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
         $keys = JWK::parseKeySet($jwkSet);
@@ -93,7 +93,7 @@ public function testParseJwkKeySet_empty()
      */
     public function testDecodeByJwkKeySetTokenExpired()
     {
-        $privKey1 = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privKey1 = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
         $payload = array('exp' => strtotime('-1 hour'));
         $msg = JWT::encode($payload, $privKey1, 'RS256', 'jwk1');
 
@@ -107,7 +107,7 @@ public function testDecodeByJwkKeySetTokenExpired()
      */
     public function testDecodeByJwkKeySet()
     {
-        $privKey1 = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privKey1 = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
         $payload = array('sub' => 'foo', 'exp' => strtotime('+10 seconds'));
         $msg = JWT::encode($payload, $privKey1, 'RS256', 'jwk1');
 
@@ -121,7 +121,7 @@ public function testDecodeByJwkKeySet()
      */
     public function testDecodeByMultiJwkKeySet()
     {
-        $privKey2 = file_get_contents(__DIR__ . '/rsa2-private.pem');
+        $privKey2 = file_get_contents(__DIR__ . '/data/rsa2-private.pem');
         $payload = array('sub' => 'bar', 'exp' => strtotime('+10 seconds'));
         $msg = JWT::encode($payload, $privKey2, 'RS256', 'jwk2');
 

tests/JWTTest.php

@@ -316,7 +316,7 @@ public function testInvalidEdDsaEncodeDecode()
     public function testRSEncodeDecodeWithPassphrase()
     {
         $privateKey = openssl_pkey_get_private(
-            file_get_contents(__DIR__ . '/rsa-with-passphrase.pem'),
+            file_get_contents(__DIR__ . '/data/rsa-with-passphrase.pem'),
             'passphrase'
         );
 
@@ -375,18 +375,18 @@ public function testArrayAccessKIDChooserWithKeyObject()
     public function provideEncodeDecode()
     {
         return array(
-            array(__DIR__ . '/ecdsa-private.pem', __DIR__ . '/ecdsa-public.pem', 'ES256'),
-            array(__DIR__ . '/ecdsa384-private.pem', __DIR__ . '/ecdsa384-public.pem', 'ES384'),
-            array(__DIR__ . '/rsa1-private.pem', __DIR__ . '/rsa1-public.pub', 'RS512'),
-            array(__DIR__ . '/ed25519-1.sec', __DIR__ . '/ed25519-1.pub', 'EdDSA'),
+            array(__DIR__ . '/data/ecdsa-private.pem', __DIR__ . '/data/ecdsa-public.pem', 'ES256'),
+            array(__DIR__ . '/data/ecdsa384-private.pem', __DIR__ . '/data/ecdsa384-public.pem', 'ES384'),
+            array(__DIR__ . '/data/rsa1-private.pem', __DIR__ . '/data/rsa1-public.pub', 'RS512'),
+            array(__DIR__ . '/data/ed25519-1.sec', __DIR__ . '/data/ed25519-1.pub', 'EdDSA'),
         );
     }
 
     public function testEncodeDecodeWithResource()
     {
-        $pem = file_get_contents(__DIR__ . '/rsa1-public.pub');
+        $pem = file_get_contents(__DIR__ . '/data/rsa1-public.pub');
         $resource = openssl_pkey_get_public($pem);
-        $privateKey = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privateKey = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
 
         $payload = array('foo' => 'bar');
         $encoded = JWT::encode($payload, $privateKey, 'RS512');

tests/autoload.php.dist

@@ -1,7 +1,14 @@
 <?php
 
-if (file_exists($file = __DIR__ . '/autoload.php')) {
-    require_once $file;
-} elseif (file_exists($file = __DIR__ . '/autoload.php.dist')) {
+if (file_exists($file = __DIR__ . '/../vendor/autoload.php')) {
     require_once $file;
+} else {
+    die('Unable to find autoload.php file, please use composer to load dependencies:
+
+wget http://getcomposer.org/composer.phar
+php composer.phar install
+
+Visit http://getcomposer.org/ for more information.
+
+');
 }