Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix phpunit deprecations and use ::class constant #1346

Merged
merged 3 commits into from Dec 15, 2017
Merged

fix phpunit deprecations and use ::class constant #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f54f24c
fix phpunit deprecations and use ::class constant
Tobion Dec 14, 2017
3bf4009
allow phpunit 6
Tobion Dec 14, 2017
bc3aa96
hide risky tests
Tobion Dec 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 18 additions & 37 deletions Tests/Command/CreateCommandTest.php
View file
Open in desktop
Expand Up @@ -18,11 +18,14 @@
use FOS\ElasticaBundle\Index\AliasProcessor;
use FOS\ElasticaBundle\Index\IndexManager;
use FOS\ElasticaBundle\Index\MappingBuilder;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

/**
* @author Oleg Andreyev <oleg.andreyev@intexsys.lv>
*/
class CreateCommandTest extends \PHPUnit_Framework_TestCase
class CreateCommandTest extends TestCase
{
/**
* @var IndexManager|\PHPUnit_Framework_MockObject_MockObject
Expand Down Expand Up @@ -50,35 +53,23 @@ class CreateCommandTest extends \PHPUnit_Framework_TestCase
private $command;

/**
* @var IndexConfig
* @var IndexConfig|\PHPUnit_Framework_MockObject_MockObject
*/
private $indexConfig;

/**
* @var Index
* @var Index|\PHPUnit_Framework_MockObject_MockObject
*/
private $index;

protected function setUp()
{
$this->indexManager = $this->getMockBuilder('\FOS\ElasticaBundle\Index\IndexManager')
->disableOriginalConstructor()
->getMock();
$this->mappingBuilder = $this->getMockBuilder('FOS\ElasticaBundle\Index\MappingBuilder')
->disableOriginalConstructor()
->getMock();
$this->configManager = $this->getMockBuilder('FOS\ElasticaBundle\Configuration\ConfigManager')
->disableOriginalConstructor()
->getMock();
$this->aliasProcessor = $this->getMockBuilder('FOS\ElasticaBundle\Index\AliasProcessor')
->disableOriginalConstructor()
->getMock();
$this->indexConfig = $this->getMockBuilder('\FOS\ElasticaBundle\Configuration\IndexConfig')
->disableOriginalConstructor()
->getMock();
$this->index = $this->getMockBuilder('\FOS\ElasticaBundle\Elastica\Index')
->disableOriginalConstructor()
->getMock();
$this->indexManager = $this->createMock(IndexManager::class);
$this->mappingBuilder = $this->createMock(MappingBuilder::class);
$this->configManager = $this->createMock(ConfigManager::class);
$this->aliasProcessor = $this->createMock(AliasProcessor::class);
$this->indexConfig = $this->createMock(IndexConfig::class);
$this->index = $this->createMock(Index::class);

$this->command = new CreateCommand(
$this->indexManager,
Expand All @@ -88,15 +79,10 @@ protected function setUp()
);
}

/**
* Test execute with index provided and with alias.
*
* @return void
*/
public function testExecuteWithIndexProvidedAndWithAlias()
{
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
$input = $this->createMock(InputInterface::class);
$output = $this->createMock(OutputInterface::class);

$indexName = 'foo';
$mapping = ['mapping'];
Expand All @@ -113,15 +99,10 @@ public function testExecuteWithIndexProvidedAndWithAlias()
$this->command->run($input, $output);
}

/**
* Test execute with index provided and without alias.
*
* @return void
*/
public function testExecuteWithIndexProvidedAndWithoutAlias()
{
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
$input = $this->createMock(InputInterface::class);
$output = $this->createMock(OutputInterface::class);

$indexName = 'foo';
$mapping = ['mapping'];
Expand All @@ -140,8 +121,8 @@ public function testExecuteWithIndexProvidedAndWithoutAlias()

public function testExecuteAllIndices()
{
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
$input = $this->createMock(InputInterface::class);
$output = $this->createMock(OutputInterface::class);
$indexConfig1 = clone $this->indexConfig;
$indexConfig2 = clone $this->indexConfig;
$index1 = clone $this->index;
Expand Down
14 changes: 4 additions & 10 deletions Tests/Command/ResetCommandTest.php
View file
Open in desktop
Expand Up @@ -14,10 +14,11 @@
use FOS\ElasticaBundle\Command\ResetCommand;
use FOS\ElasticaBundle\Index\IndexManager;
use FOS\ElasticaBundle\Index\Resetter;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;

class ResetCommandTest extends \PHPUnit_Framework_TestCase
class ResetCommandTest extends TestCase
{
/**
* @var ResetCommand
Expand All @@ -36,15 +37,8 @@ class ResetCommandTest extends \PHPUnit_Framework_TestCase

protected function setUp()
{
$this->resetter = $this->getMockBuilder(Resetter::class)
->disableOriginalConstructor()
->setMethods(['resetIndex', 'resetIndexType'])
->getMock();

$this->indexManager = $this->getMockBuilder(IndexManager::class)
->disableOriginalConstructor()
->setMethods(['getAllIndexes'])
->getMock();
$this->resetter = $this->createMock(Resetter::class);
$this->indexManager = $this->createMock(IndexManager::class);

$this->command = new ResetCommand($this->indexManager, $this->resetter);
}
Expand Down
65 changes: 25 additions & 40 deletions Tests/DataCollector/ElasticaDataCollectorTest.php
View file
Open in desktop
Expand Up @@ -12,28 +12,26 @@
namespace FOS\ElasticaBundle\Tests\DataCollector;

use FOS\ElasticaBundle\DataCollector\ElasticaDataCollector;
use FOS\ElasticaBundle\Logger\ElasticaLogger;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;

/**
* @author Richard Miller <info@limethinking.co.uk>
*/
class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
class ElasticaDataCollectorTest extends TestCase
{
public function testCorrectAmountOfQueries()
{
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
->disableOriginalConstructor()
->getMock();
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
$requestMock = $this->createMock(Request::class);

/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
->disableOriginalConstructor()
->getMock();
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
$responseMock = $this->createMock(Response::class);

/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
->disableOriginalConstructor()
->getMock();
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
$loggerMock = $this->createMock(ElasticaLogger::class);

$totalQueries = rand();

Expand All @@ -48,20 +46,14 @@ public function testCorrectAmountOfQueries()

public function testCorrectQueriesReturned()
{
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
->disableOriginalConstructor()
->getMock();
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
$requestMock = $this->createMock(Request::class);

/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
->disableOriginalConstructor()
->getMock();
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
$responseMock = $this->createMock(Response::class);

/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
->disableOriginalConstructor()
->getMock();
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
$loggerMock = $this->createMock(ElasticaLogger::class);

$queries = ['testQueries'];

Expand All @@ -76,20 +68,14 @@ public function testCorrectQueriesReturned()

public function testCorrectQueriesTime()
{
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
->disableOriginalConstructor()
->getMock();
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
$requestMock = $this->createMock(Request::class);

/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
->disableOriginalConstructor()
->getMock();
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
$responseMock = $this->createMock(Response::class);

/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
->disableOriginalConstructor()
->getMock();
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
$loggerMock = $this->createMock(ElasticaLogger::class);

$queries = [[
'engineMS' => 15,
Expand All @@ -110,9 +96,8 @@ public function testCorrectQueriesTime()

public function testName()
{
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
->disableOriginalConstructor()
->getMock();
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
$loggerMock = $this->createMock(ElasticaLogger::class);

$elasticaDataCollector = new ElasticaDataCollector($loggerMock);

Expand Down
12 changes: 8 additions & 4 deletions Tests/DependencyInjection/Compiler/RegisterPagerPersistersPassTest.php
View file
Open in desktop
Expand Up @@ -5,11 +5,12 @@
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPagerPersistersPass;
use FOS\ElasticaBundle\Persister\PagerPersisterInterface;
use FOS\ElasticaBundle\Persister\PagerPersisterRegistry;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class RegisterPagerPersistersPassTest extends \PHPUnit_Framework_TestCase
class RegisterPagerPersistersPassTest extends TestCase
{
public function testShouldImplementCompilerPassInterface()
{
Expand Down Expand Up @@ -65,7 +66,8 @@ public function testThrowsIfTagMissesPersisterNameAttribute()

$container->setDefinition('a_persister', $this->createPagerPersisterDefinition([]));

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica pager persister "a_persister" must specify the "persisterName" attribute.');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica pager persister "a_persister" must specify the "persisterName" attribute.');

$pass->process($container);
}
Expand All @@ -80,7 +82,8 @@ public function testThrowsIfPersisterForSuchNameHasBeenAlreadyRegistered()
$container->setDefinition('a_foo_persister', $this->createPagerPersisterDefinition(['persisterName' => 'foo']));
$container->setDefinition('a_bar_persister', $this->createPagerPersisterDefinition(['persisterName' => 'foo']));

$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register pager persister "a_bar_persister". The pager persister "a_foo_persister" has been registered for same name "foo"');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Cannot register pager persister "a_bar_persister". The pager persister "a_foo_persister" has been registered for same name "foo"');

$pass->process($container);
}
Expand All @@ -97,7 +100,8 @@ public function testThrowsIfPagerPersisterServiceDoesNotImplementPagerPersisterI

$container->setDefinition('a_foo_persister', $persister);

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica pager persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\PagerPersisterInterface".');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica pager persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\PagerPersisterInterface".');

$pass->process($container);
}
Expand Down
12 changes: 8 additions & 4 deletions Tests/DependencyInjection/Compiler/RegisterPagerProvidersPassTest.php
View file
Open in desktop
Expand Up @@ -5,11 +5,12 @@
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPagerProvidersPass;
use FOS\ElasticaBundle\Provider\PagerProviderInterface;
use FOS\ElasticaBundle\Provider\PagerProviderRegistry;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class RegisterPagerProvidersPassTest extends \PHPUnit_Framework_TestCase
class RegisterPagerProvidersPassTest extends TestCase
{
public function testShouldImplementCompilerPassInterface()
{
Expand Down Expand Up @@ -73,7 +74,8 @@ public function testThrowsIfTagMissesTypeAttribute()

$container->setDefinition('a_provider', $this->createProviderDefinition([]));

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica provider "a_provider" must specify the "type" attribute.');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica provider "a_provider" must specify the "type" attribute.');

$pass->process($container);
}
Expand All @@ -89,7 +91,8 @@ public function testThrowsIfProviderForSuchIndexTypeHasBeenAlreadyRegistered()
$container->setDefinition('a_foo_provider', $this->createProviderDefinition(['index' => 'foo', 'type' => 'bar']));
$container->setDefinition('a_bar_provider', $this->createProviderDefinition(['index' => 'foo', 'type' => 'bar']));

$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register provider "a_bar_provider". The provider "a_foo_provider" has been registered for same index "foo" and type "bar"');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Cannot register provider "a_bar_provider". The provider "a_foo_provider" has been registered for same index "foo" and type "bar"');
$pass->process($container);
}

Expand All @@ -106,7 +109,8 @@ public function testThrowsIfProviderServiceDoesNotImplementPagerProviderInterfac

$container->setDefinition('a_foo_provider', $provider);

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica provider "a_foo_provider" with class "stdClass" must implement "FOS\ElasticaBundle\Provider\PagerProviderInterface".');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica provider "a_foo_provider" with class "stdClass" must implement "FOS\ElasticaBundle\Provider\PagerProviderInterface".');

$pass->process($container);
}
Expand Down
12 changes: 8 additions & 4 deletions Tests/DependencyInjection/Compiler/RegisterPersistersPassTest.php
View file
Open in desktop
Expand Up @@ -5,11 +5,12 @@
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPersistersPass;
use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
use FOS\ElasticaBundle\Persister\PersisterRegistry;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class RegisterPersistersPassTest extends \PHPUnit_Framework_TestCase
class RegisterPersistersPassTest extends TestCase
{
public function testShouldImplementCompilerPassInterface()
{
Expand Down Expand Up @@ -73,7 +74,8 @@ public function testThrowsIfTagMissesTypeAttribute()

$container->setDefinition('a_persister', $this->createPersisterDefinition([]));

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica persister "a_persister" must specify the "type" attribute.');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica persister "a_persister" must specify the "type" attribute.');

$pass->process($container);
}
Expand All @@ -89,7 +91,8 @@ public function testThrowsIfPersisterForSuchIndexTypeHasBeenAlreadyRegistered()
$container->setDefinition('a_foo_persister', $this->createPersisterDefinition(['index' => 'foo', 'type' => 'bar']));
$container->setDefinition('a_bar_persister', $this->createPersisterDefinition(['index' => 'foo', 'type' => 'bar']));

$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register persister "a_bar_persister". The persister "a_foo_persister" has been registered for same index "foo" and type "bar"');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Cannot register persister "a_bar_persister". The persister "a_foo_persister" has been registered for same index "foo" and type "bar"');

$pass->process($container);
}
Expand All @@ -107,7 +110,8 @@ public function testThrowsIfPersisterServiceDoesNotImplementObjectPersisterInter

$container->setDefinition('a_foo_persister', $persister);

$this->setExpectedException(\InvalidArgumentException::class, 'Elastica persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\ObjectPersisterInterface".');
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Elastica persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\ObjectPersisterInterface".');

$pass->process($container);
}
Expand Down
8 changes: 3 additions & 5 deletions Tests/DependencyInjection/ConfigurationTest.php
View file
Open in desktop
Expand Up @@ -12,19 +12,17 @@
namespace FOS\ElasticaBundle\Tests\Resetter\DependencyInjection;

use FOS\ElasticaBundle\DependencyInjection\Configuration;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\Definition\Processor;

/**
* ConfigurationTest.
*/
class ConfigurationTest extends \PHPUnit_Framework_TestCase
class ConfigurationTest extends TestCase
{
/**
* @var Processor
*/
private $processor;

public function setUp()
protected function setUp()
{
$this->processor = new Processor();
}
Expand Down