Changeset 9 for trunk/test/unit

Timestamp:

Jan 28, 2011, 12:30:39 PM (11 years ago)

Author:

robert@…

Message:

 

Location:

trunk/test/unit/nl/tno/metagenomics

Files:

• AssaySampleTests.groovy (added)
• SampleExcelServiceTests.groovy (deleted)
• SynchronizationServiceTests.groovy (deleted)
• integration/TrashServiceTests.groovy (modified) (11 diffs)

trunk/test/unit/nl/tno/metagenomics/integration/TrashServiceTests.groovy

@@ -47 +47 @@
                 
                 // Create four samples
-                Sample sa1 = new Sample( id: 1, name: "Sample 1a", sampleToken: "sample1a", study: s );
-                Sample sa2 = new Sample( id: 2, name: "Sample 1b", sampleToken: "sample1b", study: s );
-                Sample sa3 = new Sample( id: 3, name: "Sample 2a", sampleToken: "sample2a", study: s );
-                Sample sa4 = new Sample( id: 4, name: "Sample 2b", sampleToken: "sample2b", study: s );
-                Sample sa5 = new Sample( id: 5, name: "Sample 3a", sampleToken: "sample3a", study: s );
+                Sample sa1 = new Sample( id: 1, name: "Sample 1a", subject: "S1", event: "event", sampleToken: "sample1a", study: s );
+                Sample sa2 = new Sample( id: 2, name: "Sample 1b", subject: "S2", event: "event", sampleToken: "sample1b", study: s );
+                Sample sa3 = new Sample( id: 3, name: "Sample 2a", subject: "S3", event: "event", sampleToken: "sample2a", study: s );
+                Sample sa4 = new Sample( id: 4, name: "Sample 2b", subject: "S4", event: "event", sampleToken: "sample2b", study: s );
+                Sample sa5 = new Sample( id: 5, name: "Sample 3a", subject: "S5", event: "event", sampleToken: "sample3a", study: s );
                 def samples = [sa1, sa2, sa3, sa4, sa5]
                 
@@ -64 +64 @@
                 // Create desired combinations of samples and assays
                 // Such that: assay1 has 2 samples with data, assay2 has 1 sample with data and assay3 has no samples with data
-           AssaySample as1a = new AssaySample( oligoNumber: "123", tagSequence: "abc", sample: sa1, assay: a1 );
-           AssaySample as1b = new AssaySample( oligoNumber: "200", tagSequence: "def", sample: sa2, assay: a1 );
-           AssaySample as2a = new AssaySample( oligoNumber: "300", tagSequence: "ghi", sample: sa3, assay: a2 );
+           AssaySample as1a = new AssaySample( oligoNumber: "123", tagSequence: "abc", tagName: "L391", sample: sa1, assay: a1 );
+           AssaySample as1b = new AssaySample( oligoNumber: "200", tagSequence: "def", tagName: "L397", sample: sa2, assay: a1 );
+           AssaySample as2a = new AssaySample( oligoNumber: "300", tagSequence: "ghi", tagName: "L421", sample: sa3, assay: a2 );
            AssaySample as2b = new AssaySample( id: 12, sample: sa4, assay: a2);
            AssaySample as3a = new AssaySample( sample: sa5, assay: a3);
@@ -118 +118 @@
                 
                 // Create three samples, two originally also present in assay 1, the other one isn't
-                Sample sa1 = new Sample( id: 101, name: "Sample 1a", sampleToken: "tsample1a", study: trash );
-                Sample sa2 = new Sample( id: 102, name: "Sample 1b", sampleToken: "tsample1b", study: trash );
-                Sample sa3 = new Sample( id: 103, name: "Sample 2a", sampleToken: "tsample2a", study: trash );
+                Sample sa1 = new Sample( id: 101, name: "Sample 1a", sampleToken: "tsample1a", subject: "fromtrash: S1", event: "fromtrash: event", study: trash );
+                Sample sa2 = new Sample( id: 102, name: "Sample 1b", sampleToken: "tsample1b", subject: "fromtrash: S2", event: "fromtrash: event", study: trash );
+                Sample sa3 = new Sample( id: 103, name: "Sample 2a", sampleToken: "tsample2a", subject: "fromtrash: S3", event: "fromtrash: event", study: trash );
                 def samples = [sa1, sa2, sa3]
                 
@@ -192 +192 @@
                 assert assaySample.oligoNumber == "123"
                 assert assaySample.tagSequence == "abc"
+                assert assaySample.sample.subject == "S1"
+                assert assaySample.sample.event == "event"
                 assert assaySample.sequenceData.size() == 2
 
@@ -198 +200 @@
                 assert assaySample.oligoNumber == "200"
                 assert assaySample.tagSequence == "def"
+                assert assaySample.sample.subject == "S2"
+                assert assaySample.sample.event == "event"
                 assert assaySample.sequenceData.size() == 1
 
@@ -204 +208 @@
                 assert assaySample.oligoNumber == "300"
                 assert assaySample.tagSequence == "ghi"
+                assert assaySample.sample.subject == "S3"
+                assert assaySample.sample.event == "event"
                 assert !assaySample.sequenceData || assaySample.sequenceData.size() == 0
 
@@ -281 +287 @@
                 assert assaySample.oligoNumber == "123"
                 assert assaySample.tagSequence == "abc"
+                assert assaySample.sample.subject == "S1"
+                assert assaySample.sample.event == "event"
                 assert assaySample.sequenceData.size() == 2
 
@@ -287 +295 @@
                 assert assaySample.oligoNumber == "200"
                 assert assaySample.tagSequence == "def"
+                assert assaySample.sample.subject == "S2"
+                assert assaySample.sample.event == "event"
                 assert assaySample.sequenceData.size() == 1
 
@@ -364 +374 @@
                 assert assaySample.oligoNumber == "123"
                 assert assaySample.tagSequence == "abc"
+                assert assaySample.sample.subject == "S1"
+                assert assaySample.sample.event == "event"
                 assert assaySample.sequenceData.size() == 2
 
@@ -419 +431 @@
                 assert s.oligoNumber == "fromtrash: 1";
                 assert s.tagSequence == "fromtrash: abc";
+                
+                // Sample data shouldn't be copied, so remains the same
+                assert s.sample.subject == "S1"
+                assert s.sample.event == "event"
+                
                 assert s.sequenceData?.size() == 4
                 
@@ -468 +485 @@
                 assert restoredTo.sequenceData?.size() == 2
                 
+                // Sample data shouldn't be copied, so remains the same
+                assert restoredTo.sample.subject == "S4"
+                assert restoredTo.sample.event == "event"
+                
                 assert restoredTo.numSequences() == 600
                 def sequenceFiles = restoredTo.sequenceData.sequenceFile;