Changeset 3163

Timestamp:

Jan 15, 2014, 9:04:56 AM (10 years ago)

Author:

Peter

Message:

samwrite returns -1 if file is closed, so correct code to detect when this happens.

Location:

branches/0.11-stable

Files:

• . (modified) (1 prop)
• test/bam.cc (modified) (2 diffs)
• yat/omic/BamFile.cc (modified) (1 diff)

branches/0.11-stable/test/bam.cc

@@ -192 +192 @@
 
 
+void test_write(test::Suite& suite, const BamHeader& header)
+{
+  OutBamFile out;
+  BamRead read;
+  try {
+    // trying to write to a file not open
+    out.write(read);
+    suite.add(false);
+    suite.err() << "write(BamRead): did not throw\n";
+  }
+  catch (utility::runtime_error& e) {
+    suite.err() << "expected exception: " << e.what() << "\n";
+  }
+}
+
+
 void test1(test::Suite& suite)
 {
@@ -239 +255 @@
   test_sequence(suite, bam);
   test_name(suite, bam);
-}
-#endif
+  test_write(suite, in.header());
+}
+#endif

branches/0.11-stable/yat/omic/BamFile.cc

@@ -140 +140 @@
   void OutBamFile::write(const BamRead& read)
   {
-    if (!samwrite(sf_, read.bam_)) {
+    if (samwrite(sf_, read.bam_)<=0) {
       // FIXME if wanted perhaps we should throw an OutBamFile::error
       // instead that can hold \a read