diff --git a/tests/api_tests_stateful_test.php b/tests/api_tests_stateful_test.php index c0fd700500e..2f4d24226c2 100644 --- a/tests/api_tests_stateful_test.php +++ b/tests/api_tests_stateful_test.php @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Stateful. If not, see . +namespace qtype_stack; + defined('MOODLE_INTERNAL') || die(); // Unit tests to check that the requirements of a related software @@ -49,7 +51,7 @@ * @group qtype_stateful * @group qtype_stack_compatibility */ -class api_tests_stateful_test extends qtype_stack_testcase { +class api_tests_stateful_test extends \qtype_stack_testcase { public function test_security_map_path() { $this->assertTrue(file_exists(__DIR__ . '/../stack/cas/security-map.json')); @@ -93,20 +95,20 @@ public function test_stack_utils() { $this->assertTrue(method_exists('stack_utils', 'eliminate_strings')); $this->assertTrue(method_exists('stack_utils', 'list_to_array')); - $this->assertTrue(isset(stack_utils::get_config()->stackmaximaversion)); - $this->assertEquals('"\"foo"', stack_utils::php_string_to_maxima_string('"foo')); - $this->assertEquals('"foo', stack_utils::maxima_string_to_php_string('"\"foo"')); - $this->assertEquals('["","",1+""]', stack_utils::eliminate_strings('["foo","bar",1+"baz"]')); - $this->assertEquals(["foo", "bar", "baz"], stack_utils::all_substring_strings('["foo","bar",1+"baz"]')); + $this->assertTrue(isset(\stack_utils::get_config()->stackmaximaversion)); + $this->assertEquals('"\"foo"', \stack_utils::php_string_to_maxima_string('"foo')); + $this->assertEquals('"foo', \stack_utils::maxima_string_to_php_string('"\"foo"')); + $this->assertEquals('["","",1+""]', \stack_utils::eliminate_strings('["foo","bar",1+"baz"]')); + $this->assertEquals(["foo", "bar", "baz"], \stack_utils::all_substring_strings('["foo","bar",1+"baz"]')); } public function test_maxima_parser_utils() { $this->assertTrue(method_exists('maxima_parser_utils', 'parse')); $this->assertTrue(method_exists('maxima_parser_utils', 'variable_usage_finder')); - $ast = maxima_parser_utils::parse('x:y+sqrt(y)'); + $ast = \maxima_parser_utils::parse('x:y+sqrt(y)'); $update = ['read' => ['z' => true]]; - $usage = maxima_parser_utils::variable_usage_finder($ast, $update); + $usage = \maxima_parser_utils::variable_usage_finder($ast, $update); $this->assertEquals(['z' => true, 'y' => true], $usage['read']); $this->assertEquals(['x' => true], $usage['write']); $this->assertEquals(['sqrt' => true], $usage['calls']); diff --git a/tests/editform_test.php b/tests/editform_test.php index b5f03f6b1e0..39b71a461e4 100644 --- a/tests/editform_test.php +++ b/tests/editform_test.php @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +namespace qtype_stack; + defined('MOODLE_INTERNAL') || die(); global $CFG; @@ -29,22 +31,22 @@ * @group qtype_stack * @covers \qtype_stack_edit_form */ -class editform_test extends qtype_stack_edit_form { +class editform_test extends \qtype_stack_edit_form { public function __construct($questiontext, $specificfeedback) { global $USER; - $syscontext = context_system::instance(); + $syscontext = \context_system::instance(); $category = question_make_default_categories(array($syscontext)); - $fakequestion = new stdClass(); + $fakequestion = new \stdClass(); $fakequestion->qtype = 'stack'; $fakequestion->category = $category->id; $fakequestion->contextid = $syscontext->id; $fakequestion->createdby = $USER->id; $fakequestion->modifiedby = $USER->id; $fakequestion->questiontext = $questiontext; - $fakequestion->options = new stdClass(); + $fakequestion->options = new \stdClass(); $fakequestion->options->specificfeedback = $specificfeedback; - $fakequestion->formoptions = new stdClass(); + $fakequestion->formoptions = new \stdClass(); $fakequestion->formoptions->movecontext = null; $fakequestion->formoptions->repeatelements = true; $fakequestion->inputs = null; @@ -52,9 +54,9 @@ public function __construct($questiontext, $specificfeedback) { if (class_exists('\core_question\local\bank\question_edit_contexts')) { $contexts = new \core_question\local\bank\question_edit_contexts($syscontext); } else { - $contexts = new question_edit_contexts($syscontext); + $contexts = new \question_edit_contexts($syscontext); } - parent::__construct(new moodle_url('/'), $fakequestion, $category, $contexts); + parent::__construct(new \moodle_url('/'), $fakequestion, $category, $contexts); } } @@ -67,31 +69,31 @@ public function __construct($questiontext, $specificfeedback) { * @group qtype_stack * @covers \qtype_stack_edit_form */ -class qtype_stack_edit_form_test extends advanced_testcase { +class qtype_stack_edit_form_test extends \advanced_testcase { protected function get_form($questiontext, $specificfeedback) { $this->setAdminUser(); $this->resetAfterTest(); - return new qtype_stack_edit_form_testable($questiontext, $specificfeedback); + return new \qtype_stack_edit_form_testable($questiontext, $specificfeedback); } public function test_get_input_names_from_question_text_default() { - $form = $this->get_form(qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, - qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK); - $qtype = new qtype_stack(); + $form = $this->get_form(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, + \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK); + $qtype = new \qtype_stack(); $this->assertEquals(array('ans1' => array(1, 1)), - $qtype->get_input_names_from_question_text(qtype_stack_edit_form::DEFAULT_QUESTION_TEXT)); + $qtype->get_input_names_from_question_text(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT)); } public function test_get_prt_names_from_question_default() { - $form = $this->get_form(qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, - qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK); - $qtype = new qtype_stack(); + $form = $this->get_form(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, + \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK); + $qtype = new \qtype_stack(); $this->assertEquals(array('prt1' => 1), - $qtype->get_prt_names_from_question(qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, - qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK)); + $qtype->get_prt_names_from_question(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT, + \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK)); } } diff --git a/tests/restore_logic_test.php b/tests/restore_logic_test.php index 91fd02b890b..0c1f4fcf490 100644 --- a/tests/restore_logic_test.php +++ b/tests/restore_logic_test.php @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Stack. If not, see . +namespace qtype_stack; + defined('MOODLE_INTERNAL') || die(); global $CFG; @@ -26,7 +28,7 @@ * @copyright 2017 The Open University * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class restore_logic_test extends restore_qtype_stack_plugin { +class restore_logic_test extends \restore_qtype_stack_plugin { private $log = ''; public function __construct() { @@ -75,7 +77,7 @@ public function after_execute_question() { * @group qtype_stack * @covers \qtype_stack */ -class qtype_stack_restore_logic_testcase extends advanced_testcase { +class qtype_stack_restore_logic_testcase extends \advanced_testcase { public function test_fix_prt_roots() { global $DB; @@ -93,7 +95,7 @@ public function test_fix_prt_roots() { $DB->set_field('qtype_stack_prt_nodes', 'truenextnode', 7, array('questionid' => $question->id, 'prtname' => 'oddeven', 'nodename' => 0)); - $restoreplugin = new testable_restore_qtype_stack_plugin(); + $restoreplugin = new \testable_restore_qtype_stack_plugin(); $restoreplugin->after_execute_question(); $this->assertStringContainsString('The PRT named "oddeven" is malformed', $restoreplugin->get_log());