Unify structure for ext/random's engine tests (2)

This makes adjustments that were missed in
2d6a883.

Author: TimWolla

ext/random/tests/02_engine/all_serialize_native.phpt

@@ -13,6 +13,8 @@ $engines[] = new PcgOneseq128XslRr64(1234);
 $engines[] = new Xoshiro256StarStar(1234);
 
 foreach ($engines as $engine) {
+    echo $engine::class, PHP_EOL;
+
     for ($i = 0; $i < 10_000; $i++) {
         $engine->generate();
     }
@@ -21,9 +23,7 @@ foreach ($engines as $engine) {
 
     for ($i = 0; $i < 10_000; $i++) {
         if ($engine->generate() !== $engine2->generate()) {
-            $className = $engine::class;
-
-            die("failure: {$className} at {$i}");
+            die("failure: state differs at {$i}");
         }
     }
 }
@@ -32,4 +32,7 @@ die('success');
 
 ?>
 --EXPECT--
+Random\Engine\Mt19937
+Random\Engine\PcgOneseq128XslRr64
+Random\Engine\Xoshiro256StarStar
 success

ext/random/tests/02_engine/all_serialize_user.phpt

@@ -5,17 +5,7 @@ Random: Engine: Serialization of user engines must preserve the sequence
 
 use Random\Engine;
 
-final class User64 implements Engine
-{
-    private int $count = 0;
-
-    public function generate(): string
-    {
-        return pack('P*', ++$this->count);
-    }
-}
-
-final class User32 implements Engine
+final class CountingEngine32 implements Engine
 {
     private int $count = 0;
 
@@ -26,12 +16,11 @@ final class User32 implements Engine
 }
 
 $engines = [];
-if (PHP_INT_SIZE >= 8) {
-    $engines[] = new User64();
-}
-$engines[] = new User32();
+$engines[] = new CountingEngine32();
 
 foreach ($engines as $engine) {
+    echo $engine::class, PHP_EOL;
+
     for ($i = 0; $i < 10_000; $i++) {
         $engine->generate();
     }
@@ -40,9 +29,7 @@ foreach ($engines as $engine) {
 
     for ($i = 0; $i < 10_000; $i++) {
         if ($engine->generate() !== $engine2->generate()) {
-            $className = $engine::class;
-
-            die("failure: {$className} at {$i}");
+            die("failure: state differs at {$i}");
         }
     }
 }
@@ -51,4 +38,5 @@ die('success');
 
 ?>
 --EXPECT--
+CountingEngine32
 success

ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt

@@ -16,7 +16,7 @@ try {
 
 for ($i = 0; $i < 10_000; $i++) {
     if ($engine->generate() !== $referenceEngine->generate()) {
-        die('failure: state changed');
+        die("failure: state differs at {$i}");
     }
 }
 

ext/random/tests/02_engine/user_compatibility.phpt

@@ -26,13 +26,14 @@ $engines[] = new PcgOneseq128XslRr64(1234);
 $engines[] = new Xoshiro256StarStar(1234);
 
 foreach ($engines as $engine) {
+    echo $engine::class, PHP_EOL;
+
     $native_engine = clone $engine;
     $user_engine = new WrapperEngine(clone $engine);
 
     for ($i = 0; $i < 10_000; $i++) {
         if ($native_engine->generate() !== $user_engine->generate()) {
-            $className = $engine::class;
-            die("failure: {$className} at {$i}");
+            die("failure: state differs at {$i}");
         }
     }
 }
@@ -41,4 +42,7 @@ die('success');
 
 ?>
 --EXPECT--
+Random\Engine\Mt19937
+Random\Engine\PcgOneseq128XslRr64
+Random\Engine\Xoshiro256StarStar
 success

ext/random/tests/02_engine/xoshiro256starstar_seed.phpt

@@ -6,33 +6,33 @@ Random: Engine: Xoshiro256StarStar: The seed parameter must work as expected
 use Random\Engine\Xoshiro256StarStar;
 
 echo "Random integer seed", PHP_EOL;
-$engine = new Xoshiro256StarStar(\random_int(\PHP_INT_MIN, \PHP_INT_MAX));
+$engine = new Xoshiro256StarStar(random_int(PHP_INT_MIN, PHP_INT_MAX));
 echo PHP_EOL, PHP_EOL;
 
 echo "Random string seed", PHP_EOL;
-$engine = new Xoshiro256StarStar(\random_bytes(32));
+$engine = new Xoshiro256StarStar(random_bytes(32));
 echo PHP_EOL, PHP_EOL;
 
 echo "Invalid data type", PHP_EOL;
 try {
     $engine = new Xoshiro256StarStar(1.0);
-} catch (\Throwable $e) {
+} catch (Throwable $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 echo PHP_EOL, PHP_EOL;
 
 echo "Invalid string seed length", PHP_EOL;
 try {
     $engine = new Xoshiro256StarStar('foobar');
-} catch (\Throwable $e) {
+} catch (Throwable $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 echo PHP_EOL, PHP_EOL;
 
 echo "Null seed", PHP_EOL;
 try {
-    $engine = new Random\Engine\Xoshiro256StarStar(\str_repeat("\x00", 32));
-} catch (\Throwable $e) {
+    $engine = new Xoshiro256StarStar(str_repeat("\x00", 32));
+} catch (Throwable $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 echo PHP_EOL, PHP_EOL;