Merge pull request #50 from xp-forge/refactor/use-throws-assertion

Use throws assertion

Author: thekid

composer.json

@@ -11,7 +11,7 @@
     "php" : ">=7.0.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^11.0 | ^10.0"
+    "xp-framework/unittest": "^11.1"
   },
   "autoload" : {
     "files" : ["src/main/php/autoload.php"]

src/test/php/util/data/unittest/SequenceIteratorTest.class.php

@@ -56,12 +56,10 @@ public function may_iterate_sequence_based_on_a_fixed_enumerable_more_than_once(
   public function cannot_iterate_sequence_based_on_a_streamed_enumerable_more_than_once($input) {
     $seq= Sequence::of($input);
     $this->iterated($seq->iterator());
-    try {
+
+    Assert::throws(CannotReset::class, function() use($seq) {
       $this->iterated($seq->iterator());
-      $this->fail('No exception raised', null, 'util.data.CannotReset');
-    } catch (CannotReset $expected) {
-      // OK
-    }
+    });
   }
 
   #[@test, @values('util.data.unittest.Enumerables::validArrays')]

src/test/php/util/data/unittest/SequenceTest.class.php

@@ -16,12 +16,9 @@ class SequenceTest extends AbstractSequenceTest {
    */
   protected function assertNotTwice($seq, $func) {
     $func($seq);
-    try {
+    Assert::throws(CannotReset::class, function() use($seq, $func) {
       $func($seq);
-      $this->fail('No exception raised', null, CannotReset::class);
-    } catch (CannotReset $expected) {
-      // OK
-    }
+    });
   }
 
   #[@test]

src/test/php/util/data/unittest/TraversalOfTest.class.php

@@ -36,12 +36,9 @@ public function exceptions_from_rewind_are_wrapped_in_cannot_reset($class) {
     ]));
     $fixture->rewind();
 
-    try {
+    Assert::throws(CannotReset::class, function() use($fixture) {
       $fixture->rewind();
-      $this->fail('Expected exception not caught', null, CannotReset::class);
-    } catch (CannotReset $expected) {
-      // OK
-    }
+    });
   }
 
   #[@test]
@@ -55,11 +52,8 @@ public function exceptions_during_iteration_are_left_untouched() {
     ]));
     $fixture->rewind();
 
-    try {
+    Assert::throws(IllegalStateException::class, function() use($fixture) {
       $fixture->current();
-      $this->fail('Expected exception not caught', null, IllegalStateException::class);
-    } catch (IllegalStateException $expected) {
-      // OK
-    }
+    });
   }
 }

src/test/php/util/data/unittest/YieldingOfTest.class.php

@@ -24,24 +24,18 @@ public function cannot_rewind_after_rewind($generator) {
     $fixture= new YieldingOf($generator());
     $fixture->rewind();
 
-    try {
+    Assert::throws(CannotReset::class, function() use($fixture) {
       $fixture->rewind();
-      $this->fail('Expected exception not caught', null, CannotReset::class);
-    } catch (CannotReset $expected) {
-      // OK
-    }
+    });
   }
 
   #[@test, @values('fixtures')]
   public function cannot_rewind_after_complete_iteration($generator) {
     $fixture= new YieldingOf($generator());
     iterator_to_array($fixture);
 
-    try {
+    Assert::throws(CannotReset::class, function() use($fixture) {
       $fixture->rewind();
-      $this->fail('Expected exception not caught', null, CannotReset::class);
-    } catch (CannotReset $expected) {
-      // OK
-    }
+    });
   }
 }