test: Fix test cases according to AttributeException

Greg0 · Greg0 · commit 9b358310022a · 2025-08-20T23:58:01.000+02:00
diff --git a/src/Datafile/Conditions/AfterCondition.php b/src/Datafile/Conditions/AfterCondition.php
@@ -24,8 +24,8 @@ public function __construct(string $attribute, DateTimeImmutable $value)
 
     public function isSatisfiedBy(array $context): bool
     {
+        $valueFromContext = $this->getValueFromContext($context, $this->attribute);
         try {
-            $valueFromContext = $this->getValueFromContext($context, $this->attribute);
             if ($valueFromContext === null) {
                 return false;
             }
diff --git a/src/Datafile/Conditions/BeforeCondition.php b/src/Datafile/Conditions/BeforeCondition.php
@@ -23,8 +23,8 @@ public function __construct(string $attribute, DateTimeImmutable $value)
 
     public function isSatisfiedBy(array $context): bool
     {
+        $valueFromContext = $this->getValueFromContext($context, $this->attribute);
         try {
-            $valueFromContext = $this->getValueFromContext($context, $this->attribute);
             if ($valueFromContext === null) {
                 return false;
             }
diff --git a/src/Datafile/Conditions/NotCondition.php b/src/Datafile/Conditions/NotCondition.php
@@ -18,10 +18,6 @@ public function __construct(ConditionInterface $specification)
 
     public function isSatisfiedBy(array $context): bool
     {
-        try {
-            return $this->specification->isSatisfiedBy($context) === false;
-        } catch (AttributeException $e) {
-            return false;
-        }
+        return $this->specification->isSatisfiedBy($context) === false;
     }
 }
diff --git a/tests/Datafile/Conditions/AfterConditionTest.php b/tests/Datafile/Conditions/AfterConditionTest.php
@@ -5,6 +5,7 @@
 namespace Featurevisor\Tests\Datafile\Conditions;
 
 use DateTimeImmutable;
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\AfterCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -75,13 +76,14 @@ public function testAfterConditionWithNestedAttributeBefore(): void
 
     public function testAfterConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => '2023-01-15',
         ];
-
         $condition = new AfterCondition('date', new DateTimeImmutable('2023-01-01'));
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testAfterConditionWithInvalidDateFormat(): void
diff --git a/tests/Datafile/Conditions/BeforeConditionTest.php b/tests/Datafile/Conditions/BeforeConditionTest.php
@@ -5,6 +5,7 @@
 namespace Featurevisor\Tests\Datafile\Conditions;
 
 use DateTimeImmutable;
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\BeforeCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -75,13 +76,14 @@ public function testBeforeConditionWithNestedAttributeAfter(): void
 
     public function testBeforeConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => '2022-12-15',
         ];
-
         $condition = new BeforeCondition('date', new DateTimeImmutable('2023-01-01'));
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testBeforeConditionWithInvalidDateFormat(): void
diff --git a/tests/Datafile/Conditions/ContainsConditionTest.php b/tests/Datafile/Conditions/ContainsConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\ContainsCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -33,13 +34,14 @@ public function testContainsConditionWithSimpleAttributeNotContaining(): void
 
     public function testContainsConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'iPhone 12',
         ];
-
         $condition = new ContainsCondition('device', 'iPhone');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testContainsConditionWithNestedAttributeContaining(): void
diff --git a/tests/Datafile/Conditions/EndsWithConditionTest.php b/tests/Datafile/Conditions/EndsWithConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\EndsWithCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -33,13 +34,14 @@ public function testEndsWithConditionWithSimpleAttributeNotEndingWith(): void
 
     public function testEndsWithConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'My iPhone',
         ];
-
         $condition = new EndsWithCondition('device', 'iPhone');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testEndsWithConditionWithNestedAttributeEndingWith(): void
diff --git a/tests/Datafile/Conditions/EqualsConditionTest.php b/tests/Datafile/Conditions/EqualsConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\EqualsCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -33,13 +34,14 @@ public function testEqualsConditionWithSimpleAttributeNotMatching(): void
 
     public function testEqualsConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'value',
         ];
-
         $condition = new EqualsCondition('country', 'us');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testEqualsConditionWithNestedAttributeMatching(): void
@@ -74,17 +76,18 @@ public function testEqualsConditionWithNestedAttributeNotMatching(): void
 
     public function testEqualsConditionWithMissingNestedAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'user' => [
                 'profile' => [
                     'name' => 'John',
                 ],
             ],
         ];
-
         $condition = new EqualsCondition('user.profile.country', 'us');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testEqualsConditionWithDifferentTypes(): void
diff --git a/tests/Datafile/Conditions/GreaterThanConditionTest.php b/tests/Datafile/Conditions/GreaterThanConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\GreaterThanCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -44,13 +45,14 @@ public function testGreaterThanConditionWithSimpleAttributeLess(): void
 
     public function testGreaterThanConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 25,
         ];
-
         $condition = new GreaterThanCondition('age', 21);
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testGreaterThanConditionWithNestedAttributeGreater(): void
diff --git a/tests/Datafile/Conditions/InConditionTest.php b/tests/Datafile/Conditions/InConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\InCondition;
 use Featurevisor\Datafile\Conditions\NotCondition;
 use PHPUnit\Framework\TestCase;
@@ -34,13 +35,14 @@ public function testInConditionWithSimpleAttributeNotInArray(): void
 
     public function testInConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'us',
         ];
-
         $condition = new InCondition('country', ['us', 'ca', 'uk']);
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testInConditionWithNestedAttributeInArray(): void
@@ -112,12 +114,13 @@ public function testInConditionWithInvalidValueType(): void
 
     public function testNotInConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'country' => 'us',
         ];
