tests: Update the source code

These updates have been copied from the master branch, where
the BOOST_AUTO_TEST_*() macros were introduced by Chun-wei Fan.

7 files changed, 88 insertions, 215 deletions

diff --git a/tests/test-context.cc b/tests/test-context.cc
index 6104640..d2c359b 100644
--- a/tests/test-context.cc
+++ b/tests/test-context.cc
@@ -1,4 +1,3 @@
-// vim: ts=2 sw=2 et
 /*
  * These tests are of limited usefulness.  In fact, you might even say that
  * they're not really tests at all.  But I felt that it would be useful to have
@@ -18,8 +17,9 @@ using namespace boost::unit_test;
   auto surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10); \
   auto cr = Cairo::Context::create(surf);
 
-void
-test_dashes ()
+BOOST_AUTO_TEST_SUITE( Cairo_Context )
+
+BOOST_AUTO_TEST_CASE(test_dashes)
 {
   CREATE_CONTEXT(cr);
   std::valarray<double> dash_array(4);
@@ -57,8 +57,7 @@ test_dashes ()
   BOOST_CHECK (get_array.empty ());
 }
 
-void
-test_save_restore ()
+BOOST_AUTO_TEST_CASE(test_save_restore)
 {
   CREATE_CONTEXT(cr);
   cr->set_line_width (2.3);
@@ -69,8 +68,7 @@ test_save_restore ()
   BOOST_CHECK_EQUAL (2.3, cr->get_line_width ());
 }
 
-void
-test_operator ()
+BOOST_AUTO_TEST_CASE(test_operator)
 {
   CREATE_CONTEXT(cr);
   cr->set_operator (Cairo::OPERATOR_ATOP);
@@ -79,8 +77,7 @@ test_operator ()
   BOOST_CHECK_EQUAL (Cairo::OPERATOR_CLEAR, cr->get_operator ());
 }
 
-void
-test_source ()
+BOOST_AUTO_TEST_CASE(test_source)
 {
   CREATE_CONTEXT(cr);
   auto solid_pattern =
@@ -144,16 +141,14 @@ test_source ()
   }
 }
 
-void
-test_tolerance ()
+BOOST_AUTO_TEST_CASE(test_tolerance)
 {
   CREATE_CONTEXT(cr);
   cr->set_tolerance (3.0);
   BOOST_CHECK_EQUAL (3.0, cr->get_tolerance ());
 }
 
-void
-test_antialias ()
+BOOST_AUTO_TEST_CASE(test_antialias)
 {
   CREATE_CONTEXT(cr);
   cr->set_antialias (Cairo::ANTIALIAS_GRAY);
@@ -163,8 +158,7 @@ test_antialias ()
   BOOST_CHECK_EQUAL (Cairo::ANTIALIAS_SUBPIXEL, cr->get_antialias ());
 }
 
-void
-test_fill_rule ()
+BOOST_AUTO_TEST_CASE(test_fill_rule)
 {
   CREATE_CONTEXT(cr);
   cr->set_fill_rule (Cairo::FILL_RULE_EVEN_ODD);
@@ -173,8 +167,7 @@ test_fill_rule ()
   BOOST_CHECK_EQUAL (Cairo::FILL_RULE_WINDING, cr->get_fill_rule ());
 }
 
-void
-test_line_width ()
+BOOST_AUTO_TEST_CASE(test_line_width)
 {
   CREATE_CONTEXT(cr);
   cr->set_line_width (1.0);
@@ -183,8 +176,7 @@ test_line_width ()
   BOOST_CHECK_EQUAL (4.0, cr->get_line_width ());
 }
 
-void
-test_line_cap ()
+BOOST_AUTO_TEST_CASE(test_line_cap)
 {
   CREATE_CONTEXT(cr);
   cr->set_line_cap (Cairo::LINE_CAP_BUTT);
@@ -193,8 +185,7 @@ test_line_cap ()
   BOOST_CHECK_EQUAL (Cairo::LINE_CAP_ROUND, cr->get_line_cap ());
 }
 
-void
-test_line_join ()
+BOOST_AUTO_TEST_CASE(test_line_join )
 {
   CREATE_CONTEXT(cr);
   cr->set_line_join (Cairo::LINE_JOIN_BEVEL);
@@ -203,8 +194,7 @@ test_line_join ()
   BOOST_CHECK_EQUAL (Cairo::LINE_JOIN_MITER, cr->get_line_join ());
 }
 
-void
-test_miter_limit ()
+BOOST_AUTO_TEST_CASE(test_miter_limit)
 {
   CREATE_CONTEXT (cr);
   cr->set_miter_limit (1.3);
@@ -213,8 +203,7 @@ test_miter_limit ()
   BOOST_CHECK_EQUAL (4.12, cr->get_miter_limit ());
 }
 
-void
-test_matrix ()
+BOOST_AUTO_TEST_CASE(test_matrix)
 {
   // just excercise the functionality
   CREATE_CONTEXT (cr);
@@ -226,10 +215,10 @@ test_matrix ()
   cr->set_identity_matrix ();
   cr->get_matrix (matrix);
   auto m2 = cr->get_matrix ();
+  (void)m2; // Silence a warning (unused-but-set-variable)
 }
 
-void
-test_user_device ()
+BOOST_AUTO_TEST_CASE(test_user_device)
 {
   // scale / transform a context, and then verify that user-to-device and
   // device-to-user things work.
@@ -250,8 +239,7 @@ test_user_device ()
   BOOST_CHECK_CLOSE (5.29, y, FLT_EPSILON);
 }
 
-void
-test_draw ()
+BOOST_AUTO_TEST_CASE(test_draw)
 {
   CREATE_CONTEXT (cr);
   // just call a bunch of drawing functions to excercise them a bit.  There's no
@@ -271,8 +259,7 @@ test_draw ()
   cr->paint ();
 }
 
-void
-test_clip ()
+BOOST_AUTO_TEST_CASE(test_clip)
 {
   CREATE_CONTEXT (cr);
   cr->rectangle (0.0, 0.0, 1.0, 1.0);
@@ -285,8 +272,7 @@ test_clip ()
   BOOST_CHECK (y2 == 1.0);
 }
 
-void
-test_current_point ()
+BOOST_AUTO_TEST_CASE(test_current_point)
 {
   CREATE_CONTEXT (cr);
   cr->move_to (2.0, 3.0);
@@ -296,8 +282,7 @@ test_current_point ()
   BOOST_CHECK (y == 3.0);
 }
 
-void
-test_target ()
+BOOST_AUTO_TEST_CASE(test_target)
 {
   auto surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10); \
   auto cr = Cairo::Context::create(surf);
@@ -320,7 +305,7 @@ test_target ()
   BOOST_CHECK (!bad_surface2);
 }
 
-void test_scaled_font()
+BOOST_AUTO_TEST_CASE(test_scaled_font)
 {
   CREATE_CONTEXT (cr);
   auto face = Cairo::ToyFontFace::create("sans",
@@ -342,7 +327,7 @@ void test_scaled_font()
   BOOST_CHECK(cr->get_scaled_font());
 }
 
-void test_font_options()
+BOOST_AUTO_TEST_CASE(test_font_options)
 {
   CREATE_CONTEXT (cr);
   Cairo::FontOptions options;
@@ -353,33 +338,4 @@ void test_font_options()
   BOOST_CHECK(options == other);
 }
 
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
-
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::Context Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_dashes));
-  test->add (BOOST_TEST_CASE (&test_save_restore));
-  test->add (BOOST_TEST_CASE (&test_operator));
-  test->add (BOOST_TEST_CASE (&test_source));
-  test->add (BOOST_TEST_CASE (&test_tolerance));
-  test->add (BOOST_TEST_CASE (&test_antialias));
-  test->add (BOOST_TEST_CASE (&test_fill_rule));
-  test->add (BOOST_TEST_CASE (&test_line_width));
-  test->add (BOOST_TEST_CASE (&test_line_cap));
-  test->add (BOOST_TEST_CASE (&test_line_join));
-  test->add (BOOST_TEST_CASE (&test_miter_limit));
-  test->add (BOOST_TEST_CASE (&test_matrix));
-  test->add (BOOST_TEST_CASE (&test_user_device));
-  test->add (BOOST_TEST_CASE (&test_draw));
-  test->add (BOOST_TEST_CASE (&test_clip));
-  test->add (BOOST_TEST_CASE (&test_current_point));
-  test->add (BOOST_TEST_CASE (&test_target));
-  test->add (BOOST_TEST_CASE (&test_scaled_font));
-  test->add (BOOST_TEST_CASE (&test_font_options));
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-font-face.cc b/tests/test-font-face.cc
index 280f1a1..ddf12a7 100644
--- a/tests/test-font-face.cc
+++ b/tests/test-font-face.cc
@@ -1,4 +1,3 @@
-// vim: ts=2 sw=2 et
 /*
  * These tests are of limited usefulness.  In fact, you might even say that
  * they're not really tests at all.  But I felt that it would be useful to have
@@ -23,8 +22,9 @@ using namespace boost::unit_test;
 #include <cairomm/win32_font.h>
 #endif // CAIRO_HAS_WIN32_FONT
 
-void
-test_create_toy ()
+BOOST_AUTO_TEST_SUITE( Cairo_FontFace )
+
+BOOST_AUTO_TEST_CASE(test_create_toy)
 {
   auto toy =
     Cairo::ToyFontFace::create("sans",
@@ -34,7 +34,7 @@ test_create_toy ()
   BOOST_CHECK_EQUAL (CAIRO_STATUS_SUCCESS, toy->get_status());
 }
 
-void test_toy_getters ()
+BOOST_AUTO_TEST_CASE(test_toy_getters)
 {
   auto toy =
     Cairo::ToyFontFace::create("sans",
@@ -46,12 +46,13 @@ void test_toy_getters ()
   BOOST_CHECK_EQUAL (Cairo::FONT_TYPE_TOY, toy->get_type());
 }
 
-#ifdef CAIRO_HAS_FT_FONT
-void test_ft_font_face()
+#if defined (CAIRO_HAS_FT_FONT) && defined (CAIRO_HAS_FC_FONT)
+BOOST_AUTO_TEST_CASE(test_ft_font_face)
 {
-  auto invalid = FcPatternCreate();
-  Cairo::RefPtr<Cairo::FtFontFace> invalid_face;
-  BOOST_CHECK_THROW(invalid_face = Cairo::FtFontFace::create(invalid), std::bad_alloc);
+  // Does not throw an exception. Skip this test for now. /Kjell Ahlstedt 2020-04-30
+  //auto invalid = FcPatternCreate();
+  //Cairo::RefPtr<Cairo::FtFontFace> invalid_face;
+  //BOOST_CHECK_THROW(invalid_face = Cairo::FtFontFace::create(invalid), std::bad_alloc);
 
   // basically taken from the cairo test case -- we don't care what font we're
   // using so just create an empty pattern and do the minimal substitution to
@@ -66,10 +67,10 @@ void test_ft_font_face()
 
   // FIXME: test creating from a FT_Face
 }
-#endif // CAIRO_HAS_FT_FONT
+#endif // CAIRO_HAS_FT_FONT && CAIRO_HAS_FC_FONT
 
 #ifdef CAIRO_HAS_WIN32_FONT
-void test_win32_font_face()
+BOOST_AUTO_TEST_CASE(test_win32_font_face)
 {
   LOGFONTW lf;
   lf.lfHeight = 10;
@@ -98,23 +99,4 @@ void test_win32_font_face()
 }
 #endif // CAIRO_HAS_WIN32_FONT
 
-
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
-
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::FontFace Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_create_toy));
-  test->add (BOOST_TEST_CASE (&test_toy_getters));
-#ifdef CAIRO_HAS_FT_FONT
-  test->add (BOOST_TEST_CASE (&test_ft_font_face));
-#endif // CAIRO_HAS_FT_FONT
-#ifdef CAIRO_HAS_WIN32_FONT
-  test->add (BOOST_TEST_CASE (&test_win32_font_face));
-#endif // CAIRO_HAS_WIN32_FONT
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-font-options.cc b/tests/test-font-options.cc
index 7b42398..dfd30d0 100644
--- a/tests/test-font-options.cc
+++ b/tests/test-font-options.cc
@@ -7,7 +7,9 @@
 using namespace boost::unit_test;
 using namespace Cairo;
 
-void test_excercise()
+BOOST_AUTO_TEST_SUITE( Cairo_FontOptions )
+
+BOOST_AUTO_TEST_CASE(test_excercise)
 {
   // just excercise all of the methods
   Cairo::FontOptions options;
@@ -34,15 +36,4 @@ void test_excercise()
   BOOST_CHECK_EQUAL(Cairo::HINT_METRICS_OFF, metrics);
 }
 
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
-
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::Context Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_excercise));
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-matrix.cc b/tests/test-matrix.cc
index 83d6cb7..dd8f761 100644
--- a/tests/test-matrix.cc
+++ b/tests/test-matrix.cc
@@ -31,7 +31,9 @@ std::ostream& operator<<(std::ostream& out, const Cairo::Matrix& matrix)
     << matrix.y0 << " ]";
 }
 
-void test_constructors()
+BOOST_AUTO_TEST_SUITE( Cairo_Matrix )
+
+BOOST_AUTO_TEST_CASE(test_constructors)
 {
   cairo_matrix_t c_identity;
   cairo_matrix_init_identity(&c_identity);
@@ -56,7 +58,7 @@ void test_constructors()
   BOOST_CHECK_EQUAL(c_matrix.y0, cpp_matrix.y0);
 }
 
-void test_invert()
+BOOST_AUTO_TEST_CASE(test_invert)
 {
   // test a valid matrix
   BOOST_CHECK_NO_THROW(Cairo::identity_matrix().invert());
@@ -71,7 +73,7 @@ static void foo(cairo_matrix_t* matrix)
   test_matrix = matrix;
 }
 
-void test_cast()
+BOOST_AUTO_TEST_CASE(test_cast)
 {
   // make sure that we can cast between C++ and C types without ill effect
   auto matrix = Cairo::identity_matrix();
@@ -97,7 +99,7 @@ void test_cast()
   BOOST_CHECK_EQUAL(matrix.y0, test_matrix->y0);
 }
 
-void test_multiply()
+BOOST_AUTO_TEST_CASE(test_multiply)
 {
   auto A = Cairo::scaling_matrix(2, 4);
   auto B = Cairo::translation_matrix(5.3, 1.2);
@@ -107,15 +109,4 @@ void test_multiply()
   BOOST_CHECK_EQUAL(C, D);
 }
 
-test_suite*
-init_unit_test_suite(int /*argc*/, char** /*argv*/)
-{
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::Matrix Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_constructors));
-  test->add (BOOST_TEST_CASE (&test_invert));
-  test->add (BOOST_TEST_CASE (&test_cast));
-  test->add (BOOST_TEST_CASE (&test_multiply));
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-scaled-font.cc b/tests/test-scaled-font.cc
index c23775c..ac4b35e 100644
--- a/tests/test-scaled-font.cc
+++ b/tests/test-scaled-font.cc
@@ -7,7 +7,9 @@ using namespace boost::unit_test;
 
 using namespace Cairo;
 
