fixed unit tests

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

diff --git a/code_ruby/lib/maasha/seq.rb b/code_ruby/lib/maasha/seq.rb
index 913f4d979928f96472558192a48da3e434a15f7c..6c0f35b358e67135b35c4032b7fc9e9a78e6e0fb 100644 (file)
--- a/code_ruby/lib/maasha/seq.rb
+++ b/code_ruby/lib/maasha/seq.rb
@@ -27,6 +27,9 @@ require 'maasha/seq/digest'
 require 'maasha/seq/trim'
 require 'narray'
 
+autoload :BackTrack, 'maasha/seq/backtrack.rb'
+autoload :Dynamic,   'maasha/seq/dynamic.rb'
+
 # Residue alphabets
 DNA     = %w[a t c g]
 RNA     = %w[a u c g]

diff --git a/code_ruby/lib/maasha/seq/backtrack.rb b/code_ruby/lib/maasha/seq/backtrack.rb
index ab2c00fc7a952fb5c9c6be5c906c96c5690b6cf2..c216ec979e0c1f15e092a1914352baa32583ff80 100644 (file)
--- a/code_ruby/lib/maasha/seq/backtrack.rb
+++ b/code_ruby/lib/maasha/seq/backtrack.rb
@@ -96,8 +96,8 @@ module BackTrack
     end
 
     raise BackTrackError, "Bad pattern: #{pattern}"                                          unless pattern.downcase =~ OK_PATTERN
-    raise BackTrackError, "start: #{start} out of range (0 .. #{self.length - 1})"           unless (0 .. self.length).include? start
-    raise BackTrackError, "stop: #{stop} out of range (0 .. #{self.length - 1})"             unless (0 .. self.length).include? stop
+    raise BackTrackError, "start: #{start} out of range (0 .. #{self.length - 1})"           unless (0 ... self.length).include? start
+    raise BackTrackError, "stop: #{stop} out of range (0 .. #{self.length - 1})"             unless (0 ... self.length).include? stop
     raise BackTrackError, "max_mismatches: #{max_mismatches} out of range (0 .. #{MAX_MIS})" unless (0 .. MAX_MIS).include? max_mismatches
     raise BackTrackError, "max_insertions: #{max_insertions} out of range (0 .. #{MAX_INS})" unless (0 .. MAX_INS).include? max_insertions
     raise BackTrackError, "max_deletions: #{max_deletions} out of range (0 .. #{MAX_DEL})"   unless (0 .. MAX_DEL).include? max_deletions

diff --git a/code_ruby/test/maasha/seq/test_backtrack.rb b/code_ruby/test/maasha/seq/test_backtrack.rb
index 1af799e07ad2321bb7f627e8c112398f9c43375a..6765b170212068d92593887a6753e40cd3726da5 100644 (file)
--- a/code_ruby/test/maasha/seq/test_backtrack.rb
+++ b/code_ruby/test/maasha/seq/test_backtrack.rb
@@ -27,17 +27,13 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
 require 'maasha/seq'
-require 'maasha/seq/backtrack'
-
-class Seq
-  include BackTrack
-end
 
 class BackTrackTest < Test::Unit::TestCase
   def setup
     #                       0         1
     #                       01234567890123456789
     @seq = Seq.new("test", "tacgatgctagcatgcacgg")
+    @seq.extend(BackTrack)
   end
 
   def test_BackTrack_patscan_with_bad_pattern_raises

diff --git a/code_ruby/test/maasha/seq/test_dynamic.rb b/code_ruby/test/maasha/seq/test_dynamic.rb
index 8e1121e28fd60ea8c301c83da48d0bee0843e62f..b87bacf21795148359ed74d12acbeda9d0ad7fb5 100755 (executable)
--- a/code_ruby/test/maasha/seq/test_dynamic.rb
+++ b/code_ruby/test/maasha/seq/test_dynamic.rb
@@ -26,17 +26,13 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 require 'maasha/seq'
-require 'maasha/seq/dynamic'
 require 'test/unit'
 require 'pp'
 
-class Seq
-  include Dynamic
-end
-
 class TestDynamic < Test::Unit::TestCase
   def setup
     @p = Seq.new("test", "atcg")
+    @p.extend(Dynamic)
   end
 
   def test_Dynamic_no_match_returns_nil
@@ -125,11 +121,13 @@ class TestDynamic < Test::Unit::TestCase
 
   def test_Dynamic_patscan_locates_three_patterns_ok
     p = Seq.new("test", "ataacgagctagctagctagctgactac")
+    p.extend(Dynamic)
     assert_equal(3, p.patscan("tag").count)
   end
 
   def test_Dynamic_patscan_with_pos_locates_two_patterns_ok
     p = Seq.new("test", "ataacgagctagctagctagctgactac")
+    p.extend(Dynamic)
     assert_equal(2, p.patscan("tag", 10).count)
   end
 end