X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=code_ruby%2Ftest%2Fmaasha%2Ftest_fasta.rb;h=3924f54a5d71b1de5a835f2a5c1a318f05011d02;hb=4c74f0aa5b9a572a2552767d4c4c0c15166e092a;hp=e52440d0c0f6cbb9c16cc9aa031bf5067145fad7;hpb=8bf958c931357441fca189e45986285e2d1f2476;p=biopieces.git

diff --git a/code_ruby/test/maasha/test_fasta.rb b/code_ruby/test/maasha/test_fasta.rb
index e52440d..3924f54 100755
--- a/code_ruby/test/maasha/test_fasta.rb
+++ b/code_ruby/test/maasha/test_fasta.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..')
 
 # Copyright (C) 2007-2010 Martin A. Hansen.
 
@@ -26,59 +26,59 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 require 'test/unit'
+require 'test/helper'
 require 'maasha/fasta'
 require 'stringio'
-require 'pp'
 
 class FastaTest < Test::Unit::TestCase
-  def test_Fasta_get_entry_obtains_the_correct_seq_name
+  test "#get_entry obtains the correct seq_name" do
     fasta = Fasta.new(StringIO.new(">test\nATCG\n"))
     assert_equal("test", fasta.get_entry.seq_name)
   end
 
-  def test_Fasta_get_entry_obtains_the_correct_seq_without_trailing_newlines
+  test "#get_entry obtains the correct seq without trailing newlines" do
     fasta = Fasta.new(StringIO.new(">test\nATCG"))
     assert_equal("ATCG", fasta.get_entry.seq)
   end
 
-  def test_Fasta_get_entry_obtains_the_correct_seq_with_trailing_newlines
+  test "#get_entry obtains the correct seq with trailing newlines" do
     fasta = Fasta.new(StringIO.new(">test\nATCG\n\n\n"))
     assert_equal("ATCG", fasta.get_entry.seq)
   end
 
-  def test_Fasta_get_entry_rstrips_whitespace_from_seq_name
+  test "#get_entry rstrips whitespace from seq_name" do
     fasta = Fasta.new(StringIO.new(">test\n\r\t ATCG\n"))
     assert_equal("test", fasta.get_entry.seq_name)
   end
 
-  def test_Fasta_get_entry_strips_whitespace_from_seq
+  test "#get_entry strips whitespace from seq" do
     fasta = Fasta.new(StringIO.new(">test\n\r\t AT\n\r\t CG\n\r\t "))
     assert_equal("ATCG", fasta.get_entry.seq)
   end
 
-  def test_Fasta_get_entry_with_two_entries_obtain_correct
+  test "#get_entry with two entries obtain correct" do
     fasta = Fasta.new(StringIO.new(">test1\n\r\t AT\n\r\t CG\n\r\t \n>test2\n\r\t atcg\n"))
     assert_equal("ATCG", fasta.get_entry.seq)
     assert_equal("atcg", fasta.get_entry.seq)
   end
 
-  def test_Fasta_get_entry_without_seq_name_raises
+  test "#get_entry without seq_name raises" do
     fasta = Fasta.new(StringIO.new("ATCG\n"))
     assert_raise(FastaError) { fasta.get_entry }
   end
 
-  def test_Fasta_get_entry_without_seq_raises
+  test "#get_entry without seq raises" do
     fasta = Fasta.new(StringIO.new(">test\n\n"))
     assert_raise(FastaError) { fasta.get_entry }
   end
 
-  def test_Fasta_get_entry_with_leading_newline_raises
+  test "#get_entry with leading newline raises" do
     fasta = Fasta.new(StringIO.new("\n>test\nATCG\n"))
     assert_raise(FastaError) { fasta.get_entry }
   end
 
 # FIXME
-#  def test_Fasta_get_entry raises on missing > in seq_name
+#  test "#get_entry raises on missing > in seq_name" do
 #    fasta = Fasta.new(StringIO.new("test\nATCG\n"))
 #    assert_raise( FastaError ) { fasta.get_entry }
 #  end