fixed bug in seq.to_fasta

git-svn-id: http://biopieces.googlecode.com/svn/trunk@1617 74ccb610-7750-0410-82ae-013aeee3265d

diff --git a/code_ruby/lib/maasha/seq.rb b/code_ruby/lib/maasha/seq.rb
index b70cfc7f3047d15cc8cc44860dfd9727551069d8..1c6f245b3672d0705fee06cc9e9ac6e043db4b11 100644 (file)
--- a/code_ruby/lib/maasha/seq.rb
+++ b/code_ruby/lib/maasha/seq.rb
@@ -178,8 +178,8 @@ class Seq
 
   # Method that given a Seq entry returns a FASTA entry (a string).
   def to_fasta(wrap = nil)
-    raise SeqError, "Missing seq_name" if self.seq_name.nil?
-    raise SeqError, "Missing seq"      if self.seq.nil?
+    raise SeqError, "Missing seq_name" if self.seq_name.nil? or self.seq_name == ''
+    raise SeqError, "Missing seq"      if self.seq.nil?      or self.seq.empty?
 
     seq_name = self.seq_name.to_s
     seq      = self.seq.to_s

diff --git a/code_ruby/test/maasha/test_seq.rb b/code_ruby/test/maasha/test_seq.rb
index cdc9294aee01febe7658618c0bf4c9eebbbfde3f..76652981e4349b1ea57e875cdd5c879e37e310d6 100755 (executable)
--- a/code_ruby/test/maasha/test_seq.rb
+++ b/code_ruby/test/maasha/test_seq.rb
@@ -166,6 +166,28 @@ class TestSeq < Test::Unit::TestCase
     assert_raise(SeqError) { @entry.to_bp }
   end
 
+  def test_Seq_to_fasta_raises_on_missing_seq_name
+    @entry.seq = 'ATCG'
+    assert_raise(SeqError) { @entry.to_fasta }
+  end
+
+  def test_Seq_to_fasta_raises_on_empty_seq_name
+    @entry.seq_name = ''
+    @entry.seq      = 'ATCG'
+    assert_raise(SeqError) { @entry.to_fasta }
+  end
+
+  def test_Seq_to_fasta_raises_on_missing_seq
+    @entry.seq_name = 'test'
+    assert_raise(SeqError) { @entry.to_fasta }
+  end
+
+  def test_Seq_to_fasta_raises_on_empty_seq
+    @entry.seq_name = 'test'
+    @entry.seq      = ''
+    assert_raise(SeqError) { @entry.to_fasta }
+  end
+
   def test_Seq_to_fasta_returns_correct_entry
     @entry.seq_name = 'test'
     @entry.seq      = 'ATCG'