tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Removed use of assertCount() from this test as it causes infinite loops on Travis.

Browse Source
This commit is contained in:
Sam Minnee 2014-02-14 15:37:16 +13:00
parent 3f9bd383d4
commit a1c3cf1cf4
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/model/SQLQueryTest.php
View File

@ -293,7 +293,6 @@ class SQLQueryTest extends SapphireTest {
); );
} }
public function testSetWhereAny() { public function testSetWhereAny() {
$query = new SQLQuery(); $query = new SQLQuery();
$query->setFrom('MyTable'); $query->setFrom('MyTable');
@ -303,17 +302,18 @@ class SQLQueryTest extends SapphireTest {
} }
public function testSelectFirst() { public function testSelectFirst() {
// Test first from sequence // Test first from sequence
$query = new SQLQuery(); $query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"'); $query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$result = $query->firstRow()->execute(); $result = $query->firstRow()->execute();
$this->assertCount(1, $result); $count = 0;
foreach($result as $row) { foreach($result as $row) {
$this->assertEquals('Object 1', $row['Name']); $this->assertEquals('Object 1', $row['Name']);
$count++;
} }
$this->assertEquals(1, $count);
// Test first from empty sequence // Test first from empty sequence
$query = new SQLQuery(); $query = new SQLQuery();
@ -321,7 +321,12 @@ class SQLQueryTest extends SapphireTest {
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$query->setWhere(array("\"Name\" = 'Nonexistent Object'")); $query->setWhere(array("\"Name\" = 'Nonexistent Object'"));
$result = $query->firstRow()->execute(); $result = $query->firstRow()->execute();
$this->assertCount(0, $result);
$count = 0;
foreach($query->lastRow()->execute() as $row) {
$count++;
}
$this->assertEquals(0, $count);
// Test that given the last item, the 'first' in this list matches the last // Test that given the last item, the 'first' in this list matches the last
$query = new SQLQuery(); $query = new SQLQuery();
@ -329,43 +334,53 @@ class SQLQueryTest extends SapphireTest {
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$query->setLimit(1, 1); $query->setLimit(1, 1);
$result = $query->firstRow()->execute(); $result = $query->firstRow()->execute();
$this->assertCount(1, $result);
$count = 0;
foreach($result as $row) { foreach($result as $row) {
$this->assertEquals('Object 2', $row['Name']); $this->assertEquals('Object 2', $row['Name']);
$count++;
} }
$this->assertEquals(1, $count);
} }
public function testSelectLast() { public function testSelectLast() {
// Test last in sequence // Test last in sequence
$query = new SQLQuery(); $query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"'); $query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$result = $query->lastRow()->execute();
$this->assertCount(1, $result); $count = 0;
foreach($result as $row) { foreach($query->lastRow()->execute() as $row) {
$this->assertEquals('Object 2', $row['Name']); $this->assertEquals('Object 2', $row['Name']);
$count++;
} }
$this->assertEquals(1, $count);
// Test last from empty sequence // Test last from empty sequence
$query = new SQLQuery(); $query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"'); $query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$query->setWhere(array("\"Name\" = 'Nonexistent Object'")); $query->setWhere(array("\"Name\" = 'Nonexistent Object'"));
$result = $query->lastRow()->execute();
$this->assertCount(0, $result); $count = 0;
foreach($query->lastRow()->execute() as $row) {
$count++;
}
$this->assertEquals(0, $count);
// Test that given the first item, the 'last' in this list matches the first // Test that given the first item, the 'last' in this list matches the first
$query = new SQLQuery(); $query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"'); $query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"'); $query->setOrderBy('"Name"');
$query->setLimit(1); $query->setLimit(1);
$result = $query->lastRow()->execute();
$this->assertCount(1, $result); $count = 0;
foreach($result as $row) { foreach($query->lastRow()->execute() as $row) {
$this->assertEquals('Object 1', $row['Name']); $this->assertEquals('Object 1', $row['Name']);
$count++;
} }
$this->assertEquals(1, $count);
} }
/** /**