POET - Fixing unit test to not depend on data id order.

PoetOS · Oct 3, 2016 · 3d99414 · 3d99414
1 parent f27af58
commit 3d99414
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/js/ncccsautocomplete.js b/js/ncccsautocomplete.js
@@ -34,7 +34,7 @@ var Teachers = {
             seperator = ',';
         }
         if (html !== "") {
-            html = '<b>Teachers selected</b><br>'+html;
+            html = '<b>Teachers selected</b><br>' + html;
         }
         ncccs_setcontent('#teachers_list', html);
         Y.one('input[name="teachers"]').set('value', ids);
@@ -77,7 +77,7 @@ var Categories = {
             seperator = ',';
         }
         if (html !== "") {
-            html = '<b>Categories selected</b><br>'+html;
+            html = '<b>Categories selected</b><br>' + html;
         }
         ncccs_setcontent('#categories_list', html);
         Y.one('input[name="categories"]').set('value', ids);
@@ -120,7 +120,7 @@ var Courses = {
             seperator = ',';
         }
         if (html !== "") {
-            html = '<b>Courses selected</b><br>'+html;
+            html = '<b>Courses selected</b><br>' + html;
         }
         ncccs_setcontent('#courses_list', html);
         Y.one('input[name="courses"]').set('value', ids);

diff --git a/tests/ncccscensus_test.php b/tests/ncccscensus_test.php
@@ -59,17 +59,27 @@ public function test_categoryonly() {
         $formdata = new stdClass;
         $formdata->categories = $data['category1']->id;
         $courses = array($data['course1']->id);
-        $this->assertEquals(report_ncccscensus_get_courses($formdata), $courses);
+        $catcourses = report_ncccscensus_get_courses($formdata);
+        $this->assertCount(1, $catcourses);
+        $this->assertEquals($courses, $catcourses);
 
         // Test subcategory selection.
         $formdata->categories = $data['category2']->id;
         $courses = array($data['course2']->id, $data['course6']->id);
-        $this->assertEquals(report_ncccscensus_get_courses($formdata), $courses);
+        $catcourses = report_ncccscensus_get_courses($formdata);
+        $this->assertCount(2, $catcourses);
+        foreach($courses as $course) {
+            $this->assertTrue(in_array($course, $catcourses));
+        }
 
         // Test subcategory selection with two courses in it.
         $formdata->categories = $data['category3']->id;
         $courses = array($data['course3']->id, $data['course4']->id, $data['course5']->id);
-        $this->assertEquals(report_ncccscensus_get_courses($formdata), $courses);
+        $catcourses = report_ncccscensus_get_courses($formdata);
+        $this->assertCount(3, $catcourses);
+        foreach($courses as $course) {
+            $this->assertTrue(in_array($course, $catcourses));
+        }
 
         // Test two category selections with three courses in it.
         $formdata->categories = join(',', array($data['category2']->id, $data['category3']->id));
@@ -80,7 +90,11 @@ public function test_categoryonly() {
                 $data['course4']->id,
                 $data['course5']->id
         );
-        $this->assertEquals(report_ncccscensus_get_courses($formdata), $courses);
+        $catcourses = report_ncccscensus_get_courses($formdata);
+        $this->assertCount(5, $catcourses);
+        foreach($courses as $course) {
+            $this->assertTrue(in_array($course, $catcourses));
+        }
     }
 
     /**