Skip to content

Commit 4fb3052

Browse files
committed
Unify structure for ext/random's engine tests (2)
This makes adjustments that were missed in 2d6a883.
1 parent be1487c commit 4fb3052

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ $engines[] = new PcgOneseq128XslRr64(1234);
1313
$engines[] = new Xoshiro256StarStar(1234);
1414

1515
foreach ($engines as $engine) {
16+
echo $engine::class, PHP_EOL;
17+
1618
for ($i = 0; $i < 10_000; $i++) {
1719
$engine->generate();
1820
}
@@ -21,9 +23,7 @@ foreach ($engines as $engine) {
2123

2224
for ($i = 0; $i < 10_000; $i++) {
2325
if ($engine->generate() !== $engine2->generate()) {
24-
$className = $engine::class;
25-
26-
die("failure: {$className} at {$i}");
26+
die("failure: state differs at {$i}");
2727
}
2828
}
2929
}
@@ -32,4 +32,7 @@ die('success');
3232

3333
?>
3434
--EXPECT--
35+
Random\Engine\Mt19937
36+
Random\Engine\PcgOneseq128XslRr64
37+
Random\Engine\Xoshiro256StarStar
3538
success

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ if (PHP_INT_SIZE >= 8) {
3232
$engines[] = new User32();
3333

3434
foreach ($engines as $engine) {
35+
echo $engine::class, PHP_EOL;
36+
3537
for ($i = 0; $i < 10_000; $i++) {
3638
$engine->generate();
3739
}
@@ -40,9 +42,7 @@ foreach ($engines as $engine) {
4042

4143
for ($i = 0; $i < 10_000; $i++) {
4244
if ($engine->generate() !== $engine2->generate()) {
43-
$className = $engine::class;
44-
45-
die("failure: {$className} at {$i}");
45+
die("failure: state differs at {$i}");
4646
}
4747
}
4848
}
@@ -51,4 +51,6 @@ die('success');
5151

5252
?>
5353
--EXPECT--
54+
User64
55+
User32
5456
success

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ try {
1616

1717
for ($i = 0; $i < 10_000; $i++) {
1818
if ($engine->generate() !== $referenceEngine->generate()) {
19-
die('failure: state changed');
19+
die("failure: state differs at {$i}");
2020
}
2121
}
2222

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ $engines[] = new PcgOneseq128XslRr64(1234);
2626
$engines[] = new Xoshiro256StarStar(1234);
2727

2828
foreach ($engines as $engine) {
29+
echo $engine::class, PHP_EOL;
30+
2931
$native_engine = clone $engine;
3032
$user_engine = new WrapperEngine(clone $engine);
3133

3234
for ($i = 0; $i < 10_000; $i++) {
3335
if ($native_engine->generate() !== $user_engine->generate()) {
34-
$className = $engine::class;
35-
die("failure: {$className} at {$i}");
36+
die("failure: state differs at {$i}");
3637
}
3738
}
3839
}
@@ -41,4 +42,7 @@ die('success');
4142

4243
?>
4344
--EXPECT--
45+
Random\Engine\Mt19937
46+
Random\Engine\PcgOneseq128XslRr64
47+
Random\Engine\Xoshiro256StarStar
4448
success

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ Random: Engine: Xoshiro256StarStar: The seed parameter must work as expected
66
use Random\Engine\Xoshiro256StarStar;
77

88
echo "Random integer seed", PHP_EOL;
9-
$engine = new Xoshiro256StarStar(\random_int(\PHP_INT_MIN, \PHP_INT_MAX));
9+
$engine = new Xoshiro256StarStar(random_int(PHP_INT_MIN, PHP_INT_MAX));
1010
echo PHP_EOL, PHP_EOL;
1111

1212
echo "Random string seed", PHP_EOL;
13-
$engine = new Xoshiro256StarStar(\random_bytes(32));
13+
$engine = new Xoshiro256StarStar(random_bytes(32));
1414
echo PHP_EOL, PHP_EOL;
1515

1616
echo "Invalid data type", PHP_EOL;
1717
try {
1818
$engine = new Xoshiro256StarStar(1.0);
19-
} catch (\Throwable $e) {
19+
} catch (Throwable $e) {
2020
echo $e->getMessage(), PHP_EOL;
2121
}
2222
echo PHP_EOL, PHP_EOL;
2323

2424
echo "Invalid string seed length", PHP_EOL;
2525
try {
2626
$engine = new Xoshiro256StarStar('foobar');
27-
} catch (\Throwable $e) {
27+
} catch (Throwable $e) {
2828
echo $e->getMessage(), PHP_EOL;
2929
}
3030
echo PHP_EOL, PHP_EOL;
3131

3232
echo "Null seed", PHP_EOL;
3333
try {
34-
$engine = new Random\Engine\Xoshiro256StarStar(\str_repeat("\x00", 32));
35-
} catch (\Throwable $e) {
34+
$engine = new Xoshiro256StarStar(str_repeat("\x00", 32));
35+
} catch (Throwable $e) {
3636
echo $e->getMessage(), PHP_EOL;
3737
}
3838
echo PHP_EOL, PHP_EOL;

0 commit comments

Comments
 (0)