Changeset 402

Timestamp:

May 11, 2010, 11:00:09 AM (14 years ago)

Author:

keesvb

Message:

some minor changes to subject tests

File:

• trunk/test/integration/gscf/SubjectTests.groovy (modified) (5 diffs)

trunk/test/integration/gscf/SubjectTests.groovy

@@ -73 +73 @@
                 assert subject.validate()
 
-                // Change name to already existing name, should fail
-                subject.name = testSubjectName
-                assert !subject.validate()
+                // TODO: Set study and change name to already existing name, should fail within one study
+                // subject.name = testSubjectName
+                // assert !subject.validate()
         }
 
@@ -106 +106 @@
                 assert speciesOntologies.size() == 1
 
-                println speciesOntologies.class
                 // Getting the only element in a set is hard in Grails...
                 Ontology speciesOntology = speciesOntologies.asList().first()
@@ -127 +126 @@
                 assert subject.save(flush:true)
 
-                assert subjectDB.getFieldValue('species') == humanTerm
-                assert subjectDB.getFieldValue('name').equals(testSubjectName)
-                assert subjectDB.getFieldValue('species') == humanTerm
+                assert subject.getFieldValue('species') == humanTerm
+                assert subject.getFieldValue('name').equals(testSubjectName)
+                assert subject.getFieldValue('species') == humanTerm
 
         }
@@ -146 +145 @@
 
         /**
-         * Test setFieldValue() for template fields
+         * Test setFieldValue() and getFieldValue() for template fields
+     * This cannot be done in separate tests, as the database state is reset in between
          */
         void testTemplateFieldSetters() {
@@ -161 +161 @@
                 // Save subject
                 assert subject.save(flush: true)
-
-
-        }
-
-        /**
-        * Test getFieldValue() for template fields
-        */
-        void testTemplateFieldGetters() {
 
                 // Try to retrieve the subject and make sure the BMI was stored