Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1

[mussa.git] / py / test / test_python.cpp

diff --git a/py/test/test_python.cpp b/py/test/test_python.cpp
index a733bea1eaacc345d1d99bb1cc45b07072cc5583..2ed991f1cba1cd26dcb40b84f05a4c19e1c65701 100644 (file)
--- a/py/test/test_python.cpp
+++ b/py/test/test_python.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_python
+#include <boost/test/unit_test.hpp>
 
 #include "py/python.hpp"
 #include <string>
@@ -8,21 +9,21 @@ namespace py = boost::python;
 
 BOOST_AUTO_TEST_CASE( execute_python )
 {
-  get_py()->run("x = 3");
-  int x = py::extract<int>(get_py()->eval("x"));
+  get_py().run("x = 3");
+  int x = py::extract<int>(get_py().eval("x"));
   BOOST_CHECK_EQUAL(x, 3);
 }
 
 BOOST_AUTO_TEST_CASE( lookup_python )
 {
-  get_py()->run("import os");
-  py::object splitext = (*get_py())["os.path.splitext"];
+  get_py().run("import os");
+  py::object splitext = get_py()["os.path.splitext"];
   py::object result = splitext("/home/diane/foo.txt");
   std::string ext = py::extract<std::string>(result[1]);
   BOOST_CHECK_EQUAL(ext, ".txt");
 
-  get_py()->run("from os.path import splitext");
-  py::object splitext2 = (*get_py())["splitext"];
+  get_py().run("from os.path import splitext");
+  py::object splitext2 = get_py()["splitext"];
   py::object result2 = splitext("/home/diane/bar.txt");
   std::string ext2 = py::extract<std::string>(result2[1]);
   BOOST_CHECK_EQUAL(ext, ext2);