-void test_construction()
+BOOST_AUTO_TEST_SUITE( Cairo_ScaledFont )
+
+BOOST_AUTO_TEST_CASE(test_construction)
 {
   auto face = ToyFontFace::create("sans", FONT_SLANT_NORMAL, FONT_WEIGHT_NORMAL);
   Matrix identity;
@@ -20,7 +22,7 @@ void test_construction()
   BOOST_REQUIRE(font);
 }
 
-void test_text_to_glyphs()
+BOOST_AUTO_TEST_CASE(test_text_to_glyphs)
 {
   auto face = ToyFontFace::create("sans", FONT_SLANT_NORMAL, FONT_WEIGHT_NORMAL);
   Matrix identity;
@@ -37,7 +39,7 @@ void test_text_to_glyphs()
   BOOST_CHECK_EQUAL(3, clusters.size());
 }
 
-void test_scale_matrix()
+BOOST_AUTO_TEST_CASE(test_scale_matrix)
 {
   auto face = ToyFontFace::create("sans", FONT_SLANT_NORMAL, FONT_WEIGHT_NORMAL);
   Matrix m;
@@ -50,7 +52,7 @@ void test_scale_matrix()
   // no real test, just excercising the functionality
 }
 
-void test_get_font_face()
+BOOST_AUTO_TEST_CASE(test_get_font_face)
 {
   // this is to test for a bug where we were accidentally freeing the resulting
   // font face from a call to ScaledFont::get_font_face() when we didn't hold a
@@ -69,12 +71,13 @@ void test_get_font_face()
   BOOST_REQUIRE_EQUAL(cairo_font_face_get_reference_count(face->cobj()), refcount);
 }
 
