summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2022-03-13 19:14:31 +0000
committerGreg Roach <greg@subaqua.co.uk>2022-03-13 20:07:44 +0000
commit246e8de0f2484cc0dc5d6542bb15cdee3740a2e6 (patch)
tree20899c1bc373a8f7acd5604ae245932d02908507 /tests
parent438fe1d800b97a0277394ba444ced9af468c9f3c (diff)
downloadwebtrees-246e8de0f2484cc0dc5d6542bb15cdee3740a2e6.tar.gz
webtrees-246e8de0f2484cc0dc5d6542bb15cdee3740a2e6.tar.bz2
webtrees-246e8de0f2484cc0dc5d6542bb15cdee3740a2e6.zip
Use PHPunit features
Diffstat (limited to 'tests')
-rw-r--r--tests/feature/RelationshipNamesTest.php86
1 files changed, 42 insertions, 44 deletions
diff --git a/tests/feature/RelationshipNamesTest.php b/tests/feature/RelationshipNamesTest.php
index 0dbd58c405..f6262b516f 100644
--- a/tests/feature/RelationshipNamesTest.php
+++ b/tests/feature/RelationshipNamesTest.php
@@ -121,48 +121,47 @@ class RelationshipNamesTest extends TestCase
$i38f = new Individual('i38f', "0 @i38f@ INDI\n1 SEX F\n1 FAMC @f7@", null, $tree);
$i39mo = new Individual('i39mo', "0 @i39o@ INDI\n1 SEX M\n1 FAMC @f14d@\n2 PEDI foster", null, $tree);
- $individual_factory->method('make')->will(
- static::returnValueMap([
- 'i1m' => $i1m,
- 'i2f' => $i2f,
- 'i3m' => $i3m,
- 'i4f' => $i4f,
- 'i5u' => $i5u,
- 'i6m' => $i6m,
- 'i7ma' => $i7ma,
- 'i8f' => $i8f,
- 'i9u' => $i9u,
- 'i10f' => $i10f,
- 'i11m' => $i11m,
- 'i12f' => $i12f,
- 'i13m' => $i13m,
- 'i14f' => $i14f,
- 'i15u' => $i15u,
- 'i16m' => $i16m,
- 'i17f' => $i17f,
- 'i18m' => $i18m,
- 'i19f' => $i19f,
- 'i20m' => $i20m,
- 'i21f' => $i21f,
- 'i22m' => $i22m,
- 'i23f' => $i23f,
- 'i24m' => $i24m,
- 'i25f' => $i25f,
- 'i26f' => $i26f,
- 'i27m' => $i27m,
- 'i28u' => $i28u,
- 'i29m' => $i29m,
- 'i30m' => $i30m,
- 'i31m' => $i31m,
- 'i32f' => $i32f,
- 'i33f' => $i33f,
- 'i34f' => $i34f,
- 'i35m' => $i35m,
- 'i36f' => $i36f,
- 'i37f' => $i37f,
- 'i38f' => $i38f,
+ $individual_factory->method('make')->willReturnMap([
+ 'i1m' => $i1m,
+ 'i2f' => $i2f,
+ 'i3m' => $i3m,
+ 'i4f' => $i4f,
+ 'i5u' => $i5u,
+ 'i6m' => $i6m,
+ 'i7ma' => $i7ma,
+ 'i8f' => $i8f,
+ 'i9u' => $i9u,
+ 'i10f' => $i10f,
+ 'i11m' => $i11m,
+ 'i12f' => $i12f,
+ 'i13m' => $i13m,
+ 'i14f' => $i14f,
+ 'i15u' => $i15u,
+ 'i16m' => $i16m,
+ 'i17f' => $i17f,
+ 'i18m' => $i18m,
+ 'i19f' => $i19f,
+ 'i20m' => $i20m,
+ 'i21f' => $i21f,
+ 'i22m' => $i22m,
+ 'i23f' => $i23f,
+ 'i24m' => $i24m,
+ 'i25f' => $i25f,
+ 'i26f' => $i26f,
+ 'i27m' => $i27m,
+ 'i28u' => $i28u,
+ 'i29m' => $i29m,
+ 'i30m' => $i30m,
+ 'i31m' => $i31m,
+ 'i32f' => $i32f,
+ 'i33f' => $i33f,
+ 'i34f' => $i34f,
+ 'i35m' => $i35m,
+ 'i36f' => $i36f,
+ 'i37f' => $i37f,
+ 'i38f' => $i38f,
'i39mo' => $i39mo
- ]));
+ ]);
$f1m = new Family('f1m', "0 @f1m@ FAM\n1 MARR Y\n1 HUSB @i1m@\n1 WIFE @i2f@\n1 CHIL @i3m@\n1 CHIL @i4f@\n1 CHIL @i5u@", null, $tree);
$f2d = new Family('f2d', "0 @f2d@ FAM\n1 DIV Y\n1 HUSB @i6m@\n1 WIFE @i2f@\n1 CHIL @i7ma@\n1 CHIL @i8f@\n1 CHIL @i9u@", null, $tree);
@@ -182,8 +181,7 @@ class RelationshipNamesTest extends TestCase
$f16 = new Family('f16', "0 @f16@ FAM\n1 WIFE @i34f@\n1 CHIL @i35m@", null, $tree);
$f17 = new Family('f17', "0 @f17@ FAM\n1 HUSB @i35m@\n1 CHIL @i36f@", null, $tree);
- $family_factory->method('make')->will(
- static::returnValueMap([
+ $family_factory->method('make')->willReturnMap([
'f1m' => $f1m,
'f2d' => $f2d,
'f3e' => $f3e,
@@ -201,7 +199,7 @@ class RelationshipNamesTest extends TestCase
'f15' => $f15,
'f16' => $f16,
'f17' => $f17
- ]));
+ ]);
///////////////////////////////////////////////////////////////////////
// ENGLISH