Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skod…

…ak/moodle
ds125v · Mar 20, 2012 · 23dfb50 · 23dfb50
2 parents e053583 + c2daa41
commit 23dfb50
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/lib/form/simpletest/testduration.php b/lib/form/simpletest/testduration.php
@@ -36,7 +36,7 @@
  * Unit tests for MoodleQuickForm_duration
  *
  * Contains test cases for testing MoodleQuickForm_duration
- * 
+ *
  * @package    core_form
  * @category   unittest
  * @copyright  2009 Tim Hunt
@@ -107,16 +107,24 @@ function test_seconds_to_unit() {
     function test_exportValue() {
         $el = new MoodleQuickForm_duration('testel');
         $el->_createElements();
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 10, 'timeunit' => 1))), array('testel' => 10));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 3, 'timeunit' => 60))), array('testel' => 180));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 1.5, 'timeunit' => 60))), array('testel' => 90));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 2, 'timeunit' => 3600))), array('testel' => 7200));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 1, 'timeunit' => 86400))), array('testel' => 86400));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 0, 'timeunit' => 3600))), array('testel' => 0));
+        $values = array('testel' => array('number' => 10, 'timeunit' => 1));
+        $this->assertEqual($el->exportValue($values), array('testel' => 10));
+        $values = array('testel' => array('number' => 3, 'timeunit' => 60));
+        $this->assertEqual($el->exportValue($values), array('testel' => 180));
+        $values = array('testel' => array('number' => 1.5, 'timeunit' => 60));
+        $this->assertEqual($el->exportValue($values), array('testel' => 90));
+        $values = array('testel' => array('number' => 2, 'timeunit' => 3600));
+        $this->assertEqual($el->exportValue($values), array('testel' => 7200));
+        $values = array('testel' => array('number' => 1, 'timeunit' => 86400));
+        $this->assertEqual($el->exportValue($values), array('testel' => 86400));
+        $values = array('testel' => array('number' => 0, 'timeunit' => 3600));
+        $this->assertEqual($el->exportValue($values), array('testel' => 0));
 
         $el = new MoodleQuickForm_duration('testel', null, array('optional' => true));
         $el->_createElements();
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 10, 'timeunit' => 1))), array('testel' => 0));
-        $this->assertEqual($el->exportValue(array('testel' => array('number' => 20, 'timeunit' => 1, 'enabled' => 1))), array('testel' => 20));
+        $values = array('testel' => array('number' => 10, 'timeunit' => 1));
+        $this->assertEqual($el->exportValue($values), array('testel' => 0));
+        $values = array('testel' => array('number' => 20, 'timeunit' => 1, 'enabled' => 1));
+        $this->assertEqual($el->exportValue($values), array('testel' => 20));
     }
 }