-
         $condition = new NotCondition(new InCondition('continent', ['europe']));
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 }
diff --git a/tests/Datafile/Conditions/IncludesConditionTest.php b/tests/Datafile/Conditions/IncludesConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\IncludesCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -33,13 +34,14 @@ public function testIncludesConditionWithArrayNotIncludingValue(): void
 
     public function testIncludesConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => ['us', 'ca', 'uk'],
         ];
-
         $condition = new IncludesCondition('countries', 'us');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testIncludesConditionWithNestedArrayIncludingValue(): void
diff --git a/tests/Datafile/Conditions/LessThanConditionTest.php b/tests/Datafile/Conditions/LessThanConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\LessThanCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -44,13 +45,14 @@ public function testLessThanConditionWithSimpleAttributeGreater(): void
 
     public function testLessThanConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 18,
         ];
-
         $condition = new LessThanCondition('age', 21);
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testLessThanConditionWithNestedAttributeLess(): void
diff --git a/tests/Datafile/Conditions/MatchesConditionTest.php b/tests/Datafile/Conditions/MatchesConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\MatchesCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -33,13 +34,14 @@ public function testMatchesConditionWithSimpleAttributeNotMatching(): void
 
     public function testMatchesConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'user@example.com',
         ];
-
         $condition = new MatchesCondition('email', '/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testMatchesConditionWithNestedAttributeMatching(): void
diff --git a/tests/Datafile/Conditions/NotConditionTest.php b/tests/Datafile/Conditions/NotConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\EqualsCondition;
 use Featurevisor\Datafile\Conditions\GreaterThanCondition;
 use Featurevisor\Datafile\Conditions\NotCondition;
@@ -39,15 +40,16 @@ public function testNotConditionWithUnsatisfiedCondition(): void
 
     public function testNotConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => 'value',
         ];
-
         $condition = new NotCondition(
             new EqualsCondition('country', 'us')
         );
 
-        self::assertTrue($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testNotConditionWithNestedCondition(): void
diff --git a/tests/Datafile/Conditions/SemverEqualsConditionTest.php b/tests/Datafile/Conditions/SemverEqualsConditionTest.php
@@ -4,6 +4,7 @@
 
 namespace Featurevisor\Tests\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
 use Featurevisor\Datafile\Conditions\SemverEqualsCondition;
 use PHPUnit\Framework\TestCase;
 
@@ -96,24 +97,23 @@ public function testSemverEqualsConditionWithNestedAttributeNotEqual(): void
 
     public function testSemverEqualsConditionWithMissingAttribute(): void
     {
+        $this->expectException(AttributeException::class);
+
         $context = [
             'other_attribute' => '1.2.3',
         ];
-
         $condition = new SemverEqualsCondition('version', '1.2.3');
 
-        self::assertFalse($condition->isSatisfiedBy($context));
+        $condition->isSatisfiedBy($context);
     }
 
     public function testSemverEqualsConditionWithInvalidVersionFormat(): void
     {
         $context = [
             'version' => 'not-a-version',
         ];
-
         $condition = new SemverEqualsCondition('version', '1.2.3');
 
-        $this->expectException(\InvalidArgumentException::class);
-        $condition->isSatisfiedBy($context);
+        self::assertFalse($condition->isSatisfiedBy($context));
     }
 }
diff --git a/tests/Datafile/Conditions/SemverGreaterThanConditionTest.php b/tests/Datafile/Conditions/SemverGreaterThanConditionTest.php
diff --git a/tests/Datafile/Conditions/SemverGreaterThanOrEqualsConditionTest.php b/tests/Datafile/Conditions/SemverGreaterThanOrEqualsConditionTest.php
diff --git a/tests/Datafile/Conditions/SemverLessThanConditionTest.php b/tests/Datafile/Conditions/SemverLessThanConditionTest.php
diff --git a/tests/Datafile/Conditions/SemverLessThanOrEqualsConditionTest.php b/tests/Datafile/Conditions/SemverLessThanOrEqualsConditionTest.php
diff --git a/tests/Datafile/Conditions/StartsWithConditionTest.php b/tests/Datafile/Conditions/StartsWithConditionTest.php

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public function __construct(string $attribute, DateTimeImmutable $value)`
`24`	`24`
`25`	`25`	`public function isSatisfiedBy(array $context): bool`
`26`	`26`	`{`
	`27`	`+ $valueFromContext = $this->getValueFromContext($context, $this->attribute);`
`27`	`28`	`try {`
`28`		`- $valueFromContext = $this->getValueFromContext($context, $this->attribute);`
`29`	`29`	`if ($valueFromContext === null) {`
`30`	`30`	`return false;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public function __construct(string $attribute, DateTimeImmutable $value)`
`23`	`23`
`24`	`24`	`public function isSatisfiedBy(array $context): bool`
`25`	`25`	`{`
	`26`	`+ $valueFromContext = $this->getValueFromContext($context, $this->attribute);`
`26`	`27`	`try {`
`27`		`- $valueFromContext = $this->getValueFromContext($context, $this->attribute);`
`28`	`28`	`if ($valueFromContext === null) {`
`29`	`29`	`return false;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,6 @@ public function __construct(ConditionInterface $specification)`
`18`	`18`
`19`	`19`	`public function isSatisfiedBy(array $context): bool`
`20`	`20`	`{`
`21`		`- try {`
`22`		`- return $this->specification->isSatisfiedBy($context) === false;`
`23`		`- } catch (AttributeException $e) {`
`24`		`- return false;`
`25`		`- }`
	`21`	`+ return $this->specification->isSatisfiedBy($context) === false;`
`26`	`22`	`}`
`27`	`23`	`}`