MDL-9506 Added raw and final grade objects, plus more work in unit tests.

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index 462be685fc7ab65fdc06083339ad457953e597ae..a899cdea72bfbc9c4a7f7dadf511276b32b911d8 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -37,7 +37,6 @@ class grade_category extends grade_object {
      * @var array $nonfields
      */
     var $nonfields = array('table', 'nonfields');
-
     
     /**
      * The course this category belongs to.
@@ -47,10 +46,23 @@ class grade_category extends grade_object {
     
     /**
      * The category this category belongs to (optional).
-     * @var int $categoryid 
+     * @var int $parent 
      */
-    var $categoryid;
-    
+    var $parent;
+   
+    /**
+     * The number of parents this category has.
+     * @var int $depth
+     */
+    var $depth = 0;
+
+    /**
+     * Shows the hierarchical path for this category as /1/2/3 (like course_categories), the last number being
+     * this category's autoincrement ID number.
+     * @var string $path
+     */
+    var $path;
+
     /**
      * The name of this category.
      * @var string $fullname
@@ -87,6 +99,26 @@ class grade_category extends grade_object {
      */
     var $children;
 
+    /**
+     * Constructor. Extends the basic functionality defined in grade_object.
+     * @param array $params Can also be a standard object.
+     * @param boolean $fetch Wether or not to fetch the corresponding row from the DB.
+     */
+    function grade_category($params=NULL, $fetch=true) {
+        $this->grade_object($params, $fetch);
+    }
+
+    
+    /**
+     * Builds this category's path string based on its parents (if any) and its own id number.
+     * This is typically done just before inserting this object in the DB for the first time,
+     * or when a new parent is added or changed.
+     * @todo implement
+     */
+    function build_path() {
+    
+    }
+
 
     /**
      * Finds and returns a grade_category object based on 1-3 field values.
@@ -115,8 +147,7 @@ class grade_category extends grade_object {
         } else {
             return false;
         }
-    }
-
+    } 
 }
 
 ?>

diff --git a/lib/grade/grade_grades_final.php b/lib/grade/grade_grades_final.php
new file mode 100644 (file)
index 0000000..c39abec
--- /dev/null
+++ b/lib/grade/grade_grades_final.php
@@ -0,0 +1,116 @@
+<?php // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-2003  Martin Dougiamas  http://dougiamas.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once('grade_object.php');
+
+class grade_grades_final extends grade_object {
+    /**
+     * DB Table (used by grade_object).
+     * @var string $table
+     */
+    var $table = 'grade_grades_final';
+    
+    /**
+     * Array of class variables that are not part of the DB table fields
+     * @var array $nonfields
+     */
+    var $nonfields = array('table', 'nonfields');
+    
+    /**
+     * The id of the grade_item this final grade belongs to.
+     * @var int $itemid
+     */
+    var $itemid;
+    
+    /**
+     * The id of the user this final grade belongs to.
+     * @var int $userid
+     */
+    var $userid;
+    
+    /**
+     * Date until which to hide this grade_item. If null, 0 or false, grade_item is not hidden. Hiding prevents viewing.
+     * @var int $hidden
+     */
+    var $hidden;
+    
+    /**
+     * Date until which to lock this grade_item. If null, 0 or false, grade_item is not locked. Locking prevents updating.
+     * @var int $locked
+     */
+    var $locked = false;
+    
+    /**
+     * 0 if not exported, > 1 is the last exported date.
+     * @var int $exported
+     */
+    var $exported;
+
+    /**
+     * The userid of the person who last modified this grade.
+     * @var int $usermodified
+     */
+    var $usermodified;
+
+    /**
+     * Constructor. Extends the basic functionality defined in grade_object.
+     * @param array $params Can also be a standard object.
+     * @param boolean $fetch Wether or not to fetch the corresponding row from the DB.
+     */
+    function grade_grades_final($params=NULL, $fetch=true) {
+        $this->grade_object($params, $fetch);
+    }
+
+
+    /**
+     * Finds and returns a grade_grades_final object based on 1-3 field values.
+     *
+     * @param string $field1
+     * @param string $value1
+     * @param string $field2
+     * @param string $value2
+     * @param string $field3
+     * @param string $value3
+     * @param string $fields
+     * @return object grade_category object or false if none found.
+     */
+    function fetch($field1, $value1, $field2='', $value2='', $field3='', $value3='', $fields="*") { 
+        if ($object = get_record('grade_grades_final', $field1, $value1, $field2, $value2, $field3, $value3, $fields)) {
+            if (!isset($this)) {
+                $object = new grade_grades_final($object);
+                return $object;
+            } else {
+                foreach ($object as $param => $value) {
+                    $this->$param = $value;
+                }
+                return $this;
+            }
+        } else {
+            return false;
+        }
+    } 
+}
+
+?>

diff --git a/lib/grade/grade_grades_raw.php b/lib/grade/grade_grades_raw.php
new file mode 100644 (file)
index 0000000..dc054f0
--- /dev/null
+++ b/lib/grade/grade_grades_raw.php
@@ -0,0 +1,129 @@
+<?php // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-2003  Martin Dougiamas  http://dougiamas.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once('grade_object.php');
+
+class grade_grades_raw extends grade_object {
+    /**
+     * DB Table (used by grade_object).
+     * @var string $table
+     */
+    var $table = 'grade_grades_raw';
+    
+    /**
+     * Array of class variables that are not part of the DB table fields
+     * @var array $nonfields
+     */
+    var $nonfields = array('table', 'nonfields');
+    
+    /**
+     * The id of the grade_item this raw grade belongs to.
+     * @var int $itemid
+     */
+    var $itemid;
+    
+    /**
+     * The id of the user this raw grade belongs to.
+     * @var int $userid
+     */
+    var $userid;
+    
+    /**
+     * The grade value of this raw grade, if such was provided by the module.
+     * @var float $gradevalue
+     */
+    var $gradevalue;
+   
+    /**
+     * The scale value of this raw grade, if such was provided by the module.
+     * @var int $scalevalue
+     */
+    var $scalevalue;
+
+    /**
+     * The maximum allowable grade when this grade was created.
+     * @var float $grademax
+     */
+    var $grademax;
+
+    /**
+     * The minimum allowable grade when this grade was created.
+     * @var float $grademin
+     */
+    var $grademin;
+
+    /**
+     * id of the scale, if this grade is based on a scale.
+     * @var int $scaleid
+     */
+    var $scaleid;
+    
+    /**
+     * The userid of the person who last modified this grade.
+     * @var int $usermodified
+     */
+    var $usermodified;
+
+    /**
+     * Constructor. Extends the basic functionality defined in grade_object.
+     * @param array $params Can also be a standard object.
+     * @param boolean $fetch Wether or not to fetch the corresponding row from the DB.
+     */
+    function grade_grades_raw($params=NULL, $fetch=true) {
+        $this->grade_object($params, $fetch);
+    }
+
+
+    /**
+     * Finds and returns a grade_grades_raw object based on 1-3 field values.
+     *
+     * @param string $field1
+     * @param string $value1
+     * @param string $field2
+     * @param string $value2
+     * @param string $field3
+     * @param string $value3
+     * @param string $fields
+     * @return object grade_category object or false if none found.
+     */
+    function fetch($field1, $value1, $field2='', $value2='', $field3='', $value3='', $fields="*")
+    { 
+        if ($object = get_record('grade_grades_raw', $field1, $value1, $field2, $value2, $field3, $value3, $fields)) {
+            if (!isset($this)) {
+                $object = new grade_grades_raw($object);
+                return $object;
+            } else {
+                foreach ($object as $param => $value) {
+                    $this->$param = $value;
+                }
+                return $this;
+            }
+        } else {
+            return false;
+        }
+    } 
+}
+
+?>

diff --git a/lib/simpletest/testgradelib.php b/lib/simpletest/testgradelib.php
index 93233bd5fe5841e689c97f0828ed5c4af5d5c959..87d0c4ea1355e4258ab312b084d4aedbb29b1bc0 100644 (file)
--- a/lib/simpletest/testgradelib.php
+++ b/lib/simpletest/testgradelib.php
@@ -39,6 +39,14 @@ require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/gradelib.php');
 require_once($CFG->libdir . '/dmllib.php');
 
+/**
+ * A cleanup of the tables is a good idea before we start, in case the last unit test
+ * crashed before running its tearDown method.
+ */
+delete_records_select('grade_categories', 'fullname LIKE "%unittest%"');
+delete_records_select('grade_items', 'itemname LIKE "%unittest%"');
+delete_records_select('grade_calculation', 'calculation LIKE "%unittest%"');
+
 class gradelib_test extends UnitTestCase {
    
     /**
@@ -74,8 +82,7 @@ class gradelib_test extends UnitTestCase {
      * (meaning they should run on a brand new site). This means several items of
      * data have to be artificially inseminated (:-) in the DB.
      */
-    function setUp() 
-    {
+    function setUp() {
         foreach ($this->tables as $table) {
             $function = "load_$table";
             $this->$function();
@@ -85,8 +92,7 @@ class gradelib_test extends UnitTestCase {
     /**
      * Delete temporary entries from the database
      */
-    function tearDown() 
-    {
+    function tearDown() {
         foreach ($this->tables as $table) {
             foreach ($this->$table as $object) {
                 delete_records($table, 'id', $object->id);
@@ -102,8 +108,7 @@ class gradelib_test extends UnitTestCase {
     /**
      * Load grade_category data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_categories()
-    {
+    function load_grade_categories() {
         $grade_category = new stdClass();
         
         $grade_category->fullname    = 'unittestcategory1';
@@ -123,8 +128,7 @@ class gradelib_test extends UnitTestCase {
     /**
      * Load grade_item data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_items()
-    {
+    function load_grade_items() {
         $grade_item = new stdClass();
 
         $grade_item->courseid = $this->courseid;
@@ -133,6 +137,8 @@ class gradelib_test extends UnitTestCase {
         $grade_item->itemtype = 'mod';
         $grade_item->itemmodule = 'quiz';
         $grade_item->iteminstance = 1;
+        $grade_item->grademax = 137;
+        $grade_item->itemnumber = 1;
         $grade_item->iteminfo = 'Grade item used for unit testing';
         $grade_item->timecreated = mktime();
         $grade_item->timemodified = mktime();
@@ -148,6 +154,7 @@ class gradelib_test extends UnitTestCase {
         $grade_item->itemtype = 'import';
         $grade_item->itemmodule = 'assignment';
         $grade_item->iteminstance = 2;
+        $grade_item->itemnumber = null;
         $grade_item->iteminfo = 'Grade item used for unit testing';
         $grade_item->locked = mktime() + 240000;
         $grade_item->timecreated = mktime();
@@ -165,6 +172,7 @@ class gradelib_test extends UnitTestCase {
         $grade_item->itemtype = 'mod';
         $grade_item->itemmodule = 'forum';
         $grade_item->iteminstance = 3;
+        $grade_item->itemnumber = 3;
         $grade_item->iteminfo = 'Grade item used for unit testing';
         $grade_item->timecreated = mktime();
         $grade_item->timemodified = mktime();
@@ -177,11 +185,11 @@ class gradelib_test extends UnitTestCase {
     /**
      * Load grade_calculation data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_calculations()
-    {
+    function load_grade_calculations() {
+        // Calculation for grade_item 1
         $grade_calculation = new stdClass();
         $grade_calculation->itemid = $this->grade_items[0]->id;
-        $grade_calculation->calculation = 'MEAN([unittestgradeitem2], [unittestgradeitem3])';
+        $grade_calculation->calculation = '[unittestgradeitem1] * 1.4 - 3';
         $grade_calculation->timecreated = mktime();
         $grade_calculation->timemodified = mktime();
         
@@ -189,16 +197,52 @@ class gradelib_test extends UnitTestCase {
             $this->grade_calculations[] = $grade_calculation;
             $this->grade_items[0]->calculation = $grade_calculation;
         } 
+        
+        // Calculation for grade_item 2
+        $grade_calculation = new stdClass();
+        $grade_calculation->itemid = $this->grade_items[1]->id;
+        $grade_calculation->calculation = '[unittestgradeitem2] + 3';
+        $grade_calculation->timecreated = mktime();
+        $grade_calculation->timemodified = mktime();
+        
+        if ($grade_calculation->id = insert_record('grade_calculations', $grade_calculation)) {
+            $this->grade_calculations[] = $grade_calculation;
+            $this->grade_items[1]->calculation = $grade_calculation;
+        } 
+        
+        // Calculation for grade_item 3
+        $grade_calculation = new stdClass();
+        $grade_calculation->itemid = $this->grade_items[2]->id;
+        $grade_calculation->calculation = '[unittestgradeitem3] / 2 + 40';
+        $grade_calculation->timecreated = mktime();
+        $grade_calculation->timemodified = mktime();
+        
+        if ($grade_calculation->id = insert_record('grade_calculations', $grade_calculation)) {
+            $this->grade_calculations[] = $grade_calculation;
+            $this->grade_items[2]->calculation = $grade_calculation;
+        } 
     }
 
     /**
      * Load grade_grades_raw data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_grades_raw()
-    {
+    function load_grade_grades_raw() {
+        // Grades for grade_item 1
+
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[0]->id;
+        $grade_raw->userid = 1;
+        $grade_raw->gradevalue = 72;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+        
         $grade_raw = new stdClass();
         $grade_raw->itemid = $this->grade_items[0]->id;
-        $grade_raw->userid = $this->userid;
+        $grade_raw->userid = 2;
         $grade_raw->gradevalue = 78;
         $grade_raw->timecreated = mktime();
         $grade_raw->timemodified = mktime();
@@ -206,46 +250,225 @@ class gradelib_test extends UnitTestCase {
         if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
             $this->grade_grades_raw[] = $grade_raw;
         }
+        
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[0]->id;
+        $grade_raw->userid = 3;
+        $grade_raw->gradevalue = 68;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+
+        // Grades for grade_item 2
+
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[1]->id;
+        $grade_raw->userid = 1;
+        $grade_raw->gradevalue = 66;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+        
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[1]->id;
+        $grade_raw->userid = 2;
+        $grade_raw->gradevalue = 84;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+        
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[1]->id;
+        $grade_raw->userid = 3;
+        $grade_raw->gradevalue = 91;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+
+        // Grades for grade_item 3
+
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[2]->id;
+        $grade_raw->userid = 1;
+        $grade_raw->gradevalue = 61;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+        
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[2]->id;
+        $grade_raw->userid = 2;
+        $grade_raw->gradevalue = 81;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
+        
+        $grade_raw = new stdClass();
+        $grade_raw->itemid = $this->grade_items[2]->id;
+        $grade_raw->userid = 3;
+        $grade_raw->gradevalue = 49;
+        $grade_raw->timecreated = mktime();
+        $grade_raw->timemodified = mktime();
+
+        if ($grade_raw->id = insert_record('grade_grades_raw', $grade_raw)) {
+            $this->grade_grades_raw[] = $grade_raw;
+        }
     }
 
     /**
      * Load grade_grades_final data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_grades_final()
-    {
+    function load_grade_grades_final() {
+        // Grades for grade_item 1
+
         $grade_final = new stdClass();
         $grade_final->itemid = $this->grade_items[0]->id;
-        $grade_final->userid = $this->userid;
-        $grade_final->gradevalue = 83;
+        $grade_final->userid = 1;
+        $grade_final->gradevalue = 97.8;
         $grade_final->timecreated = mktime();
         $grade_final->timemodified = mktime();
 
         if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
             $this->grade_grades_final[] = $grade_final;
         } 
+        
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[0]->id;
+        $grade_final->userid = 2;
+        $grade_final->gradevalue = 106.2;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = true; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        }
+
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[0]->id;
+        $grade_final->userid = 3;
+        $grade_final->gradevalue = 92.2;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = false; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        } 
+        
+        // Grades for grade_item 2
+
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[1]->id;
+        $grade_final->userid = 1;
+        $grade_final->gradevalue = 69;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = true; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        } 
+        
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[1]->id;
+        $grade_final->userid = 2;
+        $grade_final->gradevalue = 87;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = true; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        }
+
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[1]->id;
+        $grade_final->userid = 3;
+        $grade_final->gradevalue = 94;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = false; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        } 
+        
+        // Grades for grade_item 3
+
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[2]->id;
+        $grade_final->userid = 1;
+        $grade_final->gradevalue = 70.5;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = true; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        } 
+        
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[2]->id;
+        $grade_final->userid = 2;
+        $grade_final->gradevalue = 80.5;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = true; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        }
+
+        $grade_final = new stdClass();
+        $grade_final->itemid = $this->grade_items[2]->id;
+        $grade_final->userid = 3;
+        $grade_final->gradevalue = 64.5;
+        $grade_final->timecreated = mktime();
+        $grade_final->timemodified = mktime();
+        $grade_final->locked = false; 
+
+        if ($grade_final->id = insert_record('grade_grades_final', $grade_final)) {
+            $this->grade_grades_final[] = $grade_final;
+        } 
     }
     
     /**
      * Load grade_grades_text data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_grades_text()
-    {
+    function load_grade_grades_text() {
         
     }
     
     /**
      * Load grade_outcome data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_outcomes()
-    {
+    function load_grade_outcomes() {
 
     }
 
     /**
      * Load grade_history data into the database, and adds the corresponding objects to this class' variable.
      */
-    function load_grade_history()
-    {
+    function load_grade_history() {
 
     }
 
@@ -255,16 +478,14 @@ class gradelib_test extends UnitTestCase {
 
 // API FUNCTIONS
 
-    function test_grade_get_items()
-    {
+    function test_grade_get_items() {
         $grade_items = grade_get_items($this->courseid);
 
         $this->assertTrue(is_array($grade_items)); 
         $this->assertEqual(count($grade_items), 3);
     }
-
-    function test_grade_create_item()
-    {
+    
+    function test_grade_create_item() {
         $params = new stdClass();
 
         $params->courseid = $this->courseid;
@@ -284,8 +505,7 @@ class gradelib_test extends UnitTestCase {
         $this->grade_items[] = $params;
     }
 
-    function test_grade_create_category()
-    {
+    function test_grade_create_category() {
         $grade_category = new stdClass();
         $grade_category->timecreated = mktime();
         $grade_category->timemodified = mktime();
@@ -297,18 +517,16 @@ class gradelib_test extends UnitTestCase {
         $this->grade_categories[] = $grade_category;
     }
 
-    function test_grade_is_locked()
-    {
+    function test_grade_is_locked() {
         $grade_item = $this->grade_items[0];
-        $this->assertFalse(grade_is_locked($grade_item->itemtype, $grade_item->itemmodule, $grade_item->iteminstance));
+        $this->assertFalse(grade_is_locked($grade_item->itemtype, $grade_item->itemmodule, $grade_item->iteminstance, $grade_item->itemnumber));
         $grade_item = $this->grade_items[1];
-        $this->assertTrue(grade_is_locked($grade_item->itemtype, $grade_item->itemmodule, $grade_item->iteminstance)); 
+        $this->assertTrue(grade_is_locked($grade_item->itemtype, $grade_item->itemmodule, $grade_item->iteminstance, $grade_item->itemnumber)); 
     }
 
 // GRADE_ITEM OBJECT
 
-    function test_grade_item_construct()
-    { 
+    function test_grade_item_construct() { 
         $params = new stdClass();
 
         $params->courseid = $this->courseid;
@@ -326,8 +544,7 @@ class gradelib_test extends UnitTestCase {
         $this->assertEqual($params->itemmodule, $grade_item->itemmodule);
     }
 
-    function test_grade_item_insert()
-    {
+    function test_grade_item_insert() {
         $grade_item = new grade_item();
 
         $grade_item->courseid = $this->courseid;
@@ -346,15 +563,13 @@ class gradelib_test extends UnitTestCase {
         $this->grade_items[] = $grade_item; 
     }
 
-    function test_grade_item_delete()
-    {
+    function test_grade_item_delete() {
         $grade_item = new grade_item($this->grade_items[0]);
         $this->assertTrue($grade_item->delete());
         $this->assertFalse(get_record('grade_items', 'id', $grade_item->id));
     }
 
-    function test_grade_item_update()
-    {
+    function test_grade_item_update() {
         $grade_item = new grade_item($this->grade_items[0]);
         $grade_item->iteminfo = 'Updated info for this unittest grade_item';
         $this->assertTrue($grade_item->update());
@@ -362,8 +577,7 @@ class gradelib_test extends UnitTestCase {
         $this->assertEqual($grade_item->iteminfo, $iteminfo);
     }
 
-    function test_grade_item_set_timecreated()
-    {
+    function test_grade_item_set_timecreated() {
         $grade_item = new grade_item($this->grade_items[0]);
         $timestamp = mktime();
         $grade_item->set_timecreated();
@@ -371,100 +585,102 @@ class gradelib_test extends UnitTestCase {
         $this->assertEqual($grade_item->timecreated, get_field('grade_items', 'timecreated', 'id', $grade_item->id));
     }
 
-    function test_grade_item_get_by_id()
-    {
-        $grade_item = grade_item::get_by_id($this->grade_items[0]->id, true);
-        $this->assertEqual($this->grade_items[0]->id, $grade_item->id);
-        $this->assertEqual($this->grade_items[0]->iteminfo, $grade_item->iteminfo); 
-    }
-
-    function test_grade_item_get_record()
-    {
-        $grade_item = grade_item::get_record(true, 'id', $this->grade_items[0]->id);
+    function test_grade_item_fetch() {
+        $grade_item = grade_item::fetch('id', $this->grade_items[0]->id);
         $this->assertEqual($this->grade_items[0]->id, $grade_item->id);
         $this->assertEqual($this->grade_items[0]->iteminfo, $grade_item->iteminfo); 
         
-        $grade_item = grade_item::get_record(true, 'itemtype', $this->grade_items[1]->itemtype, 'itemmodule', $this->grade_items[1]->itemmodule);
+        $grade_item = grade_item::fetch('itemtype', $this->grade_items[1]->itemtype, 'itemmodule', $this->grade_items[1]->itemmodule);
         $this->assertEqual($this->grade_items[1]->id, $grade_item->id);
         $this->assertEqual($this->grade_items[1]->iteminfo, $grade_item->iteminfo); 
     }
 
-    function test_grade_item_get_records_select()
-    {
+    function test_grade_item_fetch_all_using_this() {
         $grade_item = new grade_item();
         $grade_item->itemtype = 'mod';
-        $grade_items = $grade_item->get_records_select();
+        $grade_items = $grade_item->fetch_all_using_this();
         $this->assertEqual(2, count($grade_items));
         $first_grade_item = reset($grade_items);
         $this->assertEqual($this->grade_items[0]->id, $first_grade_item->id);
     }
+    
+    /**
+     * Retrieve all raw scores for a given grade_item.
+     */
+    function test_grade_item_get_all_raws() {
+        
+    }
+
+    /**
+     * Retrieve the raw score for a specific userid.
+     */
+    function test_grade_item_get_raw() { 
+    }
 
-    function test_grade_item_get_raw()
-    {
+    
+    /**
+     * Retrieve all final scores for a given grade_item.
+     */
+    function test_grade_item_get_all_finals() {
 
     }
 
-    function test_grade_item_get_final()
-    {
+    
+    /**
+     * Retrieve all final scores for a specific userid.
+     */
+    function test_grade_item_get_final() {
 
     }
 
-    function test_grade_item_get_calculation()
-    {
+    function test_grade_item_get_calculation() {
         $grade_item = new grade_item($this->grade_items[0]);
         $grade_calculation = $grade_item->get_calculation();
         $this->assertEqual($this->grade_calculations[0]->id, $grade_calculation->id);
     }
 
-    function test_grade_item_set_calculation()
-    {
+    function test_grade_item_set_calculation() {
         $grade_item = new grade_item($this->grade_items[1]);
         $calculation = 'SUM([unittestgradeitem1], [unittestgradeitem3])';
         $grade_item->set_calculation($calculation);
         $new_calculation = $grade_item->get_calculation();
+        $this->grade_calculations[] = $new_calculation;
 
         $this->assertEqual($calculation, $new_calculation->calculation);
     }
 
-    function test_grade_item_get_category()
-    {
+    function test_grade_item_get_category() {
 
     }
 
 // GRADE_CATEGORY OBJECT
 
-    function test_grade_category_construct()
-    {
+    function test_grade_category_construct() {
 
     }
 
-    function test_grade_category_insert()
-    {
+    function test_grade_category_insert() {
 
     }
 
-    function test_grade_category_update()
-    {
+    function test_grade_category_update() {
 
     }
 
-    function test_grade_category_delete()
-    {
+    function test_grade_category_delete() {
 
     }
 
-    function test_grade_category_get_by_id()
-    {
-
-    }
-
-    function test_grade_category_get_record()
-    {
+    function test_grade_category_fetch() {
 
     } 
 
 // GRADE_CALCULATION OBJECT
 
+// SCENARIOS: define use cases here by defining tests and implementing code until the tests pass.
+
+    /**
+     *
 }
 
 ?>