Merge pull request #8 from androzd/master

fix M addresses, add tests

Author: codeator

composer.json

@@ -15,5 +15,10 @@
         "psr-4": {
             "Merkeleon\\PhpCryptocurrencyAddressValidation\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     }
 }

phpunit.xml

@@ -10,8 +10,8 @@
          stopOnFailure="false"
          syntaxCheck="false">
     <testsuites>
-        <testsuite name="Nacho Test Suite">
-            <directory suffix=".php">./tests/</directory>
+        <testsuite name="Application Test Suite">
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 </phpunit>

src/Validation/LTC.php

@@ -13,7 +13,7 @@ class LTC extends Validation
 
     protected $base58PrefixToHexVersion = [
         'L' => '30',
-        'M' => '31',
+        'M' => '32',
         '3' => '05'
     ];
 

tests/BTCTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Tests;
+
+use Merkeleon\PhpCryptocurrencyAddressValidation\Validation;
 use Merkeleon\PhpCryptocurrencyAddressValidation\Validation\BTC;
+use PHPUnit_Framework_TestCase;
 
 class BTCTest extends PHPUnit_Framework_TestCase
 {
@@ -14,8 +18,8 @@ public function testValidator()
         ];
 
         foreach ($testData as $row) {
-            $validator = new BTC($row[0]);
-            $this->assertEquals($row[1], $validator->validate());
+            $validator = Validation::make('BTC');
+            $this->assertEquals($row[1], $validator->validate($row[0]));
         }
 
     }

tests/DASHTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Tests;
+
+use Merkeleon\PhpCryptocurrencyAddressValidation\Validation;
 use Merkeleon\PhpCryptocurrencyAddressValidation\Validation\DASH;
+use PHPUnit_Framework_TestCase;
 
 class DASHTest extends PHPUnit_Framework_TestCase
 {
@@ -20,8 +24,8 @@ public function testValidator()
         ];
 
         foreach ($testData as $row) {
-            $validator = new DASH($row[0]);
-            $this->assertEquals($row[1], $validator->validate());
+            $validator = Validation::make('DASH');
+            $this->assertEquals($row[1], $validator->validate($row[0]));
         }
 
     }

tests/LTCTest.php

@@ -1,35 +1,33 @@
 <?php
 
+namespace Tests;
+
+use Merkeleon\PhpCryptocurrencyAddressValidation\Validation;
 use Merkeleon\PhpCryptocurrencyAddressValidation\Validation\LTC;
+use PHPUnit_Framework_TestCase;
 
 class LTCTest extends PHPUnit_Framework_TestCase
 {
     public function testValidator()
     {
-        /*
-         * There are many addresses in Litecoin blockchain which starts with 3.
-         * However, addresses starting with 3 are deprecated.
-         * Litecoin multisig addess should start with M.
-         */
-
         $testData = [
             ['1QLbGuc3WGKKKpLs4pBp9H6jiQ2MgPkXRp', false],
-            ['3CDJNfdWX8m2NwuGUV3nhXHXEeLygMXoAj', false],
+            ['3CDJNfdWX8m2NwuGUV3nhXHXEeLygMXoAj', true],
             ['LbTjMGN7gELw4KbeyQf6cTCq859hD18guE', true],
-            // @todo: add test case with M address
+            ['MJRSgZ3UUFcTBTBAaN38XAXvZLwRe8WVw7', true],
         ];
 
         foreach ($testData as $row) {
-            $validator = new LTC($row[0]);
-            $this->assertEquals($row[1], $validator->validate());
+            $validator = Validation::make('LTC');
+            $this->assertEquals($row[1], $validator->validate($row[0]));
         }
 
     }
 
     public function testLitecoinDeprecatedMultisigAddress()
     {
-        $validator = new LTC('3CDJNfdWX8m2NwuGUV3nhXHXEeLygMXoAj');
+        $validator = Validation::make('LTC');
         $validator->setDeprecatedAllowed(true);
-        $this->assertEquals(true, $validator->validate());
+        $this->assertEquals(true, $validator->validate('3CDJNfdWX8m2NwuGUV3nhXHXEeLygMXoAj'));
     }
 }