From 6cfc1b7338fa877e1b589bca5b0ca7d552771e2c Mon Sep 17 00:00:00 2001
From: UndefinedOffset <echipman@webbuildersgroup.com>
Date: Thu, 1 Mar 2018 10:52:12 -0400
Subject: [PATCH] Fixed test failures related to legacy code in the test
 objects

---
 .../forms/GridFieldSortableRowsAutoSortTest.php  | 16 +++++++++-------
 tests/forms/GridFieldSortableRowsPageTest.php    | 14 ++++++++------
 tests/forms/GridFieldSortableRowsTest.php        | 14 ++++++++------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/tests/forms/GridFieldSortableRowsAutoSortTest.php b/tests/forms/GridFieldSortableRowsAutoSortTest.php
index d2ac3a9..cf45728 100644
--- a/tests/forms/GridFieldSortableRowsAutoSortTest.php
+++ b/tests/forms/GridFieldSortableRowsAutoSortTest.php
@@ -15,6 +15,8 @@ use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\Security\Member;
 use SilverStripe\Versioned\Versioned;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
@@ -280,8 +282,8 @@ class GridFieldAction_SortOrder_Player extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_SortOrder_Player';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar::class,
+        'SortOrder' => DBInt::class
     );
 
     private static $default_sort = 'SortOrder';
@@ -299,8 +301,8 @@ class GridFieldAction_SortOrder_VPlayer extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_SortOrder_VPlayer';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar:class,
+        'SortOrder' => DBInt::class
     );
 
     private static $default_sort = 'SortOrder';
@@ -322,7 +324,7 @@ class GridFieldAction_SortOrder_TestParent extends DataObject implements TestOnl
     private static $table_name = 'GridFieldAction_SortOrder_TestParent';
 
     private static $db = array(
-        'Name' => 'Varchar'
+        'Name' => DBVarchar::class
     );
 
     private static $has_many = array(
@@ -341,7 +343,7 @@ class GridFieldAction_SortOrder_BaseObject extends DataObject implements TestOnl
     private static $table_name = 'GridFieldAction_SortOrder_BaseObject';
 
     private static $db = array(
-        'Name' => 'Varchar'
+        'Name' => DBVarchar::class
     );
 }
 
@@ -357,7 +359,7 @@ class GridFieldAction_SortOrder_ChildObject extends GridFieldAction_SortOrder_Ba
     private static $table_name = 'GridFieldAction_SortOrder_ChildObject';
 
     private static $db = array(
-        'SortOrder' => 'Int'
+        'SortOrder' => DBInt::class
     );
 
     private static $has_one = array(
diff --git a/tests/forms/GridFieldSortableRowsPageTest.php b/tests/forms/GridFieldSortableRowsPageTest.php
index d5a6175..58cec2f 100644
--- a/tests/forms/GridFieldSortableRowsPageTest.php
+++ b/tests/forms/GridFieldSortableRowsPageTest.php
@@ -14,6 +14,8 @@ use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldConfig_Base;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\Versioned\Versioned;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
 
@@ -204,9 +206,9 @@ class GridFieldAction_PageSortOrder_Team extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_PageSortOrder_Team';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'City' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar::class,
+        'City' => DBVarchar::class,
+        'SortOrder' => DBInt::class
     );
 
     private static $default_sort = 'SortOrder';
@@ -225,9 +227,9 @@ class GridFieldAction_PageSortOrder_VTeam extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_PageSortOrder_VTeam';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'City' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar::class,
+        'City' => DBVarchar::class,
+        'SortOrder' => DBInt::class
     );
 
     private static $default_sort = 'SortOrder';
diff --git a/tests/forms/GridFieldSortableRowsTest.php b/tests/forms/GridFieldSortableRowsTest.php
index efbbad6..d14f7e5 100644
--- a/tests/forms/GridFieldSortableRowsTest.php
+++ b/tests/forms/GridFieldSortableRowsTest.php
@@ -14,6 +14,8 @@ use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ValidationException;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\Security\Member;
 use SilverStripe\Versioned\Versioned;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
@@ -133,9 +135,9 @@ class GridFieldAction_SortOrder_Team extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_SortOrder_Team';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'City' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar:class,
+        'City' => DBVarchar:class,
+        'SortOrder' => DBInt:class
     );
 
     private static $default_sort = 'SortOrder';
@@ -154,9 +156,9 @@ class GridFieldAction_SortOrder_VTeam extends DataObject implements TestOnly
     private static $table_name = 'GridFieldAction_SortOrder_VTeam';
 
     private static $db = array(
-        'Name' => 'Varchar',
-        'City' => 'Varchar',
-        'SortOrder' => 'Int'
+        'Name' => DBVarchar:class,
+        'City' => DBVarchar:class,
+        'SortOrder' => DBInt::class
     );
     private static $default_sort = 'SortOrder';