chore (php7): Update all phpunit tests, refactor psr-0 for test

Update all phpunit test according to phpunit update. Add phpunit config file allowing to overload default config. Update autoload
v-technologies · Oct 29, 2019 · 41dfc94 · 41dfc94
1 parent 544cd6c
commit 41dfc94
Show file tree

Hide file tree

Showing 21 changed files with 182 additions and 143 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 nbproject/
 sftp-*
 /vendor
+phpunit.xml
 
 # many file generated by IDE
 .buildpath

diff --git a/composer.json b/composer.json
@@ -19,5 +19,8 @@
  },
  "autoload": {
  "psr-0": {"Simples": "lib/"}
- }
+ },
+ "autoload-dev": {
+ "psr-0": { "Tests_Simples": "tests/lib" }
+ }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+ bootstrap="./tests/lib/Autoload.php"
+ backupGlobals="false"
+ backupStaticAttributes="false"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ processIsolation="false"
+ stopOnFailure="false"
+>
+ <php>
+ <ini name="memory_limit" value="-1"/>
+ <env name="host" value="127.0.0.1" force="true" />
+ <env name="port" value="9200" force="true" />
+ <env name="protocol" value="http" force="true" />
+ </php>
+ <testsuites>
+ <testsuite name="AllTests">
+ <directory>./tests/</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/tests/lib/Autoload.php b/tests/lib/Autoload.php
@@ -0,0 +1,20 @@
+<?php
+
+if (!defined('SIMPLES_TESTS_ROOT')) {
+ define('SIMPLES_TESTS_ROOT', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Simples autoload method for tests.
+ *
+ * @param string $class Class name to load
+ */
+function autoload_simples_tests ($class) {
+ $path = str_replace('_', DIRECTORY_SEPARATOR , $class);
+ if (file_exists(SIMPLES_TESTS_ROOT . $path . '.php')) {
+ require_once(SIMPLES_TESTS_ROOT . $path . '.php');
+ }
+}
+
+// Register our custom autoload method
+spl_autoload_register('autoload_simples_tests');
diff --git a/tests/lib/Simples/DocumentTest.php b/tests/lib/Simples/DocumentTest.php
@@ -1,14 +1,13 @@
 <?php
-require_once(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'bootstrap.php') ;
 
-use PHPUnit\Framework\TestCase;
-
-class Simples_DocumentTest extends TestCase {
+class Simples_DocumentTest extends Simples_HttpTestCase {
 
  /**
  * Set up some fixtures.
  */
  protected function setUp() : void {
+ parent::setUp();
+
  $this->data['standard'] = array(
  'firstname' => 'Jim',
  'lastname' => 'Morrison',

diff --git a/tests/lib/Simples/HttpTestCase.php b/tests/lib/Simples/HttpTestCase.php
@@ -0,0 +1,46 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+class Simples_HttpTestCase extends TestCase {
+
+ /**
+ * @var Simples_Transport_Http|null
+ */
+ protected $client;
+
+ /**
+ * @var array
+ */
+ protected $defaultHttpConfig = [
+ 'host' => '127.0.0.1',
+ 'port' => 9200,
+ 'protocol' => 'http',
+ 'timeout' => 1000,
+ 'check' => true,
+ 'index' => null,
+ 'type' => null
+ ]; 
+
+ /**
+ * Redefine http config from env var
+ * given by phpunit.xml
+ */
+ protected function setUp() : void {
+ foreach ($this->defaultHttpConfig as $key => $value) {
+ if (getenv($key)) {
+ $this->defaultHttpConfig[$key] = getenv($key);
+ }
+ }
+ parent::setUp();
+ $this->client = new Simples_Transport_Http($this->getTransportHttpConfig());
+ }
+
+ /**
+ * @return []
+ */
+ protected function getTransportHttpConfig()
+ {
+ return $this->defaultHttpConfig;
+ }
+}
diff --git a/tests/lib/Simples/Request/CreateIndexTest.php b/tests/lib/Simples/Request/CreateIndexTest.php
@@ -1,15 +1,7 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
+class Simples_Request_CreateIndexTest extends Simples_HttpTestCase {
 
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_CreateIndexTest extends TestCase {
-
- protected function setUp() : void {
- $this->client = new Simples_Transport_Http() ;
- }
-
  public function testCreate() {
  $this->client->config('index','test_index') ;
  $request = $this->client->createIndex() ;

diff --git a/tests/lib/Simples/Request/DeleteIndexTest.php b/tests/lib/Simples/Request/DeleteIndexTest.php
@@ -1,14 +1,9 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_DeleteIndexTest extends TestCase {
+class Simples_Request_DeleteIndexTest extends Simples_HttpTestCase {
 
  public function testDelete() {
- $client = new Simples_Transport_Http(); 
- $request = $client->deleteIndex('twitter') ;
+ $request = $this->client->deleteIndex('twitter') ;
  $this->assertEquals(Simples_Request::DELETE, $request->method()) ;
  $this->assertEquals('/twitter/', (string) $request->path()) ;
  }

diff --git a/tests/lib/Simples/Request/DeleteTest.php b/tests/lib/Simples/Request/DeleteTest.php
@@ -1,13 +1,9 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_DeleteTest extends TestCase {
+class Simples_Request_DeleteTest extends Simples_HttpTestCase {
 
  public function testDelete() {
- $client = new Simples_Transport_Http();
+ $client = $this->client;
  $this->assertTrue($client->index(
  array(
  'content' => 'Pliz, pliz, delete me !'

diff --git a/tests/lib/Simples/Request/DeleteTypeTest.php b/tests/lib/Simples/Request/DeleteTypeTest.php
@@ -1,15 +1,13 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_DeleteTypeTest extends TestCase {
+class Simples_Request_DeleteTypeTest extends Simples_HttpTestCase {
 
  public $client ;
 
  protected function setUp() : void {
- $this->client = new Simples_Transport_Http(array('index' => 'test_delete', 'type' => 'test_delete_type')); 
+ parent::setUp();
+ $this->client->config('index', 'test_delete');
+ $this->client->config('type', 'test_delete_type');
  $this->client->createIndex()->execute() ;
  }
 
@@ -31,5 +29,4 @@ protected function tearDown() : void {
  $this->client->deleteIndex()->execute() ;
  }
  }
-
 }
diff --git a/tests/lib/Simples/Request/GetTest.php b/tests/lib/Simples/Request/GetTest.php
@@ -1,33 +1,29 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_GetTest extends TestCase {
+class Simples_Request_GetTest extends Simples_HttpTestCase {
 
+ protected function setUp() : void
+ {
+ parent::setUp();
+ $this->client->config('index', 'twitter');
+ $this->client->config('type', 'tweet');
+ }
+
  public function testGet() {
- $client = new Simples_Transport_Http(array(
- 'index' => 'twitter',
- 'type' => 'tweet'
- ));
+ $this->client->config('index', 'twitter');
+ $this->client->config('type', 'tweet');
 
- $this->assertTrue($client->index(array('content' => 'I\'m there.'), array('id' => 'test_get'))->ok) ;
- $this->assertEquals('I\'m there.', $client->get('test_get')->_source->content);
+ $this->assertTrue($this->client->index(array('content' => 'I\'m there.'), array('id' => 'test_get'))->ok) ;
+ $this->assertEquals('I\'m there.', $this->client->get('test_get')->_source->content);
  }
 
  public function testMultiple() {
- $client = new Simples_Transport_Http(array(
- 'index' => 'twitter',
- 'type' => 'tweet'
- ));
-
- $client->index(array(
+ $this->client->index(array(
  array('id' => '1', 'value' => 'first'),
  array('id' => '2', 'value' => 'second')
  ), array('refresh' => true)) ;
 
- $request = $client->get(array(1,2)) ;
+ $request = $this->client->get(array(1,2)) ;
  $this->assertEquals('/_mget/', (string) $request->path()) ;
  $body = $request->body() ;
  $this->assertEquals('1', $body['docs'][0]['_id']) ;

diff --git a/tests/lib/Simples/Request/IndexTest.php b/tests/lib/Simples/Request/IndexTest.php
@@ -1,23 +1,17 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_IndexTest extends TestCase {
+class Simples_Request_IndexTest extends Simples_HttpTestCase {
 
  public $client ;
 
  protected function setUp() : void {
- $this->client = new Simples_Transport_Http(array(
-  'index' => 'twitter',
-  'type' => 'tweet'
- ));
+ parent::setUp();
+
+ $this->client->config('index', 'twitter');
+ $this->client->config('type', 'tweet');
  }
 
  public function testIndex() {
- $request = new Simples_Request_Index(null, null, new Simples_Transport_Http());
-
  $request = $this->client->index(array(
  'user' => 'scharrier',
  'fullname' => 'Sébastien Charrier'

diff --git a/tests/lib/Simples/Request/MappingTest.php b/tests/lib/Simples/Request/MappingTest.php
@@ -1,17 +1,12 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_MappingTest extends TestCase {
+class Simples_Request_MappingTest extends Simples_HttpTestCase {
 
  protected function setUp() : void {
- $this->client = new Simples_Transport_Http(array(
- 'index' => 'music',
- 'type' => 'composers',
- 'log' => true
- ));
+ parent::setUp();
+ $this->client->config('index', 'music');
+ $this->client->config('type', 'composers');
+ $this->client->config('log', true);
  $this->client->createIndex()->execute() ;
  }
 

diff --git a/tests/lib/Simples/Request/Search/FacetTest.php b/tests/lib/Simples/Request/Search/FacetTest.php
@@ -22,6 +22,7 @@ public function testIn() {
  )
  )
  ) ;
+ $this->assertEquals($expected, $res);
 
  $facet = new Simples_Request_Search_Facet(array('in' => 'category_id')) ;
  $res = $facet->to('array') ;
@@ -32,6 +33,7 @@ public function testIn() {
  )
  )
  ) ;
+ $this->assertEquals($expected, $res);
 
  $facet = new Simples_Request_Search_Facet(array('field' => 'category_id')) ;
  $res = $facet->to('array') ;
@@ -42,6 +44,7 @@ public function testIn() {
  )
  )
  ) ;
+ $this->assertEquals($expected, $res);
  }
 
  public function testMultipleFields() {

diff --git a/tests/lib/Simples/Request/SearchTest.php b/tests/lib/Simples/Request/SearchTest.php
@@ -1,18 +1,13 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_SearchTest extends TestCase {
+class Simples_Request_SearchTest extends Simples_HttpTestCase {
 
  public $client ;
 
  protected function setUp() : void {
- $this->client = new Simples_Transport_Http(array(
- 'index' => 'twitter',
- 'type' => 'tweet'
- ));
+ parent::setUp();
+ $this->client->config('index', 'twitter');
+ $this->client->config('type', 'tweet');
 
  $this->client->deleteIndex()->execute() ;
 

diff --git a/tests/lib/Simples/Request/StatusTest.php b/tests/lib/Simples/Request/StatusTest.php
@@ -1,13 +1,9 @@
 <?php
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php') ;
 
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_StatusTest extends TestCase {
+class Simples_Request_StatusTest extends Simples_HttpTestCase {
 
  public function testStatus() {
- $client = new Simples_Transport_Http() ;
- $results = $client->status()->execute() ;
+ $results = $this->client->status()->execute() ;
  $this->assertEquals(true, $results->ok) ;
  $this->assertTrue(isset($results->_shards->total)) ;
  }

diff --git a/tests/lib/Simples/Request/UpdateTest.php b/tests/lib/Simples/Request/UpdateTest.php
@@ -1,17 +1,12 @@
 <?php
 
-require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
-
-use PHPUnit\Framework\TestCase;
-
-class Simples_Request_UpdateTest extends TestCase {
+class Simples_Request_UpdateTest extends Simples_HttpTestCase {
 
  protected function setUp() : void {
- $this->client = new Simples_Transport_Http(array(
- 'index' => 'twitter',
- 'type' => 'tweet',
- 'log' => true
- ));
+ parent::setUp();
+ $this->client->config('index', 'twitter');
+ $this->client->config('type', 'tweet');
+ $this->client->config('log', true);
  }
 
  public function testUpdate() {