From fc40d75956e130a39c50cdaccc7af739a4591ac9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 9 Mar 2009 17:07:47 +0000 Subject: [PATCH] [tests] Test CoglFixed, not ClutterFixed We really want to test the CoglFixed implementation, not the to-be-deprecated ClutterFixed one. --- tests/conform/test-clutter-fixed.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/conform/test-clutter-fixed.c b/tests/conform/test-clutter-fixed.c index e34872101..0a365b336 100644 --- a/tests/conform/test-clutter-fixed.c +++ b/tests/conform/test-clutter-fixed.c @@ -7,12 +7,12 @@ void test_fixed_constants (TestConformSimpleFixture *fixture, gconstpointer data) { - g_assert_cmpint (CFX_ONE, ==, CLUTTER_FLOAT_TO_FIXED (1.0)); - g_assert_cmpint (CFX_ONE, ==, CLUTTER_INT_TO_FIXED (1)); + g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_FLOAT (1.0)); + g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_INT (1)); - g_assert_cmpint (CFX_HALF, ==, CLUTTER_FLOAT_TO_FIXED (0.5)); + g_assert_cmpint (COGL_FIXED_0_5, ==, COGL_FIXED_FROM_FLOAT (0.5)); - g_assert_cmpfloat (CLUTTER_FIXED_TO_FLOAT (CFX_ONE), ==, 1.0); - g_assert_cmpfloat (CLUTTER_FIXED_TO_FLOAT (CFX_HALF), ==, 0.5); + g_assert_cmpfloat (COGL_FIXED_TO_FLOAT (COGL_FIXED_1), ==, 1.0); + g_assert_cmpfloat (COGL_FIXED_TO_FLOAT (COGL_FIXED_0_5), ==, 0.5); }