Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-14 12:06:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat using CamelCase and added regexp for fieldsArray

Browse Source
This commit is contained in:
Rusinov Maxim
2012-07-08 20:16:02 +06:00
parent f9691820a5
commit b419391241
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/framework/web/CArrayDataProviderTest.php
View File

@@ -6,22 +6,22 @@ class CArrayDataProviderTest extends CTestCase
{
public function testGetData()
{
$simple_array = array('zero', 'one');
$dataprovider = new CArrayDataProvider($simple_array);
$this->assertEquals($simple_array, $dataprovider->getData());
$simpleArray = array('zero', 'one');
$dataProvider = new CArrayDataProvider($simpleArray);
$this->assertEquals($simpleArray, $dataProvider->getData());
}
public function testGetSortedData()
{
$simple_array = array(array('sort_field' => 1), array('sort_field' => 0));
$dataprovider = new CArrayDataProvider(
$simple_array,
$simpleArray = array(array('sortField' => 1), array('sortField' => 0));
$dataProvider = new CArrayDataProvider(
$simpleArray,
array(
'sort' => array(
'attributes' => array(
'sort' => array(
'asc' => 'sort_field ASC',
'desc' => 'sort_field DESC',
'asc' => 'sortField ASC',
'desc' => 'sortField DESC',
'label' => 'Sorting',
'default' => 'asc',
),
@@ -32,24 +32,24 @@ class CArrayDataProviderTest extends CTestCase
),
)
);
$sorted_array = array(array('sort_field' => 0), array('sort_field' => 1));
$this->assertEquals($sorted_array, $dataprovider->getData());
$sortedArray = array(array('sortField' => 0), array('sortField' => 1));
$this->assertEquals($sortedArray, $dataProvider->getData());
}
public function testGetSortedDataByInnerArrayField()
{
$simple_array = array(
array('inner_array' => array('sort_field' => 1)),
array('inner_array' => array('sort_field' => 0))
$simpleArray = array(
array('innerArray' => array('sortField' => 1)),
array('innerArray' => array('sortField' => 0))
);
$dataprovider = new CArrayDataProvider(
$simple_array,
$dataProvider = new CArrayDataProvider(
$simpleArray,
array(
'sort' => array(
'attributes' => array(
'sort' => array(
'asc' => 'inner_array.sort_field ASC',
'desc' => 'inner_array.sort_field DESC',
'asc' => 'innerArray.sortField ASC',
'desc' => 'innerArray.sortField DESC',
'label' => 'Sorting',
'default' => 'asc',
),
@@ -60,10 +60,10 @@ class CArrayDataProviderTest extends CTestCase
),
)
);
$sorted_array = array(
array('inner_array' => array('sort_field' => 0)),
array('inner_array' => array('sort_field' => 1))
$sortedArray = array(
array('innerArray' => array('sortField' => 0)),
array('innerArray' => array('sortField' => 1))
);
$this->assertEquals($sorted_array, $dataprovider->getData());
$this->assertEquals($sortedArray, $dataProvider->getData());
}
}