-#ifdef CAIRO_HAS_FT_FONT
-void test_ft_scaled_font()
+#if defined (CAIRO_HAS_FT_FONT) && defined (CAIRO_HAS_FC_FONT)
+BOOST_AUTO_TEST_CASE(test_ft_scaled_font)
 {
-  auto invalid = FcPatternCreate();
-  Cairo::RefPtr<Cairo::FtFontFace> invalid_face;
-  BOOST_CHECK_THROW(invalid_face = Cairo::FtFontFace::create(invalid), std::bad_alloc);
+  // Does not throw an exception. Skip this test for now. /Kjell Ahlstedt 2020-04-30
+  //auto invalid = FcPatternCreate();
+  //Cairo::RefPtr<Cairo::FtFontFace> invalid_face;
+  //BOOST_CHECK_THROW(invalid_face = Cairo::FtFontFace::create(invalid), std::bad_alloc);
 
   // basically taken from the cairo test case -- we don't care what font we're
   // using so just create an empty pattern and do the minimal substitution to
@@ -101,24 +104,6 @@ void test_ft_scaled_font()
   // make sure that the base destructor is called
   BOOST_CHECK_EQUAL(cairo_scaled_font_get_reference_count(c_scaled_font), refcount -1);
 }
-#endif // CAIRO_HAS_FT_FONT
-
-
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
+#endif // CAIRO_HAS_FT_FONT && CAIRO_HAS_FC_FONT
 
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::ScaledFont Tests" );
-
-  test->add(BOOST_TEST_CASE(&test_construction));
-  test->add(BOOST_TEST_CASE(&test_text_to_glyphs));
-  test->add(BOOST_TEST_CASE(&test_scale_matrix));
-  test->add(BOOST_TEST_CASE(&test_get_font_face));
-#ifdef CAIRO_HAS_FT_FONT
-  test->add(BOOST_TEST_CASE(&test_ft_scaled_font));
-#endif // CAIRO_HAS_FT_FONT
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-surface.cc b/tests/test-surface.cc
index 3f5bf1a..0525cbf 100644
--- a/tests/test-surface.cc
+++ b/tests/test-surface.cc
@@ -13,23 +13,25 @@ ErrorStatus test_slot(const unsigned char* /*data*/, unsigned int /*len*/)
   return CAIRO_STATUS_SUCCESS;
 }
 
