Changeset 964 for trunk/test

Timestamp:

Oct 21, 2010, 3:04:57 PM (10 years ago)

Author:

business@…

Message:

changed SampleTests? to comply with parentEvent being nullable, delete via parent event now works

File:

• trunk/test/integration/gscf/SampleTests.groovy (modified) (10 diffs)

trunk/test/integration/gscf/SampleTests.groovy

@@ -44 +44 @@
                 assert study
 
+                // Look up sample template
+                def sampleTemplate = Template.findByName(testSampleTemplateName)
+                assert sampleTemplate
+
+                // Create sample with the retrieved study as parent
+                def sample = new Sample(
+                    name: testSampleName,
+                    template: sampleTemplate
+                )
+
+                // At this point, the sample should not validate, because it doesn't have a parent study assigned
+                assert !sample.validate()
+
+                // Add the sample to the retrieved parent study
+                study.addToSamples(sample)
+                assert study.samples.find { it.name == sample.name}
+
+                // Now, the sample should validate
+                if (!sample.validate()) {
+                        sample.errors.each { println it}
+                }
+                assert sample.validate()
+
+                // Make sure the sample is saved to the database
+                assert sample.save(flush: true)
+
+        }
+
+        private void addParentSamplingEvent() {
+
+                // Retrieve the sample
+                def sampleDB = Sample.findByName(testSampleName)
+                assert sampleDB
+
+                // Retrieve the study that should have been created in StudyTests
+                def study = Study.findByTitle(testStudyName)
+                assert study
+
                 // Look up sampling event template
                 def samplingEventTemplate = Template.findByName(testSamplingEventTemplateName)
                 assert samplingEventTemplate
-
-                // Look up sample template
-                def sampleTemplate = Template.findByName(testSampleTemplateName)
-                assert sampleTemplate
 
                 // Create parent sampling event
@@ -57 +91 @@
                         duration: testSamplingEventDuration,
                         template: samplingEventTemplate,
-                        sampleTemplate: sampleTemplate
+                        sampleTemplate: Template.findByName(testSampleTemplateName)
                 )
 
@@ -68 +102 @@
                 assert samplingEvent.save(flush:true)
 
-                // Create sample with the retrieved study as parent
-                def sample = new Sample(
-                    name: testSampleName,
-                    template: sampleTemplate,
-                    parentEvent: samplingEvent
-                )
-
-                // At this point, the sample should not validate, because it doesn't have a parent study assigned
-                assert !sample.validate()
-
-                // Add the sample to the retrieved parent study
-                study.addToSamples(sample)
-                assert study.samples.find { it.name == sample.name}
-
-                // Now, the sample should validate
-                if (!sample.validate()) {
-                        sample.errors.each { println it}
-                }
-                assert sample.validate()
-
-                // Make sure the sample is saved to the database
-                assert sample.save(flush: true)
-
+                // Add sample to the sampling event
+                samplingEvent.addToSamples(sampleDB)
+
+                // Make sure the sampling event is really the parent event of the sample
+                assert sampleDB.parentEvent
+                assert sampleDB.parentEvent == samplingEvent
+                assert sampleDB.parentEvent.startTime.equals(testSamplingEventTime)
+
+        }
+
+        void testStudyPublish() {
+                def sampleDB = Sample.findByName(testSampleName)
+                assert sampleDB
+
+                // Retrieve the parent study
+                def study = Study.findByTitle(testStudyName)
+                assert study
+
+                // Make sure the study validates at this point
+                assert study.validate()
+
+                // Try to publish the study, should fail as it has a sample without a parent sampling event
+                //study.published = true
+                assert !study.validate()
+
+                // Add parent sampling event
+                addParentSamplingEvent()
+
+                // Add parent subject
+
+                // Now the study should validate
+                assert study.validate()
         }
 
@@ -100 +143 @@
                 assert sampleDB.name.equals(testSampleName)
                 assert sampleDB.template.name.equals(testSampleTemplateName)
-                assert sampleDB.parentEvent
-                assert sampleDB.parentEvent.startTime.equals(testSamplingEventTime)
 
                 println "The sample has parentEvent ${sampleDB.parentEvent.encodeAsHTML()}"
@@ -108 +149 @@
                 assert !sampleDB.validate()
 
-                // A sample without a parent SamplingEvent should not be saveable
-                sampleDB.name = testSampleName
-                sampleDB.parentEvent = null
-                assert !sampleDB.validate()
         }
 
         void testDelete() {
                 def sampleDB = Sample.findByName(testSampleName)
+                assert sampleDB
                 sampleDB.delete()
                 try {
@@ -177 +215 @@
                 assert study
 
+                // Add parent sampling event
+                addParentSamplingEvent()
+
                 def event = sampleDB.parentEvent
                 assert event
@@ -205 +246 @@
 
                 // Retrieve the sample's sampling event
+                addParentSamplingEvent()
                 def event = sampleDB.parentEvent
                 assert event
@@ -229 +271 @@
                 assert study.save()
 
-                // Use the deleteSamplingEvent method
+                // Use the deleteEventGroup method
                 def msg = study.deleteEventGroup(group)
                 println msg
+                if (!study.validate()) {
+                        study.errors.each { println it}
+                }
+                assert study.validate()
+
                 assert study.save()
 
@@ -326 +373 @@
 
         void testFindViaSamplingEvent() {
+
+                // Add parent sampling event
+                addParentSamplingEvent()
+                
                 // Try to retrieve the sampling event by using the time...
                 // (should be also the parent study but that's not yet implemented)
@@ -334 +385 @@
                 assert samples
                 assert samples.size() == 1
-                assert samples.first().name == testSampleName
+                assert samples.every {it.name == testSampleName}
         }