projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1
[mussa.git]
/
alg
/
test
/
test_drawable.cpp
diff --git
a/alg/test/test_drawable.cpp
b/alg/test/test_drawable.cpp
index 63d75efdd8be802dd4aa018886b69496251b750c..391427670985dfebdcef97a2c138795eaf514eca 100644
(file)
--- a/
alg/test/test_drawable.cpp
+++ b/
alg/test/test_drawable.cpp
@@
-1,5
+1,6
@@
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE test_drawable
+#include <boost/test/unit_test.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
@@
-67,7
+68,7
@@
BOOST_AUTO_TEST_CASE( drawable_copyref_constructor )
BOOST_CHECK_EQUAL(*csp->color(), *black);
}
BOOST_CHECK_EQUAL(*csp->color(), *black);
}
-void test_draw_func_null(SeqSpanRef r,
void *p
)
+void test_draw_func_null(SeqSpanRef r,
float, float
)
{
}
{
}
@@
-82,10
+83,10
@@
BOOST_AUTO_TEST_CASE( drawable_null_draw_func )
BOOST_CHECK_EQUAL(bsp->drawFunction(), test_draw_func_null);
}
BOOST_CHECK_EQUAL(bsp->drawFunction(), test_draw_func_null);
}
-void test_draw_func_find_drawable(SeqSpanRef r
, void *p
)
+void test_draw_func_find_drawable(SeqSpanRef r
ef, float l, float r
)
{
{
- BOOST_REQUIRE(r->drawable());
- BOOST_REQUIRE_EQUAL(r->drawable()->drawFunction(), test_draw_func_find_drawable);
+ BOOST_REQUIRE(r
ef
->drawable());
+ BOOST_REQUIRE_EQUAL(r
ef
->drawable()->drawFunction(), test_draw_func_find_drawable);
}
BOOST_AUTO_TEST_CASE( test_drawable_find_drawable )
}
BOOST_AUTO_TEST_CASE( test_drawable_find_drawable )
@@
-97,4
+98,4
@@
BOOST_AUTO_TEST_CASE( test_drawable_find_drawable )
BOOST_CHECK_EQUAL(drawsp->drawFunction(), test_draw_func_find_drawable);
ssp->drawable()->drawFunction();
BOOST_CHECK_EQUAL(drawsp->drawFunction(), test_draw_func_find_drawable);
ssp->drawable()->drawFunction();
-}
\ No newline at end of file
+}