diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.expectation b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.expectation
new file mode 100644
index 00000000000..99e8d85db0d
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.expectation
@@ -0,0 +1,10 @@
+
+
+ 20160511
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.test b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.test
new file mode 100644
index 00000000000..830eca68bc9
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/1.test
@@ -0,0 +1,7 @@
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.expectation b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.expectation
new file mode 100644
index 00000000000..b4f21d48205
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.expectation
@@ -0,0 +1,10 @@
+
+
+ 20160511
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.test b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.test
new file mode 100644
index 00000000000..04f3b63eef7
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/2.test
@@ -0,0 +1,7 @@
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.expectation b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.expectation
new file mode 100644
index 00000000000..c61f19d99a3
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.expectation
@@ -0,0 +1,10 @@
+
+
+ 20160511
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.test b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.test
new file mode 100644
index 00000000000..39c46bc57c6
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/3.test
@@ -0,0 +1,7 @@
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.expectation b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.expectation
new file mode 100644
index 00000000000..71070aa82e3
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.expectation
@@ -0,0 +1,7 @@
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.test b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.test
new file mode 100644
index 00000000000..71070aa82e3
--- /dev/null
+++ b/backup/moodle2/tests/fixtures/rewrite_step_backup_file_for_legacy_freeze/4.test
@@ -0,0 +1,7 @@
+
+
+
+ 1
+
+
+
diff --git a/backup/moodle2/tests/restore_gradebook_structure_step_test.php b/backup/moodle2/tests/restore_gradebook_structure_step_test.php
new file mode 100644
index 00000000000..26856de9597
--- /dev/null
+++ b/backup/moodle2/tests/restore_gradebook_structure_step_test.php
@@ -0,0 +1,92 @@
+.
+
+/**
+ * Test for restore_stepslib.
+ *
+ * @package core_backup
+ * @copyright 2016 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
+require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
+require_once($CFG->libdir . '/completionlib.php');
+
+/**
+ * Test for restore_stepslib.
+ *
+ * @package core_backup
+ * @copyright 2016 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_backup_restore_gradebook_structure_step_testcase extends advanced_testcase {
+
+ /**
+ * Provide tests for rewrite_step_backup_file_for_legacy_freeze based upon fixtures.
+ *
+ * @return array
+ */
+ public function rewrite_step_backup_file_for_legacy_freeze_provider() {
+ $fixturesdir = realpath(__DIR__ . '/fixtures/rewrite_step_backup_file_for_legacy_freeze/');
+ $tests = [];
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($fixturesdir),
+ \RecursiveIteratorIterator::LEAVES_ONLY);
+
+ foreach ($iterator as $sourcefile) {
+ $pattern = '/\.test$/';
+ if (!preg_match($pattern, $sourcefile)) {
+ continue;
+ }
+
+ $expectfile = preg_replace($pattern, '.expectation', $sourcefile);
+ $test = array($sourcefile, $expectfile);
+ $tests[basename($sourcefile)] = $test;
+ }
+
+ return $tests;
+ }
+
+ /**
+ * @dataProvider rewrite_step_backup_file_for_legacy_freeze_provider
+ * @param string $source The source file to test
+ * @param string $expected The expected result of the transformation
+ */
+ public function test_rewrite_step_backup_file_for_legacy_freeze($source, $expected) {
+ $restore = $this->getMockBuilder('\restore_gradebook_structure_step')
+ ->setMethods(null)
+ ->disableOriginalConstructor()
+ ->getMock()
+ ;
+
+ // Copy the file somewhere as the rewrite_step_backup_file_for_legacy_freeze will write the file.
+ $dir = make_request_directory(true);
+ $filepath = $dir . DIRECTORY_SEPARATOR . 'file.xml';
+ copy($source, $filepath);
+
+ $rc = new \ReflectionClass('\restore_gradebook_structure_step');
+ $rcm = $rc->getMethod('rewrite_step_backup_file_for_legacy_freeze');
+ $rcm->setAccessible(true);
+ $rcm->invoke($restore, $filepath);
+
+ // Check the result.
+ $this->assertFileEquals($expected, $filepath);
+ }
+}