From 264f24f7e3c25403572a665bb9a9ad73d0357278 Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Wed, 13 May 2009 22:32:45 +0300 Subject: [PATCH] Remove three bogus tests for HildonColorChooser * tests/TEST-CASES.txt: Remove bogus tests. * tests/check-hildon-color-chooser.c: (test_set_color_invalid): Remove three bogus tests that were actually setting valid colors. --- ChangeLog | 12 +++++++++ tests/TEST-CASES.txt | 11 +++----- tests/check-hildon-color-chooser.c | 52 +++--------------------------------- 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaa1a7b..b0a4390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-08 Claudio Saavedra + * tests/TEST-CASES.txt: Remove bogus tests. + * tests/check-hildon-color-chooser.c: (test_set_color_invalid): + Remove three bogus tests that were actually setting valid colors. + +2009-06-08 Claudio Saavedra + * configure.ac: post release version bump * debian/changelog: post release version bump @@ -428,6 +434,12 @@ Fixes: NB#116786 (Image viewer crases whie trying to launch menu, in a scenario) +2009-05-13 Claudio Saavedra + + * tests/TEST-CASES.txt: Remove other bogus test. + * tests/check-hildon-controlbar.c: (test_set_value_invalid): + Remove bogus test that was setting/retrieving a valid value. + 2009-05-13 Artem Egorkine * src/hildon-animation-actor.c, diff --git a/tests/TEST-CASES.txt b/tests/TEST-CASES.txt index 9d94b26..8dd2baf 100644 --- a/tests/TEST-CASES.txt +++ b/tests/TEST-CASES.txt @@ -1132,13 +1132,10 @@ the list of tests (Section 2). Use the following example as a template: d) Set and get base color defined by #0000FF. 3. Test that invalid color values do not cause problems. - a) Set and get base color defined by #00FFFF and pixel 0. - b) Set and get base color defined by #0ABCDE and pixel 0. - c) Set and get base color defined by #FF00FF and pixel 0. - d) Set the color (65536,65536,65536). - d) Set and get base color defined by NULL color. - e) Set base color on NULL object. - f) Get base color from NULL object. + a) Set the color (65536,65536,65536). + b) Set and get base color defined by NULL color. + c) Set base color on NULL object. + d) Get base color from NULL object. - hildon_color_selector_new: [TODO] diff --git a/tests/check-hildon-color-chooser.c b/tests/check-hildon-color-chooser.c index 71e77f4..ed51741 100644 --- a/tests/check-hildon-color-chooser.c +++ b/tests/check-hildon-color-chooser.c @@ -193,9 +193,6 @@ END_TEST /** * Purpose: Check that invalid base colors are set and get properly * Cases considered: - * - Set and get base color defined by #00FFFF and pixel 0. - * - Set and get base color defined by #0ABCDE and pixel 0. - * - Set and get base color defined by #FF00FF and pixel 0. * - Set the color (65536,65536,65536). * - Set and get base color defined by NULL color. * - Set base color on NULL object. @@ -221,49 +218,8 @@ START_TEST (test_set_color_invalid) hildon_color_chooser_set_color(color_chooser,b_color); gdk_color_free(b_color); - /* Test 1: Set the color #00FFFF*/ - gdk_color_parse( "#00FFFF", &color); - b_color = gdk_color_copy(&color); - - hildon_color_chooser_set_color(color_chooser,b_color); - hildon_color_chooser_get_color(color_chooser,ret_color); - - fail_if ((0 != ret_color->red) || (0 != ret_color->green) || (0 != ret_color->blue), - "hildon-color-chooser: The returned RGB color is %i/%i/%i and should be %i/%i/%i", - ret_color->red, ret_color->green, ret_color->blue, - 0, 0, 0); - - gdk_color_free(b_color); - - /* Test 2: Set the color #FFFFFF */ - gdk_color_parse( "#0ABCDE", &color); - b_color = gdk_color_copy(&color); - - hildon_color_chooser_set_color(color_chooser,b_color); - hildon_color_chooser_get_color(color_chooser,ret_color); - - fail_if ((0 != ret_color->red) || (0 != ret_color->green) || (0 != ret_color->blue), - "hildon-color-chooser: The returned RGB color is %i/%i/%i and should be %i/%i/%i", - ret_color->red, ret_color->green, ret_color->blue, - 0, 0, 0); - - gdk_color_free(b_color); - - /* Test 2: Set the color #FF00FF */ - gdk_color_parse( "#FF00FF", &color); - b_color = gdk_color_copy(&color); - - hildon_color_chooser_set_color(color_chooser,b_color); - hildon_color_chooser_get_color(color_chooser,ret_color); - - fail_if ((0 != ret_color->red) || (0 != ret_color->green) || (0 != ret_color->blue), - "hildon-color-chooser: The returned RGB color is %i/%i/%i and should be %i/%i/%i", - ret_color->red, ret_color->green, ret_color->blue, - 0, 0, 0); - - gdk_color_free(b_color); - /* Test 3: Set the color (65536,65536,65536)*/ + /* Test 1: Set the color (65536,65536,65536)*/ gdk_color_parse( "#000000", &color); b_color = gdk_color_copy(&color); red = MAX_COLOR+1; @@ -282,13 +238,13 @@ START_TEST (test_set_color_invalid) ret_color->red, ret_color->green, ret_color->blue, 0, 0, 0); - /* Test 5: Set the color NULL on color chooser*/ + /* Test 2: Set the color NULL on color chooser*/ hildon_color_chooser_set_color(color_chooser,NULL); - /* Test 6: Set the color on NULL object*/ + /* Test 3: Set the color on NULL object*/ hildon_color_chooser_set_color(NULL,b_color); - /* Test 7: Get color from NULL object*/ + /* Test 4: Get color from NULL object*/ hildon_color_chooser_get_color(NULL, ret_color); if (b_color) -- 1.7.9.5