Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix

FIX Regression from #8009
This commit is contained in:
Robbie Averill 2018-06-05 13:43:19 +12:00 committed by GitHub
commit 13ea2f9b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -83,6 +83,13 @@ class DataObjectDuplicationTest extends SapphireTest {
$two = DataObject::get_by_id("DataObjectDuplicateTestClass2", $two->ID);
$three = DataObject::get_by_id("DataObjectDuplicateTestClass3", $three->ID);
$this->assertCount(1, $one->twos(),
"Many-to-one relation not copied (has_many)");
$this->assertCount(1, $one->threes(),
"Object has the correct number of relations");
$this->assertCount(1, $three->ones(),
"Object has the correct number of relations");
//test duplication
$oneCopy = $one->duplicate();
$twoCopy = $two->duplicate();
@ -100,16 +107,16 @@ class DataObjectDuplicationTest extends SapphireTest {
$this->assertEquals($text2, $twoCopy->text);
$this->assertEquals($text3, $threeCopy->text);
$this->assertNotEquals($one->twos()->Count(), $oneCopy->twos()->Count(),
$this->assertCount(0, $oneCopy->twos(),
"Many-to-one relation not copied (has_many)");
$this->assertEquals($one->threes()->Count(), $oneCopy->threes()->Count(),
$this->assertCount(2, $oneCopy->threes(),
"Object has the correct number of relations");
$this->assertEquals($three->ones()->Count(), $threeCopy->ones()->Count(),
$this->assertCount(2, $threeCopy->ones(),
"Object has the correct number of relations");
$this->assertEquals($one->ID, $twoCopy->one()->ID,
"Match between relation of copy and the original");
$this->assertEquals(0, $oneCopy->twos()->Count(),
$this->assertCount(0, $oneCopy->twos(),
"Many-to-one relation not copied (has_many)");
$this->assertEquals($three->ID, $oneCopy->threes()->First()->ID,
"Match between relation of copy and the original");
@ -142,6 +149,8 @@ class DataObjectDuplicateTestClass1 extends DataObject implements TestOnly {
'TestExtra' => 'Varchar'
)
);
private static $default_sort = '"ID" ASC';
}
class DataObjectDuplicateTestClass2 extends DataObject implements TestOnly {
@ -154,6 +163,8 @@ class DataObjectDuplicateTestClass2 extends DataObject implements TestOnly {
'one' => 'DataObjectDuplicateTestClass1'
);
private static $default_sort = '"ID" ASC';
}
class DataObjectDuplicateTestClass3 extends DataObject implements TestOnly {
@ -165,6 +176,8 @@ class DataObjectDuplicateTestClass3 extends DataObject implements TestOnly {
private static $belongs_many_many = array(
'ones' => 'DataObjectDuplicateTestClass1'
);
private static $default_sort = '"ID" ASC';
}