-void test_write_to_png_stream()
+BOOST_AUTO_TEST_SUITE( Cairo_Surface )
+
+BOOST_AUTO_TEST_CASE(test_write_to_png_stream)
 {
   auto surface = ImageSurface::create(FORMAT_ARGB32, 1, 1);
   surface->write_to_png_stream(sigc::ptr_fun(test_slot));
   BOOST_CHECK(test_slot_called > 0);
 }
 
-void test_pdf_constructor_slot()
+BOOST_AUTO_TEST_CASE(test_pdf_constructor_slot)
 {
-  test_slot_called = nullptr;
+  test_slot_called = 0;
   auto pdf = PdfSurface::create_for_stream(sigc::ptr_fun(&test_slot), 1, 1);
   pdf->show_page();
   pdf->finish();
   BOOST_CHECK(test_slot_called > 0);
 }
 
-void test_ps_constructor_slot()
+BOOST_AUTO_TEST_CASE(test_ps_constructor_slot)
 {
   test_slot_called = 0;
   auto ps = PsSurface::create_for_stream(sigc::ptr_fun(&test_slot), 1, 1);
@@ -38,7 +40,7 @@ void test_ps_constructor_slot()
   BOOST_CHECK(test_slot_called > 0);
 }
 
-void test_svg_constructor_slot()
+BOOST_AUTO_TEST_CASE(test_svg_constructor_slot)
 {
   test_slot_called = 0;
   auto svg = SvgSurface::create_for_stream(sigc::ptr_fun(&test_slot), 1, 1);
@@ -66,7 +68,7 @@ static cairo_status_t c_test_read_func(void* /*closure*/, unsigned char* data, u
   return CAIRO_STATUS_READ_ERROR;
 }
 
-void test_create_from_png()
+BOOST_AUTO_TEST_CASE(test_create_from_png)
 {
   RefPtr<ImageSurface> surface;
   // try the sigc::slot version
@@ -82,7 +84,7 @@ void test_create_from_png()
   BOOST_CHECK(c_test_read_func_called > 0);
 }
 
-void test_ps_eps()
+BOOST_AUTO_TEST_CASE(test_ps_eps)
 {
   auto ps = PsSurface::create("test.ps", 1, 1);
   // check the initial value
@@ -93,7 +95,7 @@ void test_ps_eps()
   BOOST_CHECK_EQUAL(ps->get_eps(), !result);
 }
 
-void test_content()
+BOOST_AUTO_TEST_CASE(test_content)
 {
   auto surface = ImageSurface::create(FORMAT_ARGB32, 1, 1);
   BOOST_CHECK_EQUAL(surface->get_content(), CONTENT_COLOR_ALPHA);
@@ -102,7 +104,7 @@ void test_content()
   BOOST_CHECK_EQUAL(similar->get_content(), CONTENT_ALPHA);
 }
 
-void test_fallback_resolution()
+BOOST_AUTO_TEST_CASE(test_fallback_resolution)
 {
   auto surface = ImageSurface::create(FORMAT_ARGB32, 1, 1);
   double x, y;
@@ -114,33 +116,14 @@ void test_fallback_resolution()
   BOOST_CHECK_EQUAL(y, new_y);
 }
 
-void test_show_text_glyphs()
+BOOST_AUTO_TEST_CASE(test_show_text_glyphs)
 {
   // image surface doesn't support show_text_glyphs
-  auto surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10); \
+  Cairo::RefPtr<Cairo::Surface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10);
   BOOST_CHECK(!surf->has_show_text_glyphs());
   // but pdf surface should
   surf = Cairo::PdfSurface::create("test.pdf", 10.0, 10.0);
   BOOST_CHECK(surf->has_show_text_glyphs());
 }
 
