Changeset 1473 for trunk/test

Timestamp:

Feb 2, 2011, 11:54:51 AM (10 years ago)

Author:

s.h.sikkema@…

Message:

Fixed tests and removed obsolete ones so grails test-app works with all tests passed

Location:

trunk/test/unit/dbnp

Files:

• data/OntologyControllerTests.groovy (deleted)
• data/TermControllerTests.groovy (deleted)
• query/CriterionTests.groovy (modified) (1 diff)
• query/SearchTests.groovy (modified) (1 diff)
• query/SimpleQueryControllerTests.groovy (moved) (moved from trunk/test/unit/dbnp/studycapturing/SimpleQueryControllerTests.groovy) (2 diffs)
• query/StudySearchTests.groovy (modified) (2 diffs)
• studycapturing/AssayServiceTests.groovy (modified) (3 diffs)
• studycapturing/EventGroupTests.groovy (deleted)
• studycapturing/StudyWizardControllerTests.groovy (moved) (moved from trunk/test/unit/dbnp/studycapturing/WizardControllerTests.groovy) (5 diffs)
• studycapturing/SubjectControllerTests.groovy (deleted)
• studycapturing/TermEditorControllerTests.groovy (deleted)

trunk/test/unit/dbnp/query/CriterionTests.groovy

@@ -2 +2 @@
 
 import grails.test.*
+import org.dbnp.gdt.RelTime
 
 /**

trunk/test/unit/dbnp/query/SearchTests.groovy

@@ -2 +2 @@
 
 import grails.test.*
+import org.dbnp.gdt.TemplateFieldType
+import org.dbnp.gdt.RelTime
 
 /**

trunk/test/unit/dbnp/query/SimpleQueryControllerTests.groovy

@@ -1 @@
-package dbnp.studycapturing
+package dbnp.query
 
 import grails.test.ControllerUnitTestCase
-import dbnp.query.SimpleQueryController
 
 /**
@@ -25 +24 @@
       def list2 = [1, 3, 5]
 
-      def list3 = SimpleQueryController.mergeLists(list1, list2)
+      def list3 = SimpleQueryController.merge(list1, list2)
 
       assert list3 == [1, 3]

trunk/test/unit/dbnp/query/StudySearchTests.groovy

@@ -3 +3 @@
 import dbnp.studycapturing.*
 import grails.test.*
+import org.dbnp.gdt.AssayModule
 
 /**
@@ -38 +39 @@
                 mockDomain( SamplingEvent, samplingEvents);
                 mockDomain( Assay, assays );
+
+        mockDomain( AssayModule );
                 
                 subjects.each { it.parent.addToSubjects( it ); }

trunk/test/unit/dbnp/studycapturing/AssayServiceTests.groovy

@@ -61 +61 @@
         Subject.get(2).setFieldValue('tf3', 'tfv3')
 
-        // mock authentication service
+        // mock authenticationService
         service.authenticationService = [
                 isLoggedIn: { true },
@@ -69 +69 @@
         ]
 
+        // mock moduleCommunicationService
+        service.moduleCommunicationService = [
+                isModuleReachable: { a -> true },
+                callModuleRestMethodJSON: { consumer, path ->
+                    [['sample1', 'sample2', 'sample3'],
+                     ['measurement1','measurement2','measurement3','measurement4'],
+                     [1,2,3,4,5,6,7,8,9,10,11,12] ]
+                }
+        ]
+
     }
 
@@ -181 +191 @@
         def consumer = 'http://metabolomics.nmcdsp.nl'
 
-        // mock URL's getText to be able to mock a http request
-        URL.metaClass.getText = {
-            new JSON ([['sample1', 'sample2', 'sample3'],
-              ['measurement1','measurement2','measurement3','measurement4'],
-              [1,2,3,4,5,6,7,8,9,10,11,12] ]).toString()
-        }
+//        // mock URL's getText to be able to mock a http request
+//        URL.metaClass.getText = {
+//            new JSON ([['sample1', 'sample2', 'sample3'],
+//              ['measurement1','measurement2','measurement3','measurement4'],
+//              [1,2,3,4,5,6,7,8,9,10,11,12] ]).toString()
+//        }
 
         def assayData = service.collectAssayData(assay, consumer)
+
+        println assayData
 
         def sample1index = assayData.'Sample Data'.'name'.findIndexOf{it == 'sample1'}

trunk/test/unit/dbnp/studycapturing/StudyWizardControllerTests.groovy

@@ -3 +3 @@
 import grails.test.*
 
-class WizardControllerTests extends ControllerUnitTestCase {
+class StudyWizardControllerTests extends ControllerUnitTestCase {
     protected void setUp() {
         super.setUp()
@@ -15 +15 @@
         // Without parameters, the method should give an error
         controller.ajaxParseRelTime();
-        assert controller.response.status == 400;
+            assert controller.response.status == 400;
     }
 
@@ -22 +22 @@
         controller.params.reltime = '';
         controller.ajaxParseRelTime();
-        assert controller.response.status == 200
-        assert controller.response.contentAsString == ""
+            assert controller.response.status == 200
+        assert controller.response.contentAsString == "0 seconds"
     }
 
@@ -30 +30 @@
         controller.params.reltime = '3d';
         controller.ajaxParseRelTime();
-        assert controller.response.status == 200
+            assert controller.response.status == 200
         assert controller.response.contentAsString == "3 days"
     }
@@ -38 +38 @@
         controller.params.reltime = 'no valid reltime';
         controller.ajaxParseRelTime();
-        assert controller.response.status == 400;
+        assert controller.response.status == 400;
     }