diff --git a/questiontestrun.php b/questiontestrun.php index 8f0259292e841db10db0faf6dc8dbfb94dc4e6ee..1ceec928f098cc94e85282290366d415d4e38f68 100644 --- a/questiontestrun.php +++ b/questiontestrun.php @@ -203,10 +203,12 @@ if (empty($testscases) && $canedit) { } if (empty($testscases)) { + echo "\n<hr/>\n"; $defaulttest = stack_bulk_tester::create_default_test($question); $defaulttestresult = $defaulttest->test_question($questionid, $seed, $context); echo stack_string('runquestiontests_explanation'); echo $defaulttestresult->html_output($question, stack_string('runquestiontests_example')); + echo "\n<hr/>\n"; } $deployfeedback = optional_param('deployfeedback', null, PARAM_TEXT); diff --git a/stack/bulktester.class.php b/stack/bulktester.class.php index b9152c5e84f1ac2d7834fd722230afcf0cf45516..83c91487d886f0ee50deba680f0efe4508554413 100644 --- a/stack/bulktester.class.php +++ b/stack/bulktester.class.php @@ -451,7 +451,7 @@ class stack_bulk_tester { } if (!$tests) { - $defaulttest = stack_bulk_tester::create_default_test($question); + $defaulttest = self::create_default_test($question); $defaulttestresult = $defaulttest->test_question($qid, $seed, $context); if ($defaulttestresult->passed()) { $ok = true; diff --git a/stack/cas/parsingrules/033_no_extra_evaluation.filter.php b/stack/cas/parsingrules/033_no_extra_evaluation.filter.php index 9f6061144f91f1df1a6c27017c4c690f6866a47e..6bbd683bf9a318a453b3e3937c53f29aeb0d3594 100644 --- a/stack/cas/parsingrules/033_no_extra_evaluation.filter.php +++ b/stack/cas/parsingrules/033_no_extra_evaluation.filter.php @@ -25,15 +25,14 @@ class stack_ast_filter_033_no_extra_evaluation implements stack_cas_astfilter { public function filter(MP_Node $ast, array &$errors, array &$answernotes, stack_cas_security $identifierrules): MP_Node { $process = function($node) use (&$errors, &$answernotes) { - if ($node instanceof MP_PrefixOp && - $node->op === "''") { - $node->position['invalid'] = true; - if (array_search('Illegal_extraevaluation', $answernotes) === false) { - $answernotes[] = 'Illegal_extraevaluation'; - $errors[] = stack_string('Illegal_extraevaluation'); - } + if ($node instanceof MP_PrefixOp && $node->op === "''") { + $node->position['invalid'] = true; + if (array_search('Illegal_extraevaluation', $answernotes) === false) { $answernotes[] = 'Illegal_extraevaluation'; + $errors[] = stack_string('Illegal_extraevaluation'); } + $answernotes[] = 'Illegal_extraevaluation'; + } return true; }; $ast->callbackRecurse($process); diff --git a/tests/castext_test.php b/tests/castext_test.php index 11f2ab97da009d17ed39d282773942f69eddb085..89c22f15420aa03d66996798ac307e32b10c094a 100644 --- a/tests/castext_test.php +++ b/tests/castext_test.php @@ -842,7 +842,7 @@ class castext_test extends qtype_stack_testcase { $cs2->add_statement($at1); $cs2->instantiate(); - $this->assertEquals('\({3\cdot x^2}\), \({-4.000}\), \({-4.000}\), \({3}\), \({1}\)', + $this->assertEquals('\({3\cdot x^2}\), \({-4.000}\), \({-4.000}\), \({3}\), \({1}\)', $at1->get_rendered()); }