Fix the tests to compile against cwidget.

2 files changed, 12 insertions, 4 deletions

diff --git a/tests/test_eassert.cc b/tests/test_eassert.cc
index 637bce20..e65f40fa 100644
--- a/tests/test_eassert.cc
+++ b/tests/test_eassert.cc
@@ -17,7 +17,10 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
-#include <generic/util/eassert.h>
+// TODO: eassert lives in cwidget now, this test should perhaps move
+// there.
+
+#include <cwidget/generic/util/eassert.h>
 
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -45,7 +48,7 @@ public:
       {
 	failureLine = __LINE__; eassert(a == 1);
       }
-    catch(AssertionFailure &e)
+    catch(cwidget::util::AssertionFailure &e)
       {
 	CPPUNIT_ASSERT_EQUAL(std::string("a == 1"), e.get_exp());
 	CPPUNIT_ASSERT_EQUAL(failureLine, e.get_line());
diff --git a/tests/test_threads.cc b/tests/test_threads.cc
index b92fc4eb..132ab188 100644
--- a/tests/test_threads.cc
+++ b/tests/test_threads.cc
@@ -17,9 +17,12 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+// TODO: threads code lives in cwidget now, this test should move
+// there.
+
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <generic/util/event_queue.h>
+#include <cwidget/generic/threads/event_queue.h>
 #include <cwidget/generic/threads/threads.h>
 
 #include <iostream>
@@ -27,6 +30,8 @@
 #include <sys/time.h>
 #include <time.h>
 
+namespace cw = cwidget;
+
 class TestThreads : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE(TestThreads);
@@ -88,7 +93,7 @@ public:
       {
 	do_testBox();
       }
-    catch(const Exception &e)
+    catch(const cw::util::Exception &e)
       {
 	std::cerr << "Caught exception in testBox: " << e.errmsg() << std::endl;
 	throw;