Changeset 3162

Timestamp:

Jan 15, 2014, 9:01:08 AM (9 years ago)

Author:

Peter

Message:

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

Location:

trunk

Files:

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

trunk/test/bam.cc

@@ -210 +210 @@
 
 
+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)
 {
@@ -258 +274 @@
   test_name(suite, bam);
   test_open3(suite, in.header());
-}
-#endif
+  test_write(suite, in.header());
+}
+#endif

trunk/yat/omic/BamFile.cc

@@ -162 +162 @@
   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