Merge pull request #32 from hhxsv5/master

Fix tests with dataProvider
Kucoin · Mar 21, 2019 · 0bd19f5 · 0bd19f5
2 parents c2c52bc + 6ba8785
commit 0bd19f5
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 238 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ KuCoinApi::setBaseUri('https://openapi-sandbox.kucoin.com');
 ### Examples
 > See the [test case](tests) for more examples.
 
-- Example of API `without` authentication
+#### Example of API `without` authentication
 
 ```php
 use KuCoin\SDK\PublicApi\Time;
@@ -49,7 +49,7 @@ $timestamp = $api->timestamp();
 var_dump($timestamp);
 ```
 
-- Example of API `with` authentication
+#### Example of API `with` authentication
 
 ```php
 use KuCoin\SDK\Auth;
@@ -70,7 +70,7 @@ try {
 }
 ```
 
-- Example of WebSocket feed
+#### Example of WebSocket feed
 
 ```php
 use KuCoin\SDK\Auth;
@@ -98,7 +98,7 @@ $api->subscribePublicChannel($query, $channel, function (array $message, WebSock
 });
 ```
 
-- Coroutine HTTP client for asynchronous IO
+#### ⚡️Coroutine HTTP client for asynchronous IO
 
 ```bash
 pecl install swoole
@@ -112,7 +112,7 @@ use KuCoin\SDK\Http\SwooleHttp;
 // Require PHP 7.1+ and Swoole 2.1.2+
 // Require running in cli mode
 go(function () {
-    $api = new Time(null, new SwooleHttp());
+    $api = new Time(null, new SwooleHttp));
     $timestamp = $api->timestamp();
     var_dump($timestamp);
 });

diff --git a/composer.json b/composer.json
@@ -45,6 +45,6 @@
     "secure-http": false
   },
   "scripts": {
-    "test": "./vendor/bin/phpunit -c phpunit.xml --filter '/::test(New|Get)\\w+$/' --coverage-text --verbose"
+    "test": "./vendor/bin/phpunit -c phpunit.xml --filter '/::testGet\\w+/' --coverage-text --verbose"
   }
 }
diff --git a/examples/GoTime.php b/examples/GoTime.php
@@ -12,7 +12,7 @@
 // Require PHP 7.1+ and Swoole 2.1.2+
 // Require running in cli mode
 go(function () {
-    $api = new Time(null, new SwooleHttp());
+    $api = new Time(null, new SwooleHttp);
     $timestamp = $api->timestamp();
     var_dump($timestamp);
 });
diff --git a/tests/AccountTest.php b/tests/AccountTest.php
@@ -3,35 +3,17 @@
 namespace KuCoin\SDK\Tests;
 
 use KuCoin\SDK\ApiCode;
-use KuCoin\SDK\Auth;
 use KuCoin\SDK\Exceptions\BusinessException;
 use KuCoin\SDK\PrivateApi\Account;
 
 class AccountTest extends TestCase
 {
-    public function testNewAuth()
-    {
-        $auth = new Auth($this->apiKey, $this->apiSecret, $this->apiPassPhrase);
-        $this->assertInstanceOf(Auth::class, $auth);
-        return $auth;
-    }
+    protected $apiClass    = Account::class;
+    protected $apiWithAuth = true;
 
     /**
-     * @depends testNewAuth
-     * @param Auth $auth
-     * @return Account
-     */
-    public function testNewAccount(Auth $auth)
-    {
-        $api = new Account($auth);
-        $this->assertInstanceOf(Account::class, $api);
-        return $api;
-    }
-
-    /**
-     * @depends testNewAccount
+     * @dataProvider apiProvider
      * @param Account $api
-     * @return array|string
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
@@ -48,13 +30,11 @@ public function testGetMainList(Account $api)
             $this->assertArrayHasKey('holds', $item);
             $this->assertArrayHasKey('type', $item);
         }
-        return $accounts;
     }
 
     /**
-     * @depends testNewAccount
+     * @dataProvider apiProvider
      * @param Account $api
-     * @return array|string
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
@@ -71,60 +51,57 @@ public function testGetTradeList(Account $api)
             $this->assertArrayHasKey('holds', $item);
             $this->assertArrayHasKey('type', $item);
         }
-        return $accounts;
     }
 
     /**
-     * @depends testNewAccount
+     * @dataProvider apiProvider
      * @param Account $api
-     * @return array|string
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
      */
-    public function testCreateAccount(Account $api)
+    public function testGetDetail(Account $api)
     {
-        try {
-            $data = $api->create('trade', 'ETH');
-            $this->assertArrayHasKey('id', $data);
-        } catch (BusinessException $e) {
-            if ($e->getResponse()->getApiCode() != ApiCode::ACCOUNT_EXISTS) { //account already exists
-                throw $e;
-            }
+        $accounts = $api->getList(['type' => 'main']);
+        if (isset($accounts[0])) {
+            $account = $api->getDetail($accounts[0]['id']);
+            $this->assertArrayHasKey('currency', $account);
+            $this->assertArrayHasKey('balance', $account);
+            $this->assertArrayHasKey('available', $account);
+            $this->assertArrayHasKey('holds', $account);
         }
     }
 
     /**
-     * @depends testNewAccount
-     * @depends testGetMainList
+     * @dataProvider apiProvider
      * @param Account $api
-     * @param array $accounts
+     * @return array|string
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
      */
-    public function testGetDetail(Account $api, array $accounts)
+    public function testCreateAccount(Account $api)
     {
-        if (isset($accounts[0])) {
-            $account = $api->getDetail($accounts[0]['id']);
-            $this->assertArrayHasKey('currency', $account);
-            $this->assertArrayHasKey('balance', $account);
-            $this->assertArrayHasKey('available', $account);
-            $this->assertArrayHasKey('holds', $account);
+        try {
+            $data = $api->create('trade', 'ETH');
+            $this->assertArrayHasKey('id', $data);
+        } catch (BusinessException $e) {
+            if ($e->getResponse()->getApiCode() != ApiCode::ACCOUNT_EXISTS) { //account already exists
+                throw $e;
+            }
         }
     }
 
     /**
-     * @depends testNewAccount
-     * @depends testGetTradeList
+     * @dataProvider apiProvider
      * @param Account $api
-     * @param array $accounts
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
      */
-    public function testGetLedgers(Account $api, array $accounts)
+    public function testGetLedgers(Account $api)
     {
+        $accounts = $api->getList(['type' => 'trade']);
         if (isset($accounts[0])) {
             $data = $api->getLedgers($accounts[0]['id'], [], ['currentPage' => 1, 'pageSize' => 10]);
             $this->assertPagination($data);
@@ -142,7 +119,7 @@ public function testGetLedgers(Account $api, array $accounts)
     }
 
     /**
-     * @depends testNewAccount
+     * @dataProvider apiProvider
      * @param Account $api
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
@@ -175,16 +152,16 @@ public function testInnerTransfer(Account $api)
     }
 
     /**
-     * @depends testNewAccount
-     * @depends testGetMainList
+     * @dataProvider apiProvider
+     * @depends      testGetMainList
      * @param Account $api
-     * @param array $accounts
      * @throws BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
      * @throws \KuCoin\SDK\Exceptions\InvalidApiUriException
      */
-    public function testGetHolds(Account $api, array $accounts)
+    public function testGetHolds(Account $api)
     {
+        $accounts = $api->getList(['type' => 'trade']);
         if (isset($accounts[0])) {
             $data = $api->getHolds($accounts[1]['id'], ['currentPage' => 1, 'pageSize' => 10]);
             $this->assertPagination($data);

diff --git a/tests/CurrencyTest.php b/tests/CurrencyTest.php
@@ -6,18 +6,11 @@
 
 class CurrencyTest extends TestCase
 {
-    /**
-     * @return Currency
-     */
-    public function testNewCurrency()
-    {
-        $api = new Currency();
-        $this->assertInstanceOf(Currency::class, $api);
-        return $api;
-    }
+    protected $apiClass    = Currency::class;
+    protected $apiWithAuth = false;
 
     /**
-     * @depends testNewCurrency
+     * @dataProvider apiProvider
      * @param Currency $api
      * @throws \KuCoin\SDK\Exceptions\BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
@@ -40,7 +33,7 @@ public function testGetList(Currency $api)
     }
 
     /**
-     * @depends testNewCurrency
+     * @dataProvider apiProvider
      * @param Currency $api
      * @throws \KuCoin\SDK\Exceptions\BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
@@ -61,7 +54,7 @@ public function testGetDetail(Currency $api)
     }
 
     /**
-     * @depends testNewCurrency
+     * @dataProvider apiProvider
      * @param Currency $api
      * @throws \KuCoin\SDK\Exceptions\BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException

diff --git a/tests/DepositTest.php b/tests/DepositTest.php
@@ -2,33 +2,16 @@
 
 namespace KuCoin\SDK\Tests;
 
-use KuCoin\SDK\Auth;
 use KuCoin\SDK\Exceptions\BusinessException;
 use KuCoin\SDK\PrivateApi\Deposit;
 
 class DepositTest extends TestCase
 {
-    public function testNewAuth()
-    {
-        $auth = new Auth($this->apiKey, $this->apiSecret, $this->apiPassPhrase);
-        $this->assertInstanceOf(Auth::class, $auth);
-        return $auth;
-    }
-
-    /**
-     * @depends testNewAuth
-     * @param Auth $auth
-     * @return Deposit
-     */
-    public function testNewDeposit(Auth $auth)
-    {
-        $api = new Deposit($auth);
-        $this->assertInstanceOf(Deposit::class, $api);
-        return $api;
-    }
+    protected $apiClass    = Deposit::class;
+    protected $apiWithAuth = true;
 
     /**
-     * @depends testNewDeposit
+     * @dataProvider apiProvider
      * @param Deposit $api
      * @return array|string
      * @throws \KuCoin\SDK\Exceptions\BusinessException
@@ -44,7 +27,7 @@ public function testCreateAddress(Deposit $api)
     }
 
     /**
-     * @depends testNewDeposit
+     * @dataProvider apiProvider
      * @param Deposit $api
      * @return array|string
      * @throws \KuCoin\SDK\Exceptions\BusinessException
@@ -70,7 +53,7 @@ public function testGetAddress(Deposit $api)
     }
 
     /**
-     * @depends testNewDeposit
+     * @dataProvider apiProvider
      * @param Deposit $api
      * @return array|string
      * @throws \KuCoin\SDK\Exceptions\BusinessException

diff --git a/tests/FillTest.php b/tests/FillTest.php
@@ -2,32 +2,15 @@
 
 namespace KuCoin\SDK\Tests;
 
-use KuCoin\SDK\Auth;
 use KuCoin\SDK\PrivateApi\Fill;
 
 class FillTest extends TestCase
 {
-    public function testNewAuth()
-    {
-        $auth = new Auth($this->apiKey, $this->apiSecret, $this->apiPassPhrase);
-        $this->assertInstanceOf(Auth::class, $auth);
-        return $auth;
-    }
-
-    /**
-     * @depends testNewAuth
-     * @param Auth $auth
-     * @return Fill
-     */
-    public function testNewFill(Auth $auth)
-    {
-        $api = new Fill($auth);
-        $this->assertInstanceOf(Fill::class, $api);
-        return $api;
-    }
+    protected $apiClass    = Fill::class;
+    protected $apiWithAuth = true;
 
     /**
-     * @depends testNewFill
+     * @dataProvider apiProvider
      * @param Fill $api
      * @throws \KuCoin\SDK\Exceptions\BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException
@@ -58,7 +41,7 @@ public function testGetList(Fill $api)
     }
 
     /**
-     * @depends testNewFill
+     * @dataProvider apiProvider
      * @param Fill $api
      * @throws \KuCoin\SDK\Exceptions\BusinessException
      * @throws \KuCoin\SDK\Exceptions\HttpException