-
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
-
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::Surface Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_write_to_png_stream));
-  test->add (BOOST_TEST_CASE (&test_pdf_constructor_slot));
-  test->add (BOOST_TEST_CASE (&test_ps_constructor_slot));
-  test->add (BOOST_TEST_CASE (&test_svg_constructor_slot));
-  test->add (BOOST_TEST_CASE (&test_create_from_png));
-  test->add (BOOST_TEST_CASE (&test_ps_eps));
-  test->add (BOOST_TEST_CASE (&test_content));
-  test->add (BOOST_TEST_CASE (&test_show_text_glyphs));
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test-user-font.cc b/tests/test-user-font.cc
index b0cd7b4..8f4cd1a 100644
--- a/tests/test-user-font.cc
+++ b/tests/test-user-font.cc
@@ -1,4 +1,3 @@
-// vim: ts=2 sw=2 et
 /*
  * These tests are of limited usefulness.  In fact, you might even say that
  * they're not really tests at all.  But I felt that it would be useful to have
@@ -8,6 +7,7 @@
 
 #include <cfloat>
 #include <stdexcept>
+#include <iostream>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/test/floating_point_comparison.hpp>
@@ -40,7 +40,7 @@ public:
     render_glyph(const RefPtr<ScaledFont>& /*scaled_font*/,
                  unsigned long /*glyph*/,
                  const RefPtr<Context>& /*cr*/,
