Update the DBLayeroo tests
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3660 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
@@ -550,15 +550,6 @@ class test_dblayeroo_{ENGINE} extends PHPUnit_Framework_TestCase
|
|||||||
$db1->disconnect ();
|
$db1->disconnect ();
|
||||||
$db2->disconnect ();
|
$db2->disconnect ();
|
||||||
$this->assertSame (array (
|
$this->assertSame (array (
|
||||||
array (
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
array (
|
||||||
'groupedoo.group' => 'group1',
|
'groupedoo.group' => 'group1',
|
||||||
),
|
),
|
||||||
@@ -577,30 +568,19 @@ class test_dblayeroo_{ENGINE} extends PHPUnit_Framework_TestCase
|
|||||||
$res = $db1->select ()
|
$res = $db1->select ()
|
||||||
->displayAdd ("group")
|
->displayAdd ("group")
|
||||||
->joinLeft ($db2, array ("group"=>"group"))
|
->joinLeft ($db2, array ("group"=>"group"))
|
||||||
|
->orderAdd ("group", "DESC")
|
||||||
->execute ();
|
->execute ();
|
||||||
$db1->disconnect ();
|
$db1->disconnect ();
|
||||||
$db2->disconnect ();
|
$db2->disconnect ();
|
||||||
$this->assertSame (array (
|
$this->assertSame (array (
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
array (
|
||||||
'usersoo.group' => NULL,
|
'usersoo.group' => NULL,
|
||||||
'groupedoo.group' => 'group2',
|
'groupedoo.group' => 'group2',
|
||||||
),
|
),
|
||||||
|
array (
|
||||||
|
'usersoo.group' => 'group1',
|
||||||
|
'groupedoo.group' => 'group1',
|
||||||
|
),
|
||||||
), $res);
|
), $res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -626,18 +606,6 @@ class test_dblayeroo_{ENGINE} extends PHPUnit_Framework_TestCase
|
|||||||
'usersoo.group' => 'group1',
|
'usersoo.group' => 'group1',
|
||||||
'groupedoo.group' => 'group1',
|
'groupedoo.group' => 'group1',
|
||||||
),
|
),
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
array (
|
|
||||||
'usersoo.group' => 'group1',
|
|
||||||
'groupedoo.group' => 'group1',
|
|
||||||
),
|
|
||||||
), $res);
|
), $res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user