load and display a motif list

[mussa.git] / alg / test / test_glsequence.cpp

diff --git a/alg/test/test_glsequence.cpp b/alg/test/test_glsequence.cpp
index 220b455487934d09fe62358eb9003c1ac473f654..563af535f4901b8f727e54ddcf44d92df110c892 100644 (file)
--- a/alg/test/test_glsequence.cpp
+++ b/alg/test/test_glsequence.cpp
@@ -2,6 +2,7 @@
 
 #include <string>
 
+#include "alg/annotation_colors.hpp"
 #include "alg/glsequence.hpp"
 #include "alg/sequence.hpp"
 
@@ -9,15 +10,16 @@ using namespace std;
 
 BOOST_AUTO_TEST_CASE ( glsequence_operator_equal )
 {
+  AnnotationColors cm;
   // I don't trust my operator = hack so lets make sure it works.
   string s0("AAGGCCTT");
   string s1("TTGGCCAA");
   Sequence seq0(s0);
   Sequence seq1(s1);
 
-  GlSequence glseq0(seq0);
+  GlSequence glseq0(seq0, cm);
   BOOST_CHECK (glseq0.sequence().get_seq() == s0);
-  GlSequence glseq1(seq1);
+  GlSequence glseq1(seq1, cm);
   GlSequence glseq_copy0(glseq0);
 
   BOOST_CHECK(glseq_copy0.sequence().get_seq() == glseq0.sequence().get_seq());
@@ -30,10 +32,11 @@ BOOST_AUTO_TEST_CASE ( glsequence_operator_equal )
 
 BOOST_AUTO_TEST_CASE( glsequence_color )
 {
+  AnnotationColors cm;
   Color black(0.0, 0.0, 0.0, 0.0);
   Color c(0.1, 0.2, 0.3, 0.4);
   Sequence seq("AAGGCCTT");
-  GlSequence s(seq);
+  GlSequence s(seq, cm);
   
   BOOST_CHECK_EQUAL(s.color(), black );
   s.setColor( c );
@@ -42,8 +45,9 @@ BOOST_AUTO_TEST_CASE( glsequence_color )
 
 BOOST_AUTO_TEST_CASE( glsequence_renderable )
 {
+  AnnotationColors cm;
   Sequence seq("AAGGCCTT");
-  GlSequence s(seq);
+  GlSequence s(seq, cm);
 
   // way more base pairs than viewport pixel width 
   BOOST_CHECK_EQUAL(s.is_sequence_renderable( 0, 1000, 500), false );
@@ -53,10 +57,11 @@ BOOST_AUTO_TEST_CASE( glsequence_renderable )
 
 BOOST_AUTO_TEST_CASE( glsequence_sequence )
 {
+  AnnotationColors cm;
   string seq_string("AAGGCCTTNNAAGGCCTTNNAAGGCCTTNN");
   string::size_type seqlen = seq_string.size();
   Sequence seq(seq_string);
-  GlSequence glseq(seq);
+  GlSequence glseq(seq, cm);
 
   BOOST_CHECK( glseq.sequence_begin(0, 50) == seq.begin() );
   // always make sure we return seq.end() regardless of how much extra
@@ -94,9 +99,10 @@ BOOST_AUTO_TEST_CASE( glsequence_sequence )
 // make sure the computation of the leftmost and rightmost base is correct
 BOOST_AUTO_TEST_CASE( glsequence_leftright_base )
 {
+  AnnotationColors cm;
   std::string seq_string = "AAGGCCTT";
   Sequence seq(seq_string);
-  GlSequence glseq(seq);
+  GlSequence glseq(seq, cm);
 
   BOOST_CHECK_EQUAL( glseq.leftbase( -50.0 ), 0 );
   BOOST_CHECK_EQUAL( glseq.leftbase(   0.5 ), 1 );