From 992c3a8406676aadc2964bfb368b7a4942e42256 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 28 Feb 2018 15:51:26 -0500
Subject: [PATCH] Do not use constructors in test classes. - Preparing for
PHPUnit upgrade.
---
.../src/VuFindTest/ILS/Driver/AlephTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/AmicusTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/ClaviusSQLTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/DAIATest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/EvergreenTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/HorizonTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/HorizonXMLAPITest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/InnovativeTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/KohaTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/NewGenLibTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/PAIATest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/PolarisTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/SampleTest.php | 11 +++++++++--
.../src/VuFindTest/ILS/Driver/SymphonyTest.php | 11 +++++++++--
.../src/VuFindTest/ILS/Driver/UnicornTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/VirtuaTest.php | 6 ++++--
.../VuFindTest/ILS/Driver/VoyagerRestfulTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/VoyagerTest.php | 6 ++++--
.../src/VuFindTest/ILS/Driver/XCNCIP2Test.php | 6 ++++--
.../tests/unit-tests/src/VuFindTest/TagsTest.php | 6 ++++--
.../unit-tests/src/VuFindTest/ThemeCompilerTest.php | 13 +++----------
.../unit-tests/src/VuFindTest/ThemeInfoTest.php | 2 +-
22 files changed, 94 insertions(+), 51 deletions(-)
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AlephTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AlephTest.php
index 1fdce973688..965d318a1ce 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AlephTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AlephTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Aleph;
class AlephTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Aleph(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AmicusTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AmicusTest.php
index a396f709f66..cea8f4151d7 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AmicusTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AmicusTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Amicus;
class AmicusTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Amicus();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ClaviusSQLTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ClaviusSQLTest.php
index 0ee5f4d6513..f9b0637fd21 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ClaviusSQLTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ClaviusSQLTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\ClaviusSQL;
class ClaviusSQLTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new ClaviusSQL();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
index 8c826696148..b9bd12d8f40 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
@@ -137,9 +137,11 @@ class DAIATest extends \VuFindTest\Unit\ILSDriverTestCase
];
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = $this->createConnector();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/EvergreenTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/EvergreenTest.php
index 245a7178d9e..6da0eeb3f2e 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/EvergreenTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/EvergreenTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Evergreen;
class EvergreenTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Evergreen();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonTest.php
index 1169b1938a7..466cd587c4f 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Horizon;
class HorizonTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Horizon(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonXMLAPITest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonXMLAPITest.php
index d4852e1bf73..eb2164af825 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonXMLAPITest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/HorizonXMLAPITest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\HorizonXMLAPI;
class HorizonXMLAPITest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new HorizonXMLAPI(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/InnovativeTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/InnovativeTest.php
index 3774120df5c..fa4436f08ac 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/InnovativeTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/InnovativeTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Innovative;
class InnovativeTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Innovative();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/KohaTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/KohaTest.php
index 09ad088d7cf..8faaa472503 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/KohaTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/KohaTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Koha;
class KohaTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Koha(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/NewGenLibTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/NewGenLibTest.php
index c7606911065..263f487a358 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/NewGenLibTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/NewGenLibTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\NewGenLib;
class NewGenLibTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new NewGenLib();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PAIATest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PAIATest.php
index bf2ec83c3fa..150ae1cb5cc 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PAIATest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PAIATest.php
@@ -322,9 +322,11 @@ class PAIATest extends \VuFindTest\Unit\ILSDriverTestCase
*/
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = $this->createConnector();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PolarisTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PolarisTest.php
index c300a9a073f..e8487d6cbe3 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PolarisTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PolarisTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Polaris;
class PolarisTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Polaris();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SampleTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SampleTest.php
index 290ba77d373..2d55e2a4114 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SampleTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SampleTest.php
@@ -40,12 +40,19 @@ use VuFind\ILS\Driver\Sample;
*/
class SampleTest extends \VuFindTest\Unit\TestCase
{
+ /**
+ * Driver object.
+ *
+ * @var Sample
+ */
protected $driver;
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Sample();
$this->driver->init();
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SymphonyTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SymphonyTest.php
index 2abe80816b0..b8d62c4bbd8 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SymphonyTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/SymphonyTest.php
@@ -40,12 +40,19 @@ use VuFind\ILS\Driver\Symphony;
*/
class SymphonyTest extends \VuFindTest\Unit\TestCase
{
+ /**
+ * Driver object
+ *
+ * @var Symphony
+ */
protected $driver;
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$loader = $this->getMockBuilder('VuFind\Record\Loader')
->disableOriginalConstructor()->getMock();
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/UnicornTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/UnicornTest.php
index efa5c0a3b2b..28ed82cc298 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/UnicornTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/UnicornTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Unicorn;
class UnicornTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Unicorn(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VirtuaTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VirtuaTest.php
index 5f70cb658b6..ea685905ea5 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VirtuaTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VirtuaTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Virtua;
class VirtuaTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Virtua();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerRestfulTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerRestfulTest.php
index 3b72abe4ffb..aa95a67a18a 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerRestfulTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerRestfulTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\VoyagerRestful;
class VoyagerRestfulTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new VoyagerRestful(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerTest.php
index a2aaf765996..16cf20eabb0 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/VoyagerTest.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\Voyager;
class VoyagerTest extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new Voyager(new \VuFind\Date\Converter());
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/XCNCIP2Test.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/XCNCIP2Test.php
index c73917f6015..8e9d568edff 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/XCNCIP2Test.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/XCNCIP2Test.php
@@ -41,9 +41,11 @@ use VuFind\ILS\Driver\XCNCIP2;
class XCNCIP2Test extends \VuFindTest\Unit\ILSDriverTestCase
{
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->driver = new XCNCIP2();
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/TagsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/TagsTest.php
index b630d3f3402..f2d18074c26 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/TagsTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/TagsTest.php
@@ -46,9 +46,11 @@ class TagsTest extends \PHPUnit_Framework_TestCase
protected $parser;
/**
- * Constructor
+ * Standard setup method.
+ *
+ * @return void
*/
- public function __construct()
+ public function setUp()
{
$this->parser = new \VuFind\Tags();
}
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
index f0808c15f38..a4d80e63412 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
@@ -62,16 +62,6 @@ class ThemeCompilerTest extends Unit\TestCase
*/
protected $targetPath;
- /**
- * Constructor
- */
- public function __construct()
- {
- $this->fixturePath = realpath(__DIR__ . '/../../fixtures/themes');
- $this->info = new ThemeInfo($this->fixturePath, 'parent');
- $this->targetPath = $this->info->getBaseDir() . '/compiled';
- }
-
/**
* Standard setup method.
*
@@ -79,6 +69,9 @@ class ThemeCompilerTest extends Unit\TestCase
*/
public function setUp()
{
+ $this->fixturePath = realpath(__DIR__ . '/../../fixtures/themes');
+ $this->info = new ThemeInfo($this->fixturePath, 'parent');
+ $this->targetPath = $this->info->getBaseDir() . '/compiled';
// Give up if the target directory already exists:
if (is_dir($this->targetPath)) {
return $this->markTestSkipped('compiled theme already exists.');
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
index d0d59004dab..7d2653f5656 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
@@ -50,7 +50,7 @@ class ThemeInfoTest extends Unit\TestCase
/**
* Constructor
*/
- public function __construct()
+ public function setUp()
{
$this->fixturePath = realpath(__DIR__ . '/../../fixtures/themes');
}
--
GitLab