Tests base classes refactoring

julien-boudry · May 24, 2024 · c1f5df9 · c1f5df9
1 parent dfef268
commit c1f5df9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/tests/AlgoTestCase.php b/tests/AlgoTestCase.php
@@ -5,9 +5,8 @@
 namespace Tests;
 
 use CondorcetPHP\Condorcet\Tools\Converters\{DavidHillFormat, DebianFormat};
-use PHPUnit\Framework\TestCase as BaseTestCase;
 
-abstract class AlgoTestCase extends BaseTestCase
+abstract class AlgoTestCase extends CondorcetTestCase
 {
     public static DavidHillFormat $tidemanA77;
     public static DebianFormat $debian2020;

diff --git a/tests/CondorcetTestCase.php b/tests/CondorcetTestCase.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests;
+
+use CondorcetPHP\Condorcet\Election;
+use PHPUnit\Framework\TestCase;
+
+abstract class CondorcetTestCase extends TestCase
+{
+    public Election $election;
+}
diff --git a/tests/DriversTestCase.php b/tests/DriversTestCase.php
@@ -6,10 +6,9 @@
 
 use CondorcetPHP\Condorcet\Election;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
-use PHPUnit\Framework\TestCase;
 
 #[RequiresPhpExtension('pdo_sqlite')]
-class DriversTestCase extends TestCase
+class DriversTestCase extends CondorcetTestCase
 {
     protected function hashVotesList(Election $elec): string
     {

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -15,6 +15,7 @@
 |
 */
 
+uses(Tests\CondorcetTestCase::class);
 uses(Tests\AlgoTestCase::class)->in('src/Algo');
 
 /*

diff --git a/tests/src/Tools/Randomizers/ArrayRandomizerTest.php b/tests/src/Tools/Randomizers/ArrayRandomizerTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace CondorcetPHP\Condorcet\Tests;
+namespace CondorcetPHP\Condorcet\Tests\src\Tools\Randomizers;
 
 use CondorcetPHP\Condorcet\Tools\Randomizers\ArrayRandomizer;
-use PHPUnit\Framework\TestCase;
+use Tests\CondorcetTestCase;
 
-class ArrayRandomizerTest extends TestCase
+class ArrayRandomizerTest extends CondorcetTestCase
 {
     public const SEED = 'CondorcetSeed';
 

diff --git a/tests/src/Tools/Randomizers/VoteRandomizerTest.php b/tests/src/Tools/Randomizers/VoteRandomizerTest.php
@@ -1,7 +1,8 @@
 <?php
 
 declare(strict_types=1);
-use CondorcetPHP\Condorcet\Tests\ArrayRandomizerTest;
+
+use CondorcetPHP\Condorcet\Tests\src\Tools\Randomizers\ArrayRandomizerTest;
 use CondorcetPHP\Condorcet\Tools\Randomizers\{ArrayRandomizer, VoteRandomizer};
 use CondorcetPHP\Condorcet\Utils\CondorcetUtil;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     |
     */
+    uses(Tests\CondorcetTestCase::class);
     uses(Tests\AlgoTestCase::class)->in('src/Algo');
     /*
@@ Expand Down @@