Merge pull request #5 from catalyst/issue14-update-for-merge-conflict-401

Issue 14: Fix failing phpunit due to unpredictable sorting

Author: vithushau

lib.php

@@ -57,6 +57,7 @@ function block_grade_me_query_suffix($mod) {
         $maxtimesubmitted = time() - ((int)$maxage * DAYSECS);
         $query .= " WHERE allitems.timesubmitted >= " . $maxtimesubmitted;
     }
+    $query .= ' ORDER BY submissionid ASC';
     return $query;
 }
 

tests/grade_me_test.php

@@ -460,8 +460,7 @@ public function test_query_quiz($datafile, $expected) {
         $this->update_quiz_ngrade();
 
         list($sql, $params) = block_grade_me_query_quiz(array($users[0]->id));
-        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix('quiz') .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix('quiz');
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));
@@ -671,8 +670,7 @@ public function standard_query_tests($datafile, $expected, $suffix) {
 
         $dbfunction = 'block_grade_me_query_' . $suffix;
         list($sql, $params) = $dbfunction(array($users[0]->id));
-        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix($suffix) .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix($suffix);
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));