From 6f44c555cd9fa3021753e2a257dc4c0e4119f68d Mon Sep 17 00:00:00 2001 From: UndefinedOffset Date: Wed, 16 Feb 2022 16:23:08 -0400 Subject: [PATCH] Renamed tests to have simpler cleaner names --- ...ldSortableRowsAutoSortTest.php => AutoSortTest.php} | 7 ++----- ...ldSortableRowsAutoSortTest.yml => AutoSortTest.yml} | 0 ...{GridFieldSortableRowsTest.php => OrderingTest.php} | 8 ++++---- ...{GridFieldSortableRowsTest.yml => OrderingTest.yml} | 4 ++-- .../PHPUnit/Forms/{RowsTest => OrderingTest}/Team.php | 4 ++-- .../PHPUnit/Forms/{RowsTest => OrderingTest}/VTeam.php | 4 ++-- ...eldSortableRowsPageTest.php => PageSortingTest.php} | 10 +++++----- ...eldSortableRowsPageTest.yml => PageSortingTest.yml} | 4 ++-- .../Forms/{RowsPageTest => PageSortingTest}/Team.php | 4 ++-- .../Forms/{RowsPageTest => PageSortingTest}/VTeam.php | 4 ++-- 10 files changed, 23 insertions(+), 26 deletions(-) rename tests/PHPUnit/Forms/{GridFieldSortableRowsAutoSortTest.php => AutoSortTest.php} (98%) rename tests/PHPUnit/Forms/{GridFieldSortableRowsAutoSortTest.yml => AutoSortTest.yml} (100%) rename tests/PHPUnit/Forms/{GridFieldSortableRowsTest.php => OrderingTest.php} (95%) rename tests/PHPUnit/Forms/{GridFieldSortableRowsTest.yml => OrderingTest.yml} (74%) rename tests/PHPUnit/Forms/{RowsTest => OrderingTest}/Team.php (75%) rename tests/PHPUnit/Forms/{RowsTest => OrderingTest}/VTeam.php (79%) rename tests/PHPUnit/Forms/{GridFieldSortableRowsPageTest.php => PageSortingTest.php} (96%) rename tests/PHPUnit/Forms/{GridFieldSortableRowsPageTest.yml => PageSortingTest.yml} (89%) rename tests/PHPUnit/Forms/{RowsPageTest => PageSortingTest}/Team.php (75%) rename tests/PHPUnit/Forms/{RowsPageTest => PageSortingTest}/VTeam.php (78%) diff --git a/tests/PHPUnit/Forms/GridFieldSortableRowsAutoSortTest.php b/tests/PHPUnit/Forms/AutoSortTest.php similarity index 98% rename from tests/PHPUnit/Forms/GridFieldSortableRowsAutoSortTest.php rename to tests/PHPUnit/Forms/AutoSortTest.php index 4a6afab..af0e211 100644 --- a/tests/PHPUnit/Forms/GridFieldSortableRowsAutoSortTest.php +++ b/tests/PHPUnit/Forms/AutoSortTest.php @@ -19,13 +19,10 @@ use UndefinedOffset\SortableGridField\Tests\Forms\AutoSortTest\Player; use UndefinedOffset\SortableGridField\Tests\Forms\AutoSortTest\TestParent; use UndefinedOffset\SortableGridField\Tests\Forms\AutoSortTest\VPlayer; -/** - * Class \UndefinedOffset\SortableGridField\Tests\GridFieldSortableRowsAutoSortTest - */ -class GridFieldSortableRowsAutoSortTest extends SapphireTest +class AutoSortTest extends SapphireTest { /** @var string */ - public static $fixture_file = 'GridFieldSortableRowsAutoSortTest.yml'; + public static $fixture_file = 'AutoSortTest.yml'; /** @var array */ protected static $extra_dataobjects = [ diff --git a/tests/PHPUnit/Forms/GridFieldSortableRowsAutoSortTest.yml b/tests/PHPUnit/Forms/AutoSortTest.yml similarity index 100% rename from tests/PHPUnit/Forms/GridFieldSortableRowsAutoSortTest.yml rename to tests/PHPUnit/Forms/AutoSortTest.yml diff --git a/tests/PHPUnit/Forms/GridFieldSortableRowsTest.php b/tests/PHPUnit/Forms/OrderingTest.php similarity index 95% rename from tests/PHPUnit/Forms/GridFieldSortableRowsTest.php rename to tests/PHPUnit/Forms/OrderingTest.php index fbd4ada..4d54002 100644 --- a/tests/PHPUnit/Forms/GridFieldSortableRowsTest.php +++ b/tests/PHPUnit/Forms/OrderingTest.php @@ -13,10 +13,10 @@ use SilverStripe\Security\Member; use SilverStripe\Versioned\Versioned; use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows; use UndefinedOffset\SortableGridField\Tests\Forms\AutoSortTest\DummyController; -use UndefinedOffset\SortableGridField\Tests\Forms\RowsTest\Team; -use UndefinedOffset\SortableGridField\Tests\Forms\RowsTest\VTeam; +use UndefinedOffset\SortableGridField\Tests\Forms\OrderingTest\Team; +use UndefinedOffset\SortableGridField\Tests\Forms\OrderingTest\VTeam; -class GridFieldSortableRowsTest extends SapphireTest +class OrderingTest extends SapphireTest { /** @var ArrayList */ protected $list; @@ -28,7 +28,7 @@ class GridFieldSortableRowsTest extends SapphireTest protected $form; /** @var string */ - public static $fixture_file = 'GridFieldSortableRowsTest.yml'; + public static $fixture_file = 'OrderingTest.yml'; /** @var array */ protected static $extra_dataobjects = [ diff --git a/tests/PHPUnit/Forms/GridFieldSortableRowsTest.yml b/tests/PHPUnit/Forms/OrderingTest.yml similarity index 74% rename from tests/PHPUnit/Forms/GridFieldSortableRowsTest.yml rename to tests/PHPUnit/Forms/OrderingTest.yml index 0f976c2..622b647 100644 --- a/tests/PHPUnit/Forms/GridFieldSortableRowsTest.yml +++ b/tests/PHPUnit/Forms/OrderingTest.yml @@ -1,4 +1,4 @@ -UndefinedOffset\SortableGridField\Tests\Forms\RowsTest\Team: +UndefinedOffset\SortableGridField\Tests\Forms\OrderingTest\Team: team1: Name: Team 1 City: Cologne @@ -12,7 +12,7 @@ UndefinedOffset\SortableGridField\Tests\Forms\RowsTest\Team: City: Auckland SortOrder: 3 -UndefinedOffset\SortableGridField\Tests\Forms\RowsTest\VTeam: +UndefinedOffset\SortableGridField\Tests\Forms\OrderingTest\VTeam: team1: Name: Team 1 City: Cologne diff --git a/tests/PHPUnit/Forms/RowsTest/Team.php b/tests/PHPUnit/Forms/OrderingTest/Team.php similarity index 75% rename from tests/PHPUnit/Forms/RowsTest/Team.php rename to tests/PHPUnit/Forms/OrderingTest/Team.php index 3a0a95a..2ec0456 100644 --- a/tests/PHPUnit/Forms/RowsTest/Team.php +++ b/tests/PHPUnit/Forms/OrderingTest/Team.php @@ -1,11 +1,11 @@