-                 TextExtents& /*metrics*/)
+                 TextExtents& /*metrics*/) override
     { ++count_render_glyph; return CAIRO_STATUS_SUCCESS; }
 
   int count_render_glyph;
@@ -74,7 +74,9 @@ protected:
   ImplTextUserFont() : count_text_to_glyphs(0) {}
 };
 
-void test_implement_text()
+BOOST_AUTO_TEST_SUITE( Cairo_UserFontFace )
+
+BOOST_AUTO_TEST_CASE(test_implement_text)
 {
   TestSetup setup;
   auto font = ImplTextUserFont::create();
@@ -101,7 +103,7 @@ protected:
   ImplUnicodeUserFont() : NullRenderUserFont(), count_unicode_to_glyph(0) {}
 };
 
-void test_implement_unicode()
+BOOST_AUTO_TEST_CASE(test_implement_unicode)
 {
   TestSetup setup;
   auto font = ImplTextUserFont::create();
@@ -143,7 +145,7 @@ protected:
   count_text_to_glyphs(0) {}
 };
 
-void test_implement_both()
+BOOST_AUTO_TEST_CASE(test_implement_both)
 {
   TestSetup setup;
   auto font = ImplBothUserFont::create();
@@ -167,7 +169,7 @@ protected:
   ImplNeitherUserFont() : NullRenderUserFont() {}
 };
 
