+ <% control Fields %>
+ | class="ss-gridfield-{$FirstLast}"<% end_if %>>$Value |
+ <% end_control %>
+
\ No newline at end of file
diff --git a/tests/forms/DatagridFunctionalTest.php b/tests/forms/DatagridFunctionalTest.php
deleted file mode 100644
index a1c98ee1c..000000000
--- a/tests/forms/DatagridFunctionalTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-objFromFixture('DatagridTest_Person', 'first');
- $response = $this->get("DatagridFunctionalTest_Controller/");
- $this->assertContains($firstPerson->Name, $response->getBody());
- }
-}
-
-class DatagridFunctionalTest_Controller extends Controller {
-
- protected $template = 'BlankPage';
-
- function Link($action = null) {
- return Controller::join_links('DatagridFunctionalTest_Controller', $action);
- }
-
- public function index() {
- $grid = new Datagrid('testgrid');
- $dataSource = DataList::create("DatagridTest_Person")->sort("Name");
- $grid->setDataSource($dataSource);
- $form = new Form($this, 'gridform', new FieldList($grid), new FieldList(new FormAction('rerender', 'rerender')));
- return array('Form'=>$form);
- }
-}
\ No newline at end of file
diff --git a/tests/forms/DatagridPresenterTest.php b/tests/forms/DatagridPresenterTest.php
deleted file mode 100644
index 7fe55d732..000000000
--- a/tests/forms/DatagridPresenterTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-assertTrue(new DatagridPresenter instanceof DatagridPresenter, 'Trying to find an instance of DatagridPresenter');
- }
-
- public function testHeaders() {
- $presenter = new DatagridPresenter();
- $grid = new Datagrid('testgrid', 'testgrid', new DataList('DatagridTest_Person'));
- $presenter->setDatagrid($grid);
- $headers = $presenter->Headers()->first();
-
- $this->assertEquals(1, count($headers));
- $this->assertEquals('Name', $headers->Name );
- }
-
- public function testItemsReturnCorrectNumberOfItems() {
- $presenter = new DatagridPresenter();
- $grid = new Datagrid('testgrid', 'testgrid', new DataList('DatagridTest_Person'));
- $presenter->setDatagrid($grid);
- $this->assertEquals(2, $presenter->Items()->count());
- }
-
-}
\ No newline at end of file
diff --git a/tests/forms/GridFieldFunctionalTest.php b/tests/forms/GridFieldFunctionalTest.php
new file mode 100644
index 000000000..0050b8896
--- /dev/null
+++ b/tests/forms/GridFieldFunctionalTest.php
@@ -0,0 +1,45 @@
+objFromFixture('GridFieldTest_Person', 'first');
+ $response = $this->get("GridFieldFunctionalTest_Controller/");
+ $this->assertContains($firstPerson->Name, $response->getBody());
+ }
+}
+
+class GridFieldFunctionalTest_Controller extends Controller {
+
+ protected $template = 'BlankPage';
+
+ function Link($action = null) {
+ return Controller::join_links('GridFieldFunctionalTest_Controller', $action);
+ }
+
+ public function index() {
+ $grid = new GridField('testgrid');
+ $dataSource = DataList::create("GridFieldTest_Person")->sort("Name");
+ $grid->setDataSource($dataSource);
+ $form = new Form($this, 'gridform', new FieldList($grid), new FieldList(new FormAction('rerender', 'rerender')));
+ return array('Form'=>$form);
+ }
+}
\ No newline at end of file
diff --git a/tests/forms/GridFieldPresenterTest.php b/tests/forms/GridFieldPresenterTest.php
new file mode 100644
index 000000000..3421e14c5
--- /dev/null
+++ b/tests/forms/GridFieldPresenterTest.php
@@ -0,0 +1,55 @@
+assertTrue(new GridFieldPresenter instanceof GridFieldPresenter, 'Trying to find an instance of GridFieldPresenter');
+ }
+
+ public function testHeaders() {
+ $presenter = new GridFieldPresenter();
+ $grid = new GridField('testgrid', 'testgrid', new DataList('GridFieldTest_Person'));
+ $presenter->setGridField($grid);
+ $headers = $presenter->Headers()->first();
+
+ $this->assertEquals(1, count($headers));
+ $this->assertEquals('Name', $headers->Name );
+ }
+
+ public function testItemsReturnCorrectNumberOfItems() {
+ $presenter = new GridFieldPresenter();
+ $grid = new GridField('testgrid', 'testgrid', new DataList('GridFieldTest_Person'));
+ $presenter->setGridField($grid);
+ $this->assertEquals(2, $presenter->Items()->count());
+ }
+
+ public function testSorting(){
+ $presenter = new GridFieldPresenter();
+ $GridField = new GridField('testgrid', 'testgrid', new DataList('GridFieldTest_Person'));
+ $presenter->setGridField($GridField);
+ $presenter->sort('Name','desc');
+ $data = $presenter->Items()->map('ID','Name');
+ $this->assertEquals(array(2=>'Second Person', 1=>'First Person'), $data);
+ $presenter->sort('Name','asc');
+ $data = $presenter->Items()->map('ID','Name');
+ $this->assertEquals(array(1=>'First Person', 2=>'Second Person'), $data);
+ }
+}
\ No newline at end of file
diff --git a/tests/forms/DatagridTest.php b/tests/forms/GridFieldTest.php
similarity index 54%
rename from tests/forms/DatagridTest.php
rename to tests/forms/GridFieldTest.php
index 5dfec990a..e45ae97fc 100644
--- a/tests/forms/DatagridTest.php
+++ b/tests/forms/GridFieldTest.php
@@ -1,31 +1,31 @@
assertTrue(new Datagrid('Testgrid') instanceof FormField, 'Datagrid should be a FormField');
+ $this->assertTrue(new GridField('Testgrid') instanceof FormField, 'GridField should be a FormField');
}
public function testSetDataSource() {
- $grid = new Datagrid('Testgrid');
+ $grid = new GridField('Testgrid');
$source = new ArrayList();
$grid->setDatasource($source);
$this->assertEquals($source, $grid->getDatasource());
@@ -33,29 +33,29 @@ class DatagridTest extends SapphireTest {
function testSetEmptyDataPresenter() {
$this->setExpectedException('Exception');
- $grid = new Datagrid('Testgrid');
- $grid->setDataPresenter('');
+ $grid = new GridField('Testgrid');
+ $grid->setPresenter('');
}
function testSetNonExistingDataPresenter() {
$this->setExpectedException('Exception');
- $grid = new Datagrid('Testgrid');
- $grid->setDataPresenter('ifThisClassExistsIWouldBeSurprised');
+ $grid = new GridField('Testgrid');
+ $grid->setPresenter('ifThisClassExistsIWouldBeSurprised');
}
function testSetDataPresenterWithDataObject() {
$this->setExpectedException('Exception');
- $grid = new Datagrid('Testgrid');
- $grid->setDataPresenter('DataObject');
+ $grid = new GridField('Testgrid');
+ $grid->setPresenter('DataObject');
}
function testSetDataPresenter() {
- $grid = new Datagrid('Testgrid');
- $grid->setDataPresenter('DatagridPresenter');
+ $grid = new GridField('Testgrid');
+ $grid->setPresenter('GridFieldPresenter');
}
function testSetDataclass() {
- $grid = new Datagrid('Testgrid');
+ $grid = new GridField('Testgrid');
$grid->setModelClass('SiteTree');
$this->assertEquals('SiteTree', $grid->getModelClass());
}
@@ -65,23 +65,23 @@ class DatagridTest extends SapphireTest {
*/
function testFieldHolderWithoutDataSource() {
$this->setExpectedException('Exception');
- $grid = new Datagrid('Testgrid');
+ $grid = new GridField('Testgrid');
$this->assertNotNull($grid->FieldHolder());
}
/**
- * This is better tested in the DatagridFunctionalTest
+ * This is better tested in the GridFieldFunctionalTest
*
- * @see DatagridFunctionalTest
+ * @see GridFieldFunctionalTest
*/
function testFieldHolder() {
- $grid = new Datagrid('Testgrid');
- $grid->setDatasource(new DataList('DatagridTest_Person'));
+ $grid = new GridField('Testgrid');
+ $grid->setDatasource(new DataList('GridFieldTest_Person'));
$this->assertNotNull($grid->FieldHolder());
}
}
-class DatagridTest_Person extends Dataobject implements TestOnly {
+class GridFieldTest_Person extends Dataobject implements TestOnly {
public static $db = array(
'Name' => 'Varchar'
diff --git a/tests/forms/DatagridTest.yml b/tests/forms/GridFieldTest.yml
similarity index 74%
rename from tests/forms/DatagridTest.yml
rename to tests/forms/GridFieldTest.yml
index bc8493604..a1d123193 100644
--- a/tests/forms/DatagridTest.yml
+++ b/tests/forms/GridFieldTest.yml
@@ -1,4 +1,4 @@
-DatagridTest_Person:
+GridFieldTest_Person:
first:
Name: First Person
second: