Fix remaining bugs with framing and test harness.
This commit is contained in:
parent
084727c586
commit
30622b2aeb
2 changed files with 27 additions and 21 deletions
|
@ -220,7 +220,9 @@ class TestRunner {
|
|||
*/
|
||||
global $eol;
|
||||
foreach($manifests as $manifest) {
|
||||
$this->group($manifest->name);
|
||||
if(property_exists($manifest, 'name')) {
|
||||
$this->group($manifest->name);
|
||||
}
|
||||
$filepath = $manifest->filepath;
|
||||
foreach($manifest->sequence as $test) {
|
||||
// read test input files
|
||||
|
@ -240,7 +242,6 @@ class TestRunner {
|
|||
$result = jsonld_expand($input, $options);
|
||||
}
|
||||
else if(in_array('jld:CompactTest', $type)) {
|
||||
continue;
|
||||
$this->test($test->name);
|
||||
$input = read_test_json($test->input, $filepath);
|
||||
$test->context = read_test_json($test->context, $filepath);
|
||||
|
@ -248,7 +249,6 @@ class TestRunner {
|
|||
$result = jsonld_compact($input, $test->context, $options);
|
||||
}
|
||||
else if(in_array('jld:FrameTest', $type)) {
|
||||
continue;
|
||||
$this->test($test->name);
|
||||
$input = read_test_json($test->input, $filepath);
|
||||
$test->frame = read_test_json($test->frame, $filepath);
|
||||
|
@ -264,6 +264,9 @@ class TestRunner {
|
|||
// check results
|
||||
$this->check($test, $test->expect, $result);
|
||||
}
|
||||
if(property_exists($manifest, 'name')) {
|
||||
$this->ungroup();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -281,6 +284,7 @@ $tr = new TestRunner();
|
|||
$tr->group('JSON-LD');
|
||||
$tr->run($tr->load($options['d']));
|
||||
$tr->ungroup();
|
||||
echo "Done. Total:{$tr->total} Passed:{$tr->passed} Failed:{$tr->failed}$eol";
|
||||
echo "All tests complete.$eol";
|
||||
|
||||
?>
|
||||
/* end of file, omit ?> */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue