Migrate from PHPUnit annotations to native attributes

This commit is contained in:
Alejandro Celaya
2023-02-09 20:42:18 +01:00
parent 650a286982
commit 04bbd471ff
188 changed files with 776 additions and 1082 deletions

View File

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\Core\Visit\Geolocation;
use Doctrine\ORM\EntityManager;
use Exception;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
@@ -38,10 +40,7 @@ class VisitLocatorTest extends TestCase
$this->visitService = new VisitLocator($this->em, $this->repo);
}
/**
* @test
* @dataProvider provideMethodNames
*/
#[Test, DataProvider('provideMethodNames')]
public function locateVisitsIteratesAndLocatesExpectedVisits(
string $serviceMethodName,
string $expectedRepoMethodName,
@@ -79,10 +78,7 @@ class VisitLocatorTest extends TestCase
yield 'locateAllVisits' => ['locateAllVisits', 'findAllVisits'];
}
/**
* @test
* @dataProvider provideIsNonLocatableAddress
*/
#[Test, DataProvider('provideIsNonLocatableAddress')]
public function visitsWhichCannotBeLocatedAreIgnoredOrLocatedAsEmpty(
string $serviceMethodName,
string $expectedRepoMethodName,

View File

@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace ShlinkioTest\Shlink\Core\Visit\Geolocation;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Common\Util\IpAddress;
@@ -25,10 +27,7 @@ class VisitToLocationHelperTest extends TestCase
$this->helper = new VisitToLocationHelper($this->ipLocationResolver);
}
/**
* @test
* @dataProvider provideNonLocatableVisits
*/
#[Test, DataProvider('provideNonLocatableVisits')]
public function throwsExpectedErrorForNonLocatableVisit(
Visit $visit,
IpCannotBeLocatedException $expectedException,
@@ -48,7 +47,7 @@ class VisitToLocationHelperTest extends TestCase
];
}
/** @test */
#[Test]
public function throwsGenericErrorWhenResolvingIpFails(): void
{
$e = new WrongIpException('');