-void test_implement_neither()
+BOOST_AUTO_TEST_CASE(test_implement_neither)
 {
   TestSetup setup;
   auto font = ImplNeitherUserFont::create();
@@ -194,7 +196,7 @@ protected:
   ImplInitUserFont() : NullRenderUserFont(), count_init(0) {}
 };
 
-void test_implement_init()
+BOOST_AUTO_TEST_CASE(test_implement_init)
 {
   TestSetup setup;
   auto font = ImplInitUserFont::create();
@@ -213,7 +215,7 @@ public:
   render_glyph(const RefPtr<ScaledFont>& /*scaled_font*/,
                unsigned long /*glyph*/,
                const RefPtr<Context>& /*cr*/,
-               TextExtents& /*metrics*/)
+               TextExtents& /*metrics*/) override
   {
     count_render_glyph++;
     if (m_flags & FLAG_RENDER)
@@ -224,7 +226,7 @@ public:
   ErrorStatus
   unicode_to_glyph(const RefPtr<ScaledFont>& /*scaled_font*/,
                                        unsigned long unicode,
-                                       unsigned long& glyph)
+                                       unsigned long& glyph) override
   {
     count_unicode_to_glyph++;
     if (m_flags & FLAG_UNICODE)
@@ -261,7 +263,7 @@ protected:
   m_flags(flags) {}
 };
 
-void test_user_font_exception()
+BOOST_AUTO_TEST_CASE(test_user_font_exception)
 {
   auto font =
     ExceptionUserFont::create(ExceptionUserFont::FLAG_INIT);
@@ -313,21 +315,4 @@ void test_user_font_exception()
   BOOST_CHECK (font->count_render_glyph > 0);
 }
 
-
-test_suite*
-init_unit_test_suite(int argc, char* argv[])
-{
-  // compile even with -Werror
-  if (argc && argv) {}
-
-  test_suite* test= BOOST_TEST_SUITE( "Cairo::UserFontFace Tests" );
-
-  test->add (BOOST_TEST_CASE (&test_implement_text));
-  test->add (BOOST_TEST_CASE (&test_implement_unicode));
-  test->add (BOOST_TEST_CASE (&test_implement_both));
-  test->add (BOOST_TEST_CASE (&test_implement_neither));
-  test->add (BOOST_TEST_CASE (&test_implement_init));
-  test->add (BOOST_TEST_CASE (&test_user_font_exception));
-
-  return test;
-}
+BOOST_AUTO_TEST_SUITE_END()