diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-08-11 18:30:35 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-08-11 18:30:35 +0200 |
| commit | 210310b584a0bd816132efa3d8f1ce082efebf88 (patch) | |
| tree | de0369ecb304899b766a7c8292565497e5148bf9 /tests | |
| parent | 3346609126893799169dc678da732d99d506fb9f (diff) | |
| parent | c12d67cd900514f9752d7bb73928870dbab0a0ce (diff) | |
| download | forums-210310b584a0bd816132efa3d8f1ce082efebf88.tar forums-210310b584a0bd816132efa3d8f1ce082efebf88.tar.gz forums-210310b584a0bd816132efa3d8f1ce082efebf88.tar.bz2 forums-210310b584a0bd816132efa3d8f1ce082efebf88.tar.xz forums-210310b584a0bd816132efa3d8f1ce082efebf88.zip | |
Merge branch 'ticket/14742' into ticket/14742-32x
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/migration/if.php | 4 | ||||
| -rw-r--r-- | tests/dbal/migrator_test.php | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/dbal/migration/if.php b/tests/dbal/migration/if.php index 98a66526ed..481250ea77 100644 --- a/tests/dbal/migration/if.php +++ b/tests/dbal/migration/if.php @@ -36,13 +36,13 @@ class phpbb_dbal_migration_if extends \phpbb\db\migration\migration { global $migrator_test_if_true_failed; - $migrator_test_if_true_failed = false; + $migrator_test_if_true_failed = !$migrator_test_if_true_failed; } function test_false() { global $migrator_test_if_false_failed; - $migrator_test_if_false_failed = true; + $migrator_test_if_false_failed = !$migrator_test_if_false_failed; } } diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 48c99ad1d0..f7275a4bbe 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -154,6 +154,14 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertFalse($migrator_test_if_true_failed, 'True test failed'); $this->assertFalse($migrator_test_if_false_failed, 'False test failed'); + + while ($this->migrator->migration_state('phpbb_dbal_migration_if') !== false) + { + $this->migrator->revert('phpbb_dbal_migration_if'); + } + + $this->assertFalse($migrator_test_if_true_failed, 'True test after revert failed'); + $this->assertFalse($migrator_test_if_false_failed, 'False test after revert failed'); } public function test_recall() |