diff --git a/phpunit.xml b/phpunit.xml index 8ad3c7164..35f7a1b93 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ assertSame(0, $result->getStatus()); $this->assertSame('OK', $result->getPingStatus()); - if ($this instanceof AbstractCloudTest) { + if ($this instanceof AbstractCloudTestCase) { $this->assertTrue($result->getZkConnected()); } else { $this->assertNull($result->getZkConnected()); @@ -960,7 +960,7 @@ public function testMoreLikeThisComponent() // Solr 7 doesn't support mlt.interestingTerms for MoreLikeThisComponent // Solr 8 & Solr 9: "To use this parameter with the search component, the query cannot be distributed." // https://solr.apache.org/guide/morelikethis.html#common-handler-and-component-parameters - if (8 <= self::$solrVersion && $this instanceof AbstractServerTest) { + if (8 <= self::$solrVersion && $this instanceof AbstractServerTestCase) { // with 'details', interesting terms are an associative array of terms and their boost values $interestingTerms = $mlt->getInterestingTerm($document->id); $this->assertSame('cat:search', key($interestingTerms)); @@ -1224,7 +1224,7 @@ public function testTerms() $terms->setFields('name'); // Setting distrib to true in a non cloud setup causes exceptions. - if ($this instanceof AbstractCloudTest) { + if ($this instanceof AbstractCloudTestCase) { $terms->setDistrib(true); } @@ -1250,7 +1250,7 @@ public function testTermsComponent() $select = self::$client->createQuery('test'); // Setting distrib to true in a non cloud setup causes exceptions. - if ($this instanceof AbstractCloudTest) { + if ($this instanceof AbstractCloudTestCase) { $select->setDistrib(true); } @@ -1391,7 +1391,7 @@ public function testUpdate(string $requestFormat) $this->assertSame(0, $response->getStatus()); // rollback is currently not supported in SolrCloud mode (SOLR-4895) - if ($this instanceof AbstractServerTest) { + if ($this instanceof AbstractServerTestCase) { // add, rollback, commit $update = self::$client->createUpdate(); $update->setRequestFormat($requestFormat); @@ -1635,7 +1635,7 @@ public function testModifiers(string $requestFormat) ], $result->getIterator()->current()->getFields()); // add-distinct with multiple values can add duplicates in Solr 7 cloud mode (SOLR-14550) - if (7 === self::$solrVersion && $this instanceof AbstractCloudTest) { + if (7 === self::$solrVersion && $this instanceof AbstractCloudTestCase) { // we still have to emulate a successful atomic update for the remainder of this test to pass $doc = $update->createDocument(); $doc->setKey('id', 'solarium-test'); diff --git a/tests/Integration/Proxy/AbstractProxyTest.php b/tests/Integration/Proxy/AbstractProxyTestCase.php similarity index 96% rename from tests/Integration/Proxy/AbstractProxyTest.php rename to tests/Integration/Proxy/AbstractProxyTestCase.php index bfb0234ae..dc99b2393 100644 --- a/tests/Integration/Proxy/AbstractProxyTest.php +++ b/tests/Integration/Proxy/AbstractProxyTestCase.php @@ -11,7 +11,7 @@ * * @group integration */ -abstract class AbstractProxyTest extends TestCase +abstract class AbstractProxyTestCase extends TestCase { /** * @var ClientInterface diff --git a/tests/Integration/Proxy/CurlTest.php b/tests/Integration/Proxy/CurlTest.php index ef685d9f5..26c4cdf0d 100644 --- a/tests/Integration/Proxy/CurlTest.php +++ b/tests/Integration/Proxy/CurlTest.php @@ -11,7 +11,7 @@ * * @group integration */ -class CurlTest extends AbstractProxyTest +class CurlTest extends AbstractProxyTestCase { protected static function createClient(): void { diff --git a/tests/Integration/Proxy/HttpTest.php b/tests/Integration/Proxy/HttpTest.php index d2010cf9e..16b3b4075 100644 --- a/tests/Integration/Proxy/HttpTest.php +++ b/tests/Integration/Proxy/HttpTest.php @@ -9,7 +9,7 @@ * * @group integration */ -class HttpTest extends AbstractProxyTest +class HttpTest extends AbstractProxyTestCase { protected static function createClient(): void { diff --git a/tests/Integration/SolrCloud/CurlTest.php b/tests/Integration/SolrCloud/CurlTest.php index efa3aefa8..c1e1dbdc0 100644 --- a/tests/Integration/SolrCloud/CurlTest.php +++ b/tests/Integration/SolrCloud/CurlTest.php @@ -3,13 +3,13 @@ namespace Solarium\Tests\Integration\SolrCloud; use Solarium\Core\Client\Adapter\Curl; -use Solarium\Tests\Integration\AbstractCloudTest; +use Solarium\Tests\Integration\AbstractCloudTestCase; /** * @group integration * @group skip_for_solr_server */ -class CurlTest extends AbstractCloudTest +class CurlTest extends AbstractCloudTestCase { public function setUp(): void { diff --git a/tests/Integration/SolrCloud/HttpTest.php b/tests/Integration/SolrCloud/HttpTest.php index 18175b5f7..9e07edbcf 100644 --- a/tests/Integration/SolrCloud/HttpTest.php +++ b/tests/Integration/SolrCloud/HttpTest.php @@ -3,13 +3,13 @@ namespace Solarium\Tests\Integration\SolrCloud; use Solarium\Core\Client\Adapter\Http; -use Solarium\Tests\Integration\AbstractCloudTest; +use Solarium\Tests\Integration\AbstractCloudTestCase; /** * @group integration * @group skip_for_solr_server */ -class HttpTest extends AbstractCloudTest +class HttpTest extends AbstractCloudTestCase { public function setUp(): void { diff --git a/tests/Integration/SolrCloud/Psr18Test.php b/tests/Integration/SolrCloud/Psr18Test.php index eecaa6e20..b212facf6 100644 --- a/tests/Integration/SolrCloud/Psr18Test.php +++ b/tests/Integration/SolrCloud/Psr18Test.php @@ -2,12 +2,12 @@ namespace Solarium\Tests\Integration\SolrCloud; -use Solarium\Tests\Integration\AbstractCloudTest; +use Solarium\Tests\Integration\AbstractCloudTestCase; /** * @group integration * @group skip_for_solr_server */ -class Psr18Test extends AbstractCloudTest +class Psr18Test extends AbstractCloudTestCase { } diff --git a/tests/Integration/SolrServer/CurlTest.php b/tests/Integration/SolrServer/CurlTest.php index 299eb2672..dfdcc0657 100644 --- a/tests/Integration/SolrServer/CurlTest.php +++ b/tests/Integration/SolrServer/CurlTest.php @@ -3,13 +3,13 @@ namespace Solarium\Tests\Integration\SolrServer; use Solarium\Core\Client\Adapter\Curl; -use Solarium\Tests\Integration\AbstractServerTest; +use Solarium\Tests\Integration\AbstractServerTestCase; /** * @group integration * @group skip_for_solr_cloud */ -class CurlTest extends AbstractServerTest +class CurlTest extends AbstractServerTestCase { public function setUp(): void { diff --git a/tests/Integration/SolrServer/HttpTest.php b/tests/Integration/SolrServer/HttpTest.php index fdde54446..40c8fa68d 100644 --- a/tests/Integration/SolrServer/HttpTest.php +++ b/tests/Integration/SolrServer/HttpTest.php @@ -3,13 +3,13 @@ namespace Solarium\Tests\Integration\SolrServer; use Solarium\Core\Client\Adapter\Http; -use Solarium\Tests\Integration\AbstractServerTest; +use Solarium\Tests\Integration\AbstractServerTestCase; /** * @group integration * @group skip_for_solr_cloud */ -class HttpTest extends AbstractServerTest +class HttpTest extends AbstractServerTestCase { public function setUp(): void { diff --git a/tests/Integration/SolrServer/Psr18Test.php b/tests/Integration/SolrServer/Psr18Test.php index 935959d9e..535157f48 100644 --- a/tests/Integration/SolrServer/Psr18Test.php +++ b/tests/Integration/SolrServer/Psr18Test.php @@ -2,12 +2,12 @@ namespace Solarium\Tests\Integration\SolrServer; -use Solarium\Tests\Integration\AbstractServerTest; +use Solarium\Tests\Integration\AbstractServerTestCase; /** * @group integration * @group skip_for_solr_cloud */ -class Psr18Test extends AbstractServerTest +class Psr18Test extends AbstractServerTestCase { } diff --git a/tests/Plugin/MinimumScoreFilter/DocumentTest.php b/tests/Plugin/MinimumScoreFilter/DocumentTest.php index 76683d3c8..947a4b712 100644 --- a/tests/Plugin/MinimumScoreFilter/DocumentTest.php +++ b/tests/Plugin/MinimumScoreFilter/DocumentTest.php @@ -4,9 +4,9 @@ use Solarium\Plugin\MinimumScoreFilter\Document as FilterDocument; use Solarium\QueryType\Select\Result\Document; -use Solarium\Tests\QueryType\Select\Result\AbstractDocumentTest; +use Solarium\Tests\QueryType\Select\Result\AbstractDocumentTestCase; -class DocumentTest extends AbstractDocumentTest +class DocumentTest extends AbstractDocumentTestCase { public function setUp(): void { diff --git a/tests/Plugin/MinimumScoreFilter/QueryTest.php b/tests/Plugin/MinimumScoreFilter/QueryTest.php index 2613cd4f5..9ead0df31 100644 --- a/tests/Plugin/MinimumScoreFilter/QueryTest.php +++ b/tests/Plugin/MinimumScoreFilter/QueryTest.php @@ -6,9 +6,9 @@ use Solarium\Plugin\MinimumScoreFilter\Query; use Solarium\Plugin\MinimumScoreFilter\QueryGroupResult; use Solarium\Plugin\MinimumScoreFilter\ValueGroupResult; -use Solarium\Tests\QueryType\Select\Query\AbstractQueryTest; +use Solarium\Tests\QueryType\Select\Query\AbstractQueryTestCase; -class QueryTest extends AbstractQueryTest +class QueryTest extends AbstractQueryTestCase { public function setUp(): void { diff --git a/tests/Plugin/MinimumScoreFilter/ResultTest.php b/tests/Plugin/MinimumScoreFilter/ResultTest.php index 0db3a7dd9..ace7c1aac 100644 --- a/tests/Plugin/MinimumScoreFilter/ResultTest.php +++ b/tests/Plugin/MinimumScoreFilter/ResultTest.php @@ -6,9 +6,9 @@ use Solarium\Plugin\MinimumScoreFilter\Query; use Solarium\Plugin\MinimumScoreFilter\Result; use Solarium\QueryType\Select\Result\Document; -use Solarium\Tests\QueryType\Select\Result\AbstractResultTest; +use Solarium\Tests\QueryType\Select\Result\AbstractResultTestCase; -class ResultTest extends AbstractResultTest +class ResultTest extends AbstractResultTestCase { public function setUp(): void { diff --git a/tests/QueryType/Extract/ResultTest.php b/tests/QueryType/Extract/ResultTest.php index 955e55dc3..3b2f09692 100644 --- a/tests/QueryType/Extract/ResultTest.php +++ b/tests/QueryType/Extract/ResultTest.php @@ -4,9 +4,9 @@ use Solarium\QueryType\Extract\Query as ExtractQuery; use Solarium\QueryType\Extract\Result as ExtractResult; -use Solarium\Tests\QueryType\Update\AbstractResultTest; +use Solarium\Tests\QueryType\Update\AbstractResultTestCase; -class ResultTest extends AbstractResultTest +class ResultTest extends AbstractResultTestCase { public function setUp(): void { diff --git a/tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTest.php b/tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTestCase.php similarity index 98% rename from tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTest.php rename to tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTestCase.php index 581c892aa..ffe87ac34 100644 --- a/tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTest.php +++ b/tests/QueryType/Luke/Result/Schema/Field/AbstractFieldTestCase.php @@ -11,7 +11,7 @@ use Solarium\QueryType\Luke\Result\Schema\Field\WildcardField; use Solarium\QueryType\Luke\Result\Schema\Type\Type; -abstract class AbstractFieldTest extends TestCase +abstract class AbstractFieldTestCase extends TestCase { /** * @var AbstractField diff --git a/tests/QueryType/Luke/Result/Schema/Field/DynamicBasedFieldTest.php b/tests/QueryType/Luke/Result/Schema/Field/DynamicBasedFieldTest.php index 7eda716ab..fff53b26f 100644 --- a/tests/QueryType/Luke/Result/Schema/Field/DynamicBasedFieldTest.php +++ b/tests/QueryType/Luke/Result/Schema/Field/DynamicBasedFieldTest.php @@ -8,7 +8,7 @@ use Solarium\QueryType\Luke\Result\Schema\Field\DynamicField; use Solarium\QueryType\Luke\Result\Schema\Field\SchemaFieldInterface; -class DynamicBasedFieldTest extends AbstractFieldTest +class DynamicBasedFieldTest extends AbstractFieldTestCase { /** * @var DynamicBasedField diff --git a/tests/QueryType/Luke/Result/Schema/Field/DynamicFieldTest.php b/tests/QueryType/Luke/Result/Schema/Field/DynamicFieldTest.php index 22d30bd68..f3eb38b77 100644 --- a/tests/QueryType/Luke/Result/Schema/Field/DynamicFieldTest.php +++ b/tests/QueryType/Luke/Result/Schema/Field/DynamicFieldTest.php @@ -10,7 +10,7 @@ use Solarium\QueryType\Luke\Result\Schema\Field\SchemaFieldInterface; use Solarium\QueryType\Luke\Result\Schema\Type\Type; -class DynamicFieldTest extends AbstractFieldTest +class DynamicFieldTest extends AbstractFieldTestCase { /** * @var DynamicField diff --git a/tests/QueryType/Luke/Result/Schema/Field/FieldTest.php b/tests/QueryType/Luke/Result/Schema/Field/FieldTest.php index 3d44fae96..1266dde06 100644 --- a/tests/QueryType/Luke/Result/Schema/Field/FieldTest.php +++ b/tests/QueryType/Luke/Result/Schema/Field/FieldTest.php @@ -7,7 +7,7 @@ use Solarium\QueryType\Luke\Result\Schema\Field\Field; use Solarium\QueryType\Luke\Result\Schema\Field\SchemaFieldInterface; -class FieldTest extends AbstractFieldTest +class FieldTest extends AbstractFieldTestCase { /** * @var Field diff --git a/tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTest.php b/tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTestCase.php similarity index 96% rename from tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTest.php rename to tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTestCase.php index 3185eb829..d35d332e0 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/AbstractAnalyzerTestCase.php @@ -8,7 +8,7 @@ use Solarium\QueryType\Luke\Result\Schema\Type\Filter; use Solarium\QueryType\Luke\Result\Schema\Type\Tokenizer; -abstract class AbstractAnalyzerTest extends TestCase +abstract class AbstractAnalyzerTestCase extends TestCase { /** * @var AbstractAnalyzer diff --git a/tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTest.php b/tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTestCase.php similarity index 94% rename from tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTest.php rename to tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTestCase.php index 9ff7ad7e4..a864709d5 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/AbstractFilterTestCase.php @@ -5,7 +5,7 @@ use PHPUnit\Framework\TestCase; use Solarium\QueryType\Luke\Result\Schema\Type\AbstractFilter; -abstract class AbstractFilterTest extends TestCase +abstract class AbstractFilterTestCase extends TestCase { /** * @var AbstractFilter diff --git a/tests/QueryType/Luke/Result/Schema/Type/CharFilterTest.php b/tests/QueryType/Luke/Result/Schema/Type/CharFilterTest.php index 00f4b4b20..1283b409e 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/CharFilterTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/CharFilterTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Luke\Result\Schema\Type\CharFilter; -class CharFilterTest extends AbstractFilterTest +class CharFilterTest extends AbstractFilterTestCase { /** * @var CharFilter diff --git a/tests/QueryType/Luke/Result/Schema/Type/FilterTest.php b/tests/QueryType/Luke/Result/Schema/Type/FilterTest.php index 0ec71f9ee..a7e7f485a 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/FilterTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/FilterTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Luke\Result\Schema\Type\Filter; -class FilterTest extends AbstractFilterTest +class FilterTest extends AbstractFilterTestCase { /** * @var Filter diff --git a/tests/QueryType/Luke/Result/Schema/Type/IndexAnalyzerTest.php b/tests/QueryType/Luke/Result/Schema/Type/IndexAnalyzerTest.php index 0392e4ac7..b621fdbc8 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/IndexAnalyzerTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/IndexAnalyzerTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Luke\Result\Schema\Type\IndexAnalyzer; -class IndexAnalyzerTest extends AbstractAnalyzerTest +class IndexAnalyzerTest extends AbstractAnalyzerTestCase { /** * @var IndexAnalyzer diff --git a/tests/QueryType/Luke/Result/Schema/Type/QueryAnalyzerTest.php b/tests/QueryType/Luke/Result/Schema/Type/QueryAnalyzerTest.php index c04de6f5c..61dc5d631 100644 --- a/tests/QueryType/Luke/Result/Schema/Type/QueryAnalyzerTest.php +++ b/tests/QueryType/Luke/Result/Schema/Type/QueryAnalyzerTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Luke\Result\Schema\Type\QueryAnalyzer; -class QueryAnalyzerTest extends AbstractAnalyzerTest +class QueryAnalyzerTest extends AbstractAnalyzerTestCase { /** * @var QueryAnalyzer diff --git a/tests/QueryType/Select/Query/AbstractQueryTest.php b/tests/QueryType/Select/Query/AbstractQueryTestCase.php similarity index 99% rename from tests/QueryType/Select/Query/AbstractQueryTest.php rename to tests/QueryType/Select/Query/AbstractQueryTestCase.php index 887a698be..45cce53ee 100644 --- a/tests/QueryType/Select/Query/AbstractQueryTest.php +++ b/tests/QueryType/Select/Query/AbstractQueryTestCase.php @@ -11,7 +11,7 @@ use Solarium\QueryType\Select\Query\FilterQuery; use Solarium\QueryType\Select\Query\Query; -abstract class AbstractQueryTest extends TestCase +abstract class AbstractQueryTestCase extends TestCase { /** * @var Query diff --git a/tests/QueryType/Select/Query/QueryTest.php b/tests/QueryType/Select/Query/QueryTest.php index 9356ddbb2..e515b5334 100644 --- a/tests/QueryType/Select/Query/QueryTest.php +++ b/tests/QueryType/Select/Query/QueryTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Select\Query\Query; -class QueryTest extends AbstractQueryTest +class QueryTest extends AbstractQueryTestCase { public function setUp(): void { diff --git a/tests/QueryType/Select/Result/AbstractDocumentTest.php b/tests/QueryType/Select/Result/AbstractDocumentTestCase.php similarity index 97% rename from tests/QueryType/Select/Result/AbstractDocumentTest.php rename to tests/QueryType/Select/Result/AbstractDocumentTestCase.php index 373f9390e..82c444ec0 100644 --- a/tests/QueryType/Select/Result/AbstractDocumentTest.php +++ b/tests/QueryType/Select/Result/AbstractDocumentTestCase.php @@ -6,7 +6,7 @@ use Solarium\Exception\RuntimeException; use Solarium\QueryType\Select\Result\Document; -abstract class AbstractDocumentTest extends TestCase +abstract class AbstractDocumentTestCase extends TestCase { /** * @var Document diff --git a/tests/QueryType/Select/Result/AbstractResultTest.php b/tests/QueryType/Select/Result/AbstractResultTestCase.php similarity index 99% rename from tests/QueryType/Select/Result/AbstractResultTest.php rename to tests/QueryType/Select/Result/AbstractResultTestCase.php index b3c1d6bdb..a8ba46091 100644 --- a/tests/QueryType/Select/Result/AbstractResultTest.php +++ b/tests/QueryType/Select/Result/AbstractResultTestCase.php @@ -7,7 +7,7 @@ use Solarium\QueryType\Select\Result\Document; use Solarium\QueryType\Select\Result\Result; -abstract class AbstractResultTest extends TestCase +abstract class AbstractResultTestCase extends TestCase { /** * @var SelectDummy diff --git a/tests/QueryType/Select/Result/DocumentTest.php b/tests/QueryType/Select/Result/DocumentTest.php index eb6028b2d..bb5fe62ce 100644 --- a/tests/QueryType/Select/Result/DocumentTest.php +++ b/tests/QueryType/Select/Result/DocumentTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Select\Result\Document; -class DocumentTest extends AbstractDocumentTest +class DocumentTest extends AbstractDocumentTestCase { public function setUp(): void { diff --git a/tests/QueryType/Select/Result/ResultTest.php b/tests/QueryType/Select/Result/ResultTest.php index e4e29e1b5..4c1bc2d7c 100644 --- a/tests/QueryType/Select/Result/ResultTest.php +++ b/tests/QueryType/Select/Result/ResultTest.php @@ -2,6 +2,6 @@ namespace Solarium\Tests\QueryType\Select\Result; -class ResultTest extends AbstractResultTest +class ResultTest extends AbstractResultTestCase { } diff --git a/tests/QueryType/Update/AbstractResultTest.php b/tests/QueryType/Update/AbstractResultTestCase.php similarity index 87% rename from tests/QueryType/Update/AbstractResultTest.php rename to tests/QueryType/Update/AbstractResultTestCase.php index 7a493b606..6d76d4693 100644 --- a/tests/QueryType/Update/AbstractResultTest.php +++ b/tests/QueryType/Update/AbstractResultTestCase.php @@ -4,7 +4,7 @@ use PHPUnit\Framework\TestCase; -abstract class AbstractResultTest extends TestCase +abstract class AbstractResultTestCase extends TestCase { protected $result; diff --git a/tests/QueryType/Update/ResultTest.php b/tests/QueryType/Update/ResultTest.php index 39fa6735f..0b55e5f45 100644 --- a/tests/QueryType/Update/ResultTest.php +++ b/tests/QueryType/Update/ResultTest.php @@ -4,7 +4,7 @@ use Solarium\QueryType\Update\Result as UpdateResult; -class ResultTest extends AbstractResultTest +class ResultTest extends AbstractResultTestCase { public function setUp(): void {