migrating to phpunit 6, related to #684

NatLibFi · Jan 12, 2018 · db0318d · db0318d
1 parent cfbaac6
commit db0318d
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
     "monolog/monolog": "1.23.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8 - 5.4.5",
+    "phpunit/phpunit": "4.8 - 6.5.5",
     "umpirsky/twig-gettext-extractor": "1.3.*",
     "codeclimate/php-test-reporter": "0.4.4",
     "symfony/dom-crawler": "3.4.3",

diff --git a/tests/BreadcrumbTest.php b/tests/BreadcrumbTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class BreadcrumbTest extends PHPUnit_Framework_TestCase
+class BreadcrumbTest extends PHPUnit\Framework\TestCase
 {
 
   /**

diff --git a/tests/ConceptMappingPropertyValueTest.php b/tests/ConceptMappingPropertyValueTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptMappingPropertyValueTest extends PHPUnit_Framework_TestCase
+class ConceptMappingPropertyValueTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $concept;

diff --git a/tests/ConceptPropertyTest.php b/tests/ConceptPropertyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptPropertyTest extends PHPUnit_Framework_TestCase
+class ConceptPropertyTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
 

diff --git a/tests/ConceptPropertyValueLiteralTest.php b/tests/ConceptPropertyValueLiteralTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptPropertyValueLiteralTest extends PHPUnit_Framework_TestCase
+class ConceptPropertyValueLiteralTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $concept;
@@ -52,7 +52,7 @@ public function testGetLabelThatIsADate() {
 
   /**
    * @covers ConceptPropertyValueLiteral::getLabel
-   * @expectedException PHPUnit_Framework_Error
+   * @expectedException PHPUnit\Framework\Error\Error
    */
   public function testGetLabelThatIsABrokenDate() {
     $vocab = $this->model->getVocabulary('dates');

diff --git a/tests/ConceptPropertyValueTest.php b/tests/ConceptPropertyValueTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptPropertyValueTest extends PHPUnit_Framework_TestCase
+class ConceptPropertyValueTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $concept;

diff --git a/tests/ConceptSearchParametersTest.php b/tests/ConceptSearchParametersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptSearchParametersTest extends PHPUnit_Framework_TestCase
+class ConceptSearchParametersTest extends PHPUnit\Framework\TestCase
 {
     private $model; 
     private $request;

diff --git a/tests/ConceptTest.php b/tests/ConceptTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConceptTest extends PHPUnit_Framework_TestCase
+class ConceptTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $concept;
@@ -247,7 +247,7 @@ public function testGetDateWithCreatedAndModified() {
    * @covers Concept::getDate
    * @covers ConceptProperty::getValues
    * @covers ConceptPropertyValueLiteral::getLabel
-   * @expectedException PHPUnit_Framework_Error
+   * @expectedException PHPUnit\Framework\Error\Error
    */
 
   public function testGetTimestampInvalidWarning() {

diff --git a/tests/DataObjectTest.php b/tests/DataObjectTest.php
@@ -1,7 +1,7 @@
 
 <?php
 
-class DataObjectTest extends PHPUnit_Framework_TestCase
+class DataObjectTest extends PHPUnit\Framework\TestCase
 {
 
   /**

diff --git a/tests/FeedbackTest.php b/tests/FeedbackTest.php
@@ -2,7 +2,7 @@
 
 use Symfony\Component\DomCrawler\Crawler;
 
-class FeedbackTest extends PHPUnit_Framework_TestCase
+class FeedbackTest extends PHPUnit\Framework\TestCase
 {
   private $model;
   private $request;

diff --git a/tests/GenericSparqlTest.php b/tests/GenericSparqlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class GenericSparqlTest extends PHPUnit_Framework_TestCase
+class GenericSparqlTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $graph; 

diff --git a/tests/GlobalConfigTest.php b/tests/GlobalConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class GlobalConfigTest extends PHPUnit_Framework_TestCase
+class GlobalConfigTest extends PHPUnit\Framework\TestCase
 {
 
   private $config; 

diff --git a/tests/JenaTextSparqlTest.php b/tests/JenaTextSparqlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class JenaTextSparqlTest extends PHPUnit_Framework_TestCase
+class JenaTextSparqlTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $graph; 

diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelTest extends PHPUnit_Framework_TestCase
+class ModelTest extends PHPUnit\Framework\TestCase
 {
   private $params;
   private $model;
@@ -161,7 +161,7 @@ public function testSearchWithOnlyMultipleWildcards() {
 
   /**
    * @covers Model::searchConcepts
-   * @expectedException PHPUnit_Framework_Error
+   * @expectedException PHPUnit\Framework\Error\Error
    */
   public function testSearchWithNoParams() {
     $result = $this->model->searchConcepts();

diff --git a/tests/PluginRegisterTest.php b/tests/PluginRegisterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class PluginRegisterTest extends PHPUnit_Framework_TestCase
+class PluginRegisterTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $concept;

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class RequestTest extends PHPUnit_Framework_TestCase
+class RequestTest extends PHPUnit\Framework\TestCase
 {
   private $model;
   private $request;

diff --git a/tests/VocabularyCategoryTest.php b/tests/VocabularyCategoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class VocabularyCategoryTest extends PHPUnit_Framework_TestCase
+class VocabularyCategoryTest extends PHPUnit\Framework\TestCase
 {
   private $model; 
   private $mockres;

diff --git a/tests/VocabularyConfigTest.php b/tests/VocabularyConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class VocabularyConfigTest extends PHPUnit_Framework_TestCase
+class VocabularyConfigTest extends PHPUnit\Framework\TestCase
 {
 
   private $model; 
@@ -105,7 +105,7 @@ public function testGetDefaultLanguage() {
 
   /**
    * @covers VocabularyConfig::getDefaultLanguage
-   * @expectedException PHPUnit_Framework_Error 
+   * @expectedException PHPUnit\Framework\Error\Error
    */
   public function testGetDefaultLanguageWhenNotSet() {
     $vocab = $this->model->getVocabulary('testdiff');
@@ -164,7 +164,7 @@ public function testGetDataURLs() {
 
   /**
    * @covers VocabularyConfig::getDataURLs
-   * @expectedException PHPUnit_Framework_Error_Warning
+   * @expectedException PHPUnit\Framework\Error\Warning
    */
   public function testGetDataURLsNotGuessable() {
     $vocab = $this->model->getVocabulary('test');

diff --git a/tests/VocabularyDataObjectTest.php b/tests/VocabularyDataObjectTest.php
@@ -1,7 +1,7 @@
 
 <?php
 
-class VocabularyDataObjectTest extends PHPUnit_Framework_TestCase
+class VocabularyDataObjectTest extends PHPUnit\Framework\TestCase
 {
 
   /**

diff --git a/tests/VocabularyTest.php b/tests/VocabularyTest.php
@@ -2,7 +2,7 @@
 
 require_once('model/Model.php');
 
-class VocabularyTest extends PHPUnit_Framework_TestCase
+class VocabularyTest extends \PHPUnit\Framework\TestCase
 {
 
   private $model; 
@@ -297,7 +297,7 @@ public function testSearchConceptsAlphabeticalEverything() {
   public function testGetBreadCrumbs() {
     $model = new Model(new GlobalConfig('/../tests/testconfig.inc'));
     $resource = $this->getMockBuilder('EasyRdf\Resource')->disableOriginalConstructor()->getMock();
-    $vocabstub = $this->getMock('Vocabulary', array('getConceptTransitiveBroaders'), array($model, $resource));
+    $vocabstub = $this->getMockBuilder('Vocabulary')->setMethods(array('getConceptTransitiveBroaders'))->setConstructorArgs(array($model, $resource))->getMock();
     $vocabstub->method('getConceptTransitiveBroaders')->willReturn(array ( 'http://www.yso.fi/onto/yso/p4762' => array ( 'label' => 'objects', ), 'http://www.yso.fi/onto/yso/p1674' => array ( 'label' => 'physical whole', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p4762', ), ), 'http://www.yso.fi/onto/yso/p14606' => array ( 'label' => 'layers', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p1674', ), ), ));
     $result = $vocabstub->getBreadCrumbs('en', 'http://www.yso.fi/onto/yso/p14606');
     foreach($result['breadcrumbs'][0] as $crumb)    
@@ -312,7 +312,7 @@ public function testGetBreadCrumbs() {
   public function testGetBreadCrumbsShortening() {
     $model = new Model(new GlobalConfig('/../tests/testconfig.inc'));
     $resource = $this->getMockBuilder('EasyRdf\Resource')->disableOriginalConstructor()->getMock();
-    $vocabstub = $this->getMock('Vocabulary', array('getConceptTransitiveBroaders'), array($model, $resource));
+    $vocabstub = $this->getMockBuilder('Vocabulary')->setMethods(array('getConceptTransitiveBroaders'))->setConstructorArgs(array($model, $resource))->getMock();
     $vocabstub->method('getConceptTransitiveBroaders')->willReturn(array ( 'http://www.yso.fi/onto/yso/p4762' => array ( 'label' => 'objects', ), 'http://www.yso.fi/onto/yso/p13871' => array ( 'label' => 'thai language', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p10834', ), ), 'http://www.yso.fi/onto/yso/p556' => array ( 'label' => 'languages', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p2881', ), ), 'http://www.yso.fi/onto/yso/p8965' => array ( 'label' => 'Sino-Tibetan languages', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p556', ), ), 'http://www.yso.fi/onto/yso/p3358' => array ( 'label' => 'systems', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p4762', ), ), 'http://www.yso.fi/onto/yso/p10834' => array ( 'label' => 'Tai languages', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p8965', ), ), 'http://www.yso.fi/onto/yso/p2881' => array ( 'label' => 'cultural systems', 'direct' => array ( 0 => 'http://www.yso.fi/onto/yso/p3358', ), ), ) );
     $result = $vocabstub->getBreadCrumbs('en', 'http://www.yso.fi/onto/yso/p13871');
     $this->assertEquals(6, sizeof($result['breadcrumbs'][0]));