Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ParserTestRunner: move more common code into ::runTest()

Browse source 
Move the TestRecorder calls into runTest() to DRY out the parsoid and
legacy test runners a bit.

Change-Id: Ice91811c9106f07a95a0f8910f439eb784b35d7e
This commit is contained in:
C. Scott Ananian 2022-06-03 17:44:26 -04:00
parent 760c2fe94b
commit d522079c9f
1 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
tests/parser/ParserTestRunner.php
View file

@ -919,18 +919,8 @@ class ParserTestRunner {
$ok = true;
$runner = $this;
foreach ( $testFileInfo->testCases as $test ) {
$skip = $this->getTestSkipMessage( $test, $mode );
if ( $skip ) {
continue;
}
$this->recorder->startTest( $test, $mode );
$result = $this->runTest( $test, $mode );
if ( $result !== false ) {
$ok = $ok && $result->isSuccess();
$this->recorder->record( $result );
} else {
$this->recorder->skipped( $test, $mode, 'SKIP' );
}
$ok = $ok && $result->isSuccess();
}
// Clean up
@ -1046,11 +1036,6 @@ class ParserTestRunner {
$runner = $this;
$testFilter = [ 'regex' => $this->regex ];
foreach ( $testFileInfo->testCases as $t ) {
$skip = $this->getTestSkipMessage( $t, $skipMode );
if ( $skip ) {
continue;
}
$t->testAllModes( $t->computeTestModes( $testModes ), $this->options,
function ( ParserTest $test, string $modeStr, array $options ) use ( $runner, $t, &$ok ) {
// $test could be a clone of $t
@ -1062,20 +1047,8 @@ class ParserTestRunner {
// or a change tree that should be generated
$mode = new ParserTestMode( 'selser-auto', json_decode( $runner->options['changetree'] ) );
}
$this->recorder->startTest( $test, $mode );
// We know this is a parsoid test (because we're in
// ::runParsoidTests) and we've already checked
// ::getTestSkipMessage() so we can dispatch directly to
// ::runParsoidTest() instead of going through the
// ::runTest() dispatcher.
$result = $this->runParsoidTest( $test, $mode );
if ( $result !== false ) {
$ok = $ok && $result->isSuccess();
$this->recorder->record( $result );
} else {
$this->recorder->skipped( $test, $mode, 'SKIP' );
}
$result = $this->runTest( $test, $mode );
$ok = $ok && $result->isSuccess();
}
);
}
@ -1219,11 +1192,16 @@ class ParserTestRunner {
if ( $this->getTestSkipMessage( $test, $mode ) ) {
return false;
}
if ( $mode->isLegacy() ) {
return $this->runLegacyTest( $test, $mode );
$this->recorder->startTest( $test, $mode );
$result = $mode->isLegacy() ?
$this->runLegacyTest( $test, $mode ) :
$this->runParsoidTest( $test, $mode );
if ( $result === false ) {
$this->recorder->skipped( $test, $mode, 'SKIP' );
} else {
return $this->runParsoidTest( $test, $mode );
$this->recorder->record( $result );
}
return $result;
}
/**