X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=alg%2Ftest%2Ftest_glseqbrowser.cpp;h=9587472ae5ab73bbbea1ae6780d5e70a3f0230ae;hp=4698260bde35df4ab9a9ced5bf6a4aa462f2e5c2;hb=HEAD;hpb=55fe547c493cc6a1f99804b0cc666855db41dc83

diff --git a/alg/test/test_glseqbrowser.cpp b/alg/test/test_glseqbrowser.cpp
index 4698260..9587472 100644
--- a/alg/test/test_glseqbrowser.cpp
+++ b/alg/test/test_glseqbrowser.cpp
@@ -1,5 +1,7 @@
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE test_glseqbrowser
+#include <boost/test/unit_test.hpp>
+
 #include <boost/assign/std/vector.hpp>
 using namespace boost::assign;
 
@@ -9,9 +11,10 @@ using namespace boost::assign;
 #include <list>
 #include <vector>
 
-#include "alg/annotation_colors.hpp"
-#include "alg/glseqbrowser.hpp"
-#include "alg/sequence.hpp"
+#include "annotation_colors.hpp"
+#include "glseqbrowser.hpp"
+#include "mussa.hpp"
+#include "sequence.hpp"
 
 using namespace std;
 
@@ -114,9 +117,9 @@ BOOST_AUTO_TEST_CASE( glseqbrowser_center )
   string s0("AAGGCCTT");
   string s1("TTGGCCAA");
   string s2("GATTACAA");
-  boost::shared_ptr<Sequence> seq0(new Sequence(s0));
-  boost::shared_ptr<Sequence> seq1(new Sequence(s1));
-  boost::shared_ptr<Sequence> seq2(new Sequence(s2));
+  Sequence seq0(s0);
+  Sequence seq1(s1);
+  Sequence seq2(s2);
   boost::shared_ptr<AnnotationColors> cm(new AnnotationColors);
   GlSequence glseq0(seq0, cm);
   GlSequence glseq1(seq1, cm);
@@ -157,7 +160,7 @@ BOOST_AUTO_TEST_CASE( setSelectedPaths )
   Sequence seq0(s0);
   Sequence seq1(s1);
   Sequence seq2(s2);
-
+  
   GlSeqBrowser gt;
   gt.push_sequence(seq0);
   gt.push_sequence(seq1);
@@ -195,7 +198,6 @@ BOOST_AUTO_TEST_CASE( setSelectedTracks )
   gt.push_sequence(seq1);
   gt.push_sequence(seq2);
 
-
   BOOST_CHECK_EQUAL( gt.selectedTracks().size(), 0 );
   gt.appendSelectedTrack(0, 0, seq0.size());
   gt.appendSelectedTrack(2, 0, seq2.size());
@@ -218,5 +220,4 @@ BOOST_AUTO_TEST_CASE( setSelectedTracks )
   BOOST_CHECK_EQUAL(seq_locs.front().getSequence(), seq0);
   BOOST_CHECK_EQUAL(seq_locs.front().getLeft(), 0);
   BOOST_CHECK_EQUAL(seq_locs.front().getRight(), 2);
-
 }