https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Adjust tests. * tests/window2d.cc: Disable display. * tests/image_entry.cc, tests/identity_morpher.cc, * tests/add_neighborhood_morpher.cc, tests/morphers.cc: Remove mlc_is_a tests w.r.t to oln::abstract::grey_level_image, since its definition has changed. add_neighborhood_morpher.cc | 4 ---- identity_morpher.cc | 4 ---- image_entry.cc | 3 --- morphers.cc | 2 -- window2d.cc | 14 ++++++++++++++ 5 files changed, 14 insertions(+), 13 deletions(-) Index: tests/window2d.cc --- tests/window2d.cc (revision 648) +++ tests/window2d.cc (working copy) @@ -45,10 +45,21 @@ oln_qiter(I) q(p, win); for_all(p) { +#if 0 + // Disable the display to speed up the test. std::cout << unsigned(ima(p)) << ": "; +#endif for_all(q) + { +#if 0 + // Likewise. std::cout << unsigned(ima(q)) << " "; +#endif + } +#if 0 + // Likewise. std::cout << std::endl; +#endif } } @@ -60,7 +71,10 @@ using namespace oln; image2d<unsigned char> ima = io::load_pgm(rdata("lena32.pgm")); +#if 0 + // Disable the display to speed up the test. debug::println(ima); +#endif window2d win; win Index: tests/morphers.cc --- tests/morphers.cc (revision 648) +++ tests/morphers.cc (working copy) @@ -48,8 +48,6 @@ // Sanity check: abstractions realized by oln::image2d. mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::grey_level_image) >::check(); image_t ima(42, 51); Index: tests/image_entry.cc --- tests/image_entry.cc (revision 648) +++ tests/image_entry.cc (working copy) @@ -94,9 +94,6 @@ // Check its image dimension abstraction. mlc::assert_< mlc_is_a_(my::image, oln::abstract::image2d) >::check(); - // Check its image type abstraction. - mlc::assert_< mlc_is_a_(my::image, - oln::abstract::grey_level_image) >::check(); // Ensure we can instantiate it. my::image i; Index: tests/add_neighborhood_morpher.cc --- tests/add_neighborhood_morpher.cc (revision 648) +++ tests/add_neighborhood_morpher.cc (working copy) @@ -46,8 +46,6 @@ // Sanity check: interfaces realized by oln::image2d. mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::grey_level_image) >::check(); image_t ima(42, 51); @@ -62,8 +60,6 @@ // Check that the instantiated add_neighborhood morpher realizes the // same interfaces as the underlying morphed image. mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image2d) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_t, - oln::abstract::grey_level_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_t, neighborhood), oln::neighb2d) >::check(); Index: tests/identity_morpher.cc --- tests/identity_morpher.cc (revision 648) +++ tests/identity_morpher.cc (working copy) @@ -46,8 +46,6 @@ // Sanity check: interfaces realized by oln::image2d. mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::grey_level_image) >::check(); image_t ima(42, 51); @@ -61,8 +59,6 @@ // Check that the instantiated identity morpher realizes the same // interfaces as the underlying morphed image. mlc::assert_< mlc_is_a_(image_id_t, oln::abstract::image2d) >::check(); - mlc::assert_< mlc_is_a_(image_id_t, - oln::abstract::grey_level_image) >::check(); image_id_t ima_id(ima); }