Browse Source

Remove redundant Fixture from strategy names

Corey Taylor 4 years ago
parent
commit
dca117a59f

+ 2 - 2
src/TestSuite/Fixture/TransactionFixtureStrategy.php

@@ -25,7 +25,7 @@ use RuntimeException;
  *
  * Any test that calls Connection::rollback(true) will break this strategy.
  */
-class TransactionFixtureStrategy implements FixtureStrategyInterface
+class TransactionStrategy implements FixtureStrategyInterface
 {
     /**
      * @var \Cake\TestSuite\Fixture\FixtureHelper
@@ -64,7 +64,7 @@ class TransactionFixtureStrategy implements FixtureStrategyInterface
                     throw new RuntimeException(
                         "Could not enable save points for the `{$connection->configName()}` connection. " .
                             'Your database needs to support savepoints in order to use ' .
-                            'TransactionFixtureStrategy.'
+                            'TransactionStrategy.'
                     );
                 }
 

+ 1 - 1
src/TestSuite/Fixture/TruncateFixtureStrategy.php

@@ -19,7 +19,7 @@ namespace Cake\TestSuite\Fixture;
 /**
  * Fixture strategy that truncates all fixture ables at the end of test.
  */
-class TruncateFixtureStrategy implements FixtureStrategyInterface
+class TruncateStrategy implements FixtureStrategyInterface
 {
     /**
      * @var \Cake\TestSuite\Fixture\FixtureHelper

+ 2 - 2
src/TestSuite/TestCase.php

@@ -28,7 +28,7 @@ use Cake\Routing\Router;
 use Cake\TestSuite\Constraint\EventFired;
 use Cake\TestSuite\Constraint\EventFiredWith;
 use Cake\TestSuite\Fixture\FixtureStrategyInterface;
-use Cake\TestSuite\Fixture\TruncateFixtureStrategy;
+use Cake\TestSuite\Fixture\TruncateStrategy;
 use Cake\Utility\Inflector;
 use LogicException;
 use PHPUnit\Framework\Constraint\DirectoryExists;
@@ -297,7 +297,7 @@ abstract class TestCase extends BaseTestCase
      */
     protected function getFixtureStrategy(): FixtureStrategyInterface
     {
-        return new TruncateFixtureStrategy();
+        return new TruncateStrategy();
     }
 
     /**

+ 3 - 3
tests/TestCase/TestSuite/Fixture/TruncateFixtureStrategyTest.php

@@ -17,10 +17,10 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\Datasource\ConnectionManager;
-use Cake\TestSuite\Fixture\TruncateFixtureStrategy;
+use Cake\TestSuite\Fixture\TransactionStrategy;
 use Cake\TestSuite\TestCase;
 
-class TruncateFixtureStrategyTest extends TestCase
+class TransactionStrategyTest extends TestCase
 {
     protected $fixtures = ['core.Articles'];
 
@@ -38,7 +38,7 @@ class TruncateFixtureStrategyTest extends TestCase
         $this->assertEmpty($rows->fetchAll());
         $rows->closeCursor();
 
-        $strategy = new TruncateFixtureStrategy();
+        $strategy = new TransactionStrategy();
         $strategy->setupTest(['core.Articles']);
         $rows = $connection->newQuery()->select('*')->from('articles')->execute();
         $this->assertNotEmpty($rows->fetchAll());

+ 3 - 3
tests/TestCase/TestSuite/Fixture/TransactionFixtureStrategyTest.php

@@ -17,10 +17,10 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\Datasource\ConnectionManager;
-use Cake\TestSuite\Fixture\TransactionFixtureStrategy;
+use Cake\TestSuite\Fixture\TruncateStrategy;
 use Cake\TestSuite\TestCase;
 
-class TransactionFixtureStrategyTest extends TestCase
+class TruncateStrategyTest extends TestCase
 {
     protected $fixtures = ['core.Articles'];
 
@@ -38,7 +38,7 @@ class TransactionFixtureStrategyTest extends TestCase
         $this->assertEmpty($rows->fetchAll());
         $rows->closeCursor();
 
-        $strategy = new TransactionFixtureStrategy();
+        $strategy = new TruncateStrategy();
         $strategy->setupTest(['core.Articles']);
         $rows = $connection->newQuery()->select('*')->from('articles')->execute();
         $this->assertNotEmpty($rows->fetchAll());