diff --git a/tests/php/ORM/DataObjectDuplicationTest.php b/tests/php/ORM/DataObjectDuplicationTest.php index 57e5b8bb7..d223da1f8 100644 --- a/tests/php/ORM/DataObjectDuplicationTest.php +++ b/tests/php/ORM/DataObjectDuplicationTest.php @@ -108,6 +108,10 @@ class DataObjectDuplicationTest extends SapphireTest $two = DataObject::get_by_id(DataObjectDuplicationTest\Class2::class, $two->ID); $three = DataObject::get_by_id(DataObjectDuplicationTest\Class3::class, $three->ID); + $this->assertCount(1, $one->twos()); + $this->assertCount(1, $one->threes()); + $this->assertCount(1, $three->ones()); + //test duplication $oneCopy = $one->duplicate(true, true); $twoCopy = $two->duplicate(true, true); @@ -125,19 +129,19 @@ 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" ); @@ -146,9 +150,9 @@ class DataObjectDuplicationTest extends SapphireTest $twoCopy->one()->ID, "Match between relation of copy and the original" ); - $this->assertEquals( + $this->assertCount( 0, - $oneCopy->twos()->Count(), + $oneCopy->twos(), "Many-to-one relation not copied (has_many)" ); $this->assertContains( diff --git a/tests/php/ORM/DataObjectDuplicationTest/Class1.php b/tests/php/ORM/DataObjectDuplicationTest/Class1.php index b3a5fd3ef..337354af9 100644 --- a/tests/php/ORM/DataObjectDuplicationTest/Class1.php +++ b/tests/php/ORM/DataObjectDuplicationTest/Class1.php @@ -26,4 +26,6 @@ class Class1 extends DataObject implements TestOnly 'TestExtra' => 'Varchar' ) ); + + private static $default_sort = '"ID" ASC'; } diff --git a/tests/php/ORM/DataObjectDuplicationTest/Class2.php b/tests/php/ORM/DataObjectDuplicationTest/Class2.php index b1b96bf61..d8633e4da 100644 --- a/tests/php/ORM/DataObjectDuplicationTest/Class2.php +++ b/tests/php/ORM/DataObjectDuplicationTest/Class2.php @@ -16,4 +16,6 @@ class Class2 extends DataObject implements TestOnly private static $has_one = array( 'one' => Class1::class ); + + private static $default_sort = '"ID" ASC'; } diff --git a/tests/php/ORM/DataObjectDuplicationTest/Class3.php b/tests/php/ORM/DataObjectDuplicationTest/Class3.php index c018152da..30fd6d283 100644 --- a/tests/php/ORM/DataObjectDuplicationTest/Class3.php +++ b/tests/php/ORM/DataObjectDuplicationTest/Class3.php @@ -16,4 +16,6 @@ class Class3 extends DataObject implements TestOnly private static $belongs_many_many = array( 'ones' => Class1::class ); + + private static $default_sort = '"ID" ASC'; } diff --git a/tests/php/ORM/DataObjectDuplicationTest/Class4.php b/tests/php/ORM/DataObjectDuplicationTest/Class4.php index 8d5aad1e4..567bad041 100644 --- a/tests/php/ORM/DataObjectDuplicationTest/Class4.php +++ b/tests/php/ORM/DataObjectDuplicationTest/Class4.php @@ -26,4 +26,6 @@ class Class4 extends DataObject implements TestOnly private static $belongs_many_many = [ 'Parents' => Class4::class, ]; + + private static $default_sort = '"ID" ASC'; }