MDL-10065 move lib/simpletest/grade/simpletest elsewhere

+ fixed categroy locking unittest and minor problem with return value

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index b192d294072673236a6935e093c5e9028a94e0da..30a0fde2c97fce72a3bca8adbd36e094cc264db2 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -905,23 +905,19 @@ class grade_category extends grade_object {
      * Sets the grade_item's locked variable and updates the grade_item.
      * Method named after grade_item::set_locked().
      * @param int $locked 0, 1 or a timestamp int(10) after which date the item will be locked.
-     * @return boolean success
+     * @return boolean success if categroy locked (not all children mayb be locked though)
      */
     function set_locked($lockedstate) {
         $this->load_grade_item();
         $result = $this->grade_item->set_locked($lockedstate);
         if ($children = grade_item::fetch_all(array('categoryid'=>$this->id))) {
             foreach($children as $child) {
-                if (!$child->set_locked($lockedstate)) {
-                    $result = false;
-                }
+                $child->set_locked($lockedstate);
             }
         }
         if ($children = grade_category::fetch_all(array('parent'=>$this->id))) {
             foreach($children as $child) {
-                if (!$child->set_locked($lockedstate)) {
-                    $result = false;
-                }
+                $child->set_locked($lockedstate);
             }
         }
         return $result;

diff --git a/lib/simpletest/grade/simpletest/testgradecategory.php b/lib/grade/simpletest/testgradecategory.php
similarity index 98%
rename from lib/simpletest/grade/simpletest/testgradecategory.php
rename to lib/grade/simpletest/testgradecategory.php
index b42d48a12511485a8a567e303f6da421731c2b9d..aaa69bd845b6788d3d5164b968cc00e922debc20 100755 (executable)
--- a/lib/simpletest/grade/simpletest/testgradecategory.php
+++ b/lib/grade/simpletest/testgradecategory.php
@@ -289,8 +289,7 @@ class grade_category_test extends grade_test {
     function test_grade_category_set_locked() {
         $category = new grade_category($this->grade_categories[0]);
         $this->assertTrue(method_exists($category, 'set_locked'));
-        $category->load_grade_item();
-        $this->assertEqual($category->set_locked(1), $category->grade_item->set_locked(1));
+        $this->assertTrue($category->set_locked(1));
     }
 
     function test_grade_category_is_hidden() {
@@ -303,8 +302,9 @@ class grade_category_test extends grade_test {
     function test_grade_category_set_hidden() {
         $category = new grade_category($this->grade_categories[0]);
         $this->assertTrue(method_exists($category, 'set_hidden'));
+        $category->set_hidden(1);
         $category->load_grade_item();
-        $this->assertEqual($category->set_hidden(1), $category->grade_item->set_hidden(1));
+        $this->assertEqual(true, $category->grade_item->is_hidden());
     }
 
     function test_grade_category_has_children() {

diff --git a/lib/simpletest/grade/simpletest/testgradegrades.php b/lib/grade/simpletest/testgradegrades.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradegrades.php
rename to lib/grade/simpletest/testgradegrades.php

diff --git a/lib/simpletest/grade/simpletest/testgradegradestext.php b/lib/grade/simpletest/testgradegradestext.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradegradestext.php
rename to lib/grade/simpletest/testgradegradestext.php

diff --git a/lib/simpletest/grade/simpletest/testgradeitem.php b/lib/grade/simpletest/testgradeitem.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradeitem.php
rename to lib/grade/simpletest/testgradeitem.php

diff --git a/lib/simpletest/grade/simpletest/testgradeoutcome.php b/lib/grade/simpletest/testgradeoutcome.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradeoutcome.php
rename to lib/grade/simpletest/testgradeoutcome.php

diff --git a/lib/simpletest/grade/simpletest/testgradescale.php b/lib/grade/simpletest/testgradescale.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradescale.php
rename to lib/grade/simpletest/testgradescale.php

diff --git a/lib/simpletest/grade/simpletest/testgradetree.php b/lib/grade/simpletest/testgradetree.php
similarity index 100%
rename from lib/simpletest/grade/simpletest/testgradetree.php
rename to lib/grade/simpletest/testgradetree.php