fixed minor upcase bug in assemble.rb

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

diff --git a/code_ruby/lib/maasha/seq/assemble.rb b/code_ruby/lib/maasha/seq/assemble.rb
index dffbf11ee43f25b1fcf684d72c86d7a95ead62f4..7b02d03a61a827782a802ade399ebd5c378105cb 100644 (file)
--- a/code_ruby/lib/maasha/seq/assemble.rb
+++ b/code_ruby/lib/maasha/seq/assemble.rb
@@ -64,6 +64,8 @@ class Assemble
           entry_overlap = @entry1[-1 * overlap .. -1]
         end
 
+        entry_left.seq.upcase!
+        entry_right.seq.upcase!
         entry_merged          = entry_left + entry_overlap + entry_right
         entry_merged.seq_name = @entry1.seq_name + ":overlap=#{overlap}:hamming=#{hamming_dist}"
 

diff --git a/code_ruby/test/maasha/seq/test_assemble.rb b/code_ruby/test/maasha/seq/test_assemble.rb
index cf05ca839fca4fb8bcdb0521b0d62b4e9eea6b83..e4901b4d2e6a66710e9fb4c5bcf52898fab990f3 100755 (executable)
--- a/code_ruby/test/maasha/seq/test_assemble.rb
+++ b/code_ruby/test/maasha/seq/test_assemble.rb
@@ -12,19 +12,19 @@ class TestAssemble < Test::Unit::TestCase
   end
 
   test "Assemble.pair with overlap returns the correctly" do
-    assert_equal("atcgatc", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "gatc")).seq)
-    assert_equal("atcgat",  Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "cgat")).seq)
-    assert_equal("atcga",   Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "tcga")).seq)
+    assert_equal("ATCgATC", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "gatc")).seq)
+    assert_equal("ATcgAT",  Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "cgat")).seq)
+    assert_equal("AtcgA",   Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "tcga")).seq)
     assert_equal("atcg",    Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "atcg")).seq)
   end
 
   test "Assemble.pair with overlap and overlap_min returns correctly" do
     assert_nil(Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "gatc"), :overlap_min => 2))
-    assert_equal("atcgat", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "cgat"), :overlap_min => 2).seq)
+    assert_equal("ATcgAT", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "cgat"), :overlap_min => 2).seq)
   end
 
   test "Assemble.pair with overlap and overlap_max returns correctly" do
-    assert_equal("atcga", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "tcga"), :overlap_max => 3).seq)
+    assert_equal("AtcgA", Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "tcga"), :overlap_max => 3).seq)
     assert_nil(Assemble.pair(Seq.new("test1", "atcg"), Seq.new("test2", "atcg"), :overlap_max => 3))
   end