Changeset 654 for trunk/test

Timestamp:

Jul 15, 2010, 2:26:48 PM (11 years ago)

Author:

keesvb

Message:

updated sample and study tests, added belongsTo to Sample (which gives it its parent), tried to write the unique name constraint of Sample and wrote a test for it

Location:

trunk/test/integration/gscf

Files:

• SampleTests.groovy (modified) (4 diffs)
• StudyTests.groovy (modified) (1 diff)

trunk/test/integration/gscf/SampleTests.groovy

@@ -55 +55 @@
                 assert samplingEvent.validate()
 
+                assert samplingEvent.save(flush:true)
 
                 // Look up sample template
@@ -109 +110 @@
                 assert study
 
-                // Test giveSamplingEventTemplates
-                def templates = study.giveSamplingEventTemplates()
+                // Test giveSampleTemplates
+                def templates = study.giveSampleTemplates()
                 assert templates
                 assert templates.size() == 1
-                assert templates
+                assert templates.asList().first().name == testSampleTemplateName
 
                 // Test if the sample is in the samples collection
@@ -119 +120 @@
                 assert study.samples.size() == 1
                 assert study.samples.first().name == testSampleName
+        }
+
+
+        void testParentStudy() {
+                def sample = Sample.findByName(testSampleName)
+                assert sample
+
+                assert sample.parent
+                assert sample.parent.code == testStudyCode
+        }
+
+        void testSampleUniqueNameConstraint() {
+                def sample = Sample.findByName(testSampleName)
+                assert sample
+
+                def study = sample.parent
+                assert study
+
+                def sample2 = new Sample(
+                    name: testSampleName,
+                    template: sampleTemplate,
+                    parentEvent: samplingEvent
+                )
+
+                // Add the sample to the retrieved parent study
+                study.addToSamples(sample2)
+
+                // At this point, the sample should not validate or save, because there is already a sample with that name in the study
+                assert !sample2.validate()
+                assert !sample2.save(flush:true)
+
         }
 
@@ -134 +166 @@
 
         void testDomainFields() {
-                def sample = Sample.findByName(testStudyName)
+                def sample = Sample.findByName(testSampleName)
                 assert sample
 

trunk/test/integration/gscf/StudyTests.groovy

@@ -99 +99 @@
 
                 // Delete the created study
-                def study = Study.findByCode(testStudyCode)
+                /*def study = Study.findByCode(testStudyCode)
                 assert study
 
                 study.delete()
                 assert Study.findByCode(testStudyCode) == null
-
+                */
                 super.tearDown()
         }