isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-12 06:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7501f3b4f9
mutter/tests/conform/text.c

551 lines
15 KiB
C
Raw Normal View History

Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
#include <glib.h>
#include <clutter/clutter.h>
#include <string.h>
typedef struct {
gunichar unichar;
const char bytes[6];
gint nbytes;
} TestData;
static const TestData
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
test_text_data[] = {
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{ 0xe4, "\xc3\xa4", 2 }, /* LATIN SMALL LETTER A WITH DIAERESIS */
{ 0x2665, "\xe2\x99\xa5", 3 } /* BLACK HEART SUIT */
};
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_utf8_validation (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
int i;
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
gunichar unichar;
char bytes[6];
int nbytes;
g_assert (g_unichar_validate (t->unichar));
nbytes = g_unichar_to_utf8 (t->unichar, bytes);
bytes[nbytes] = '\0';
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_assert_cmpint (nbytes, ==, t->nbytes);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert (memcmp (t->bytes, bytes, nbytes) == 0);
unichar = g_utf8_get_char_validated (bytes, nbytes);
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_assert_cmpint (unichar, ==, t->unichar);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
}
}
static int
get_nbytes (ClutterText *text)
{
const char *s = clutter_text_get_text (text);
return strlen (s);
}
static int
get_nchars (ClutterText *text)
{
const char *s = clutter_text_get_text (text);
g_assert (g_utf8_validate (s, -1, NULL));
return g_utf8_strlen (s, -1);
}
#define DONT_MOVE_CURSOR (-2)
static void
insert_unichar (ClutterText *text, gunichar unichar, int position)
{
if (position > DONT_MOVE_CURSOR)
{
clutter_text_set_cursor_position (text, position);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, position);
}
clutter_text_insert_unichar (text, unichar);
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_set_empty (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
Use "" as the default value for the :text property This follows the convention of GtkLabel/GtkEntry in GTK+ and the old ClutterEntry. It makes it easier to use strlen/strcmp etc on the output, since we can assume that it is always a string. This commit also updates the test unit for ClutterText to verify that the clutter_text_get_text() function also returns an empty string when a ClutterText actor has been created.
2008-12-22 13:29:10 +00:00
g_assert_cmpstr (clutter_text_get_text (text), ==, "");
g_assert_cmpint (*clutter_text_get_text (text), ==, '\0');
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
clutter_text_set_text (text, "");
g_assert_cmpint (get_nchars (text), ==, 0);
g_assert_cmpint (get_nbytes (text), ==, 0);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_set_text (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
clutter_text_set_text (text, "abcdef");
g_assert_cmpint (get_nchars (text), ==, 6);
g_assert_cmpint (get_nbytes (text), ==, 6);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
clutter_text_set_cursor_position (text, 5);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 5);
/* FIXME: cursor position should be -1?
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
clutter_text_set_text (text, "");
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
*/
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_append_some (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
int j;
for (j = 1; j <= 4; j++)
{
insert_unichar (text, t->unichar, DONT_MOVE_CURSOR);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, j);
g_assert_cmpint (get_nbytes (text), ==, j * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
}
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_prepend_some (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
int j;
clutter_text_insert_unichar (text, t->unichar);
Add comments in the test suite Comment why we need to enable the editability of the Text actor inside the test suite. This should clarify commit ea508ea528d61ae478d8bc4c88f54a89304f18e8
2008-12-11 11:56:44 +00:00
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, 1);
g_assert_cmpint (get_nbytes (text), ==, 1 * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
for (j = 2; j <= 4; j++)
{
insert_unichar (text, t->unichar, 0);
Add comments in the test suite Comment why we need to enable the editability of the Text actor inside the test suite. This should clarify commit ea508ea528d61ae478d8bc4c88f54a89304f18e8
2008-12-11 11:56:44 +00:00
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, j);
g_assert_cmpint (get_nbytes (text), ==, j * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
}
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_insert (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
clutter_text_insert_unichar (text, t->unichar);
clutter_text_insert_unichar (text, t->unichar);
insert_unichar (text, t->unichar, 1);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, 3);
g_assert_cmpint (get_nbytes (text), ==, 3 * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 2);
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_delete_chars (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
int j;
for (j = 0; j < 4; j++)
clutter_text_insert_unichar (text, t->unichar);
conform/text: Add verbose output
2014-01-24 18:49:00 +00:00
if (g_test_verbose ())
g_print ("text: %s\n", clutter_text_get_text (text));
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
clutter_text_set_cursor_position (text, 2);
clutter_text_delete_chars (text, 1);
conform/text: Add verbose output
2014-01-24 18:49:00 +00:00
if (g_test_verbose ())
g_print ("text: %s (cursor at: %d)\n",
clutter_text_get_text (text),
clutter_text_get_cursor_position (text));
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, 3);
g_assert_cmpint (get_nbytes (text), ==, 3 * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
clutter_text_set_cursor_position (text, 2);
clutter_text_delete_chars (text, 1);
conform/text: Add verbose output
2014-01-24 18:49:00 +00:00
if (g_test_verbose ())
g_print ("text: %s (cursor at: %d)\n",
clutter_text_get_text (text),
clutter_text_get_cursor_position (text));
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (get_nchars (text), ==, 2);
g_assert_cmpint (get_nbytes (text), ==, 2 * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_get_chars (void)
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
gchar *chars;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Add Text::get_chars() implementation and tests The clutter_text_get_chars() function returns a section of the contents of the Text actor, delimited by a start and an end position. This commit adds the implementation for that function and a test unit that guarantees the offset-to-bytes computations are correct.
2008-12-11 11:59:50 +00:00
clutter_text_set_text (text, "00abcdef11");
g_assert_cmpint (get_nchars (text), ==, 10);
g_assert_cmpint (get_nbytes (text), ==, 10);
g_assert_cmpstr (clutter_text_get_text (text), ==, "00abcdef11");
chars = clutter_text_get_chars (text, 2, -1);
g_assert_cmpstr (chars, ==, "abcdef11");
g_free (chars);
chars = clutter_text_get_chars (text, 0, 8);
g_assert_cmpstr (chars, ==, "00abcdef");
g_free (chars);
chars = clutter_text_get_chars (text, 2, 8);
g_assert_cmpstr (chars, ==, "abcdef");
g_free (chars);
chars = clutter_text_get_chars (text, 8, 12);
g_assert_cmpstr (chars, ==, "11");
g_free (chars);
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_delete_text (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
int j;
for (j = 0; j < 4; j++)
clutter_text_insert_unichar (text, t->unichar);
clutter_text_set_cursor_position (text, 3);
clutter_text_delete_text (text, 2, 4);
g_assert_cmpint (get_nchars (text), ==, 2);
g_assert_cmpint (get_nbytes (text), ==, 2 * t->nbytes);
/* FIXME: cursor position should be -1?
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
*/
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_password_char (void)
[tests] Add unit for the ClutterText:password-char property Check that the contents of the Text actor are unaffected by the :password-char property; that the accessors are correct; and finally that the initial value for a newly constructed Text actor is valid.
2009-01-06 15:30:31 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
[tests] Add unit for the ClutterText:password-char property Check that the contents of the Text actor are unaffected by the :password-char property; that the accessors are correct; and finally that the initial value for a newly constructed Text actor is valid.
2009-01-06 15:30:31 +00:00
g_assert_cmpint (clutter_text_get_password_char (text), ==, 0);
clutter_text_set_text (text, "hello");
g_assert_cmpstr (clutter_text_get_text (text), ==, "hello");
clutter_text_set_password_char (text, '*');
g_assert_cmpint (clutter_text_get_password_char (text), ==, '*');
g_assert_cmpstr (clutter_text_get_text (text), ==, "hello");
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
static ClutterEvent *
init_event (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
ClutterEvent *retval = clutter_event_new (CLUTTER_KEY_PRESS);
clutter_event_set_time (retval, CLUTTER_CURRENT_TIME);
clutter_event_set_flags (retval, CLUTTER_EVENT_FLAG_SYNTHETIC);
return retval;
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
}
static void
send_keyval (ClutterText *text, int keyval)
{
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
ClutterEvent *event = init_event ();
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
/* Unicode should be ignored for cursor keys etc. */
clutter_event_set_key_unicode (event, 0);
clutter_event_set_key_symbol (event, keyval);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
clutter_actor_event (CLUTTER_ACTOR (text), event, FALSE);
clutter_event_free (event);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
}
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
static void
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
send_unichar (ClutterText *text, gunichar unichar)
{
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
ClutterEvent *event = init_event ();
/* Key symbol should be ignored for printable characters */
clutter_event_set_key_symbol (event, 0);
clutter_event_set_key_unicode (event, unichar);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
clutter_actor_event (CLUTTER_ACTOR (text), event, FALSE);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
event: Add setters for ClutterEvent members Creating a synthetic event requires direct access to the ClutterEvent union members; this access does not map in bindings to high-level languages, especially run-time bindings using GObject-Introspection. It's also midly annoying from C, as it unnecessarily exposes the guts of ClutterEvent - something we might want to fix in the future. http://bugzilla.clutter-project.org/show_bug.cgi?id=2575
2011-02-22 17:12:34 +00:00
clutter_event_free (event);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_cursor (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Add comments in the test suite Comment why we need to enable the editability of the Text actor inside the test suite. This should clarify commit ea508ea528d61ae478d8bc4c88f54a89304f18e8
2008-12-11 11:56:44 +00:00
/* only editable entries listen to events */
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
clutter_text_set_editable (text, TRUE);
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
int j;
for (j = 0; j < 4; ++j)
clutter_text_insert_unichar (text, t->unichar);
clutter_text_set_cursor_position (text, 2);
/* test cursor moves and is clamped */
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
send_keyval (text, CLUTTER_KEY_Left);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
send_keyval (text, CLUTTER_KEY_Left);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 0);
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
send_keyval (text, CLUTTER_KEY_Left);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 0);
/* delete text containing the cursor */
clutter_text_set_cursor_position (text, 3);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 3);
clutter_text_delete_text (text, 2, 4);
keysyms: Update the macros to CLUTTER_KEY_* The keysyms defines in clutter-keysyms.h are generated from the X11 key symbols headers by doing the equivalent of a pass of sed from XK_* to CLUTTER_*. This might lead to namespace collisions, down the road. Instead, we should use the CLUTTER_KEY_* namespace. This commit includes the script, taken from GDK, that parses the X11 key symbols and generates two headers: - clutter-keysyms.h: the default included header, with CLUTTER_KEY_* - clutter-keysyms-compat.h: the compatibility header, with CLUTTER_* The compat.h header file is included if CLUTTER_DISABLE_DEPRECATED is not defined - essentially deprecating all the old key symbols. This does not change any ABI and, assuming that an application or library is not compiling with CLUTTER_DISABLE_DEPRECATED, the source compatibility is still guaranteed.
2010-09-10 12:41:49 +00:00
send_keyval (text, CLUTTER_KEY_Left);
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
/* FIXME: cursor position should be -1?
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
*/
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Start cleaning up the conformance test suite Re-order the units into a sensible list, with basic tests at the beginning, and per-class tests at the end - with Cogl last. Also, start renaming the unit functions from test_<foo> to <foo>, so that the executable wrappers and the reports have sensible names.
2010-10-12 16:31:15 +00:00
text_event (void)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
int i;
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
Add comments in the test suite Comment why we need to enable the editability of the Text actor inside the test suite. This should clarify commit ea508ea528d61ae478d8bc4c88f54a89304f18e8
2008-12-11 11:56:44 +00:00
/* only editable entries listen to events */
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
clutter_text_set_editable (text, TRUE);
for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
{
Update the ClutterText test unit Whenever we are sending specially crafted KeyEvents to a ClutterText we also need to set it editable, since the event handling code depends on the editability setting.
2008-12-11 11:51:28 +00:00
const TestData *t = &test_text_data[i];
Add a separate test unit for ClutterText Instead of changing the unit for ClutterEntry, we add a new test unit specifically for ClutterText so that we can later tweak it specifically for the behaviour changes needed to make ClutterText work better.
2008-12-11 11:45:37 +00:00
send_unichar (text, t->unichar);
g_assert_cmpint (get_nchars (text), ==, 1);
g_assert_cmpint (get_nbytes (text), ==, 1 * t->nbytes);
g_assert_cmpint (clutter_text_get_cursor_position (text), ==, -1);
clutter_text_set_text (text, "");
}
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
text: Make :use-markup set idempotent Setting :use-markup and :text is currently not idempotent, and it depends on the ordering, e.g.: g_object_set (actor, "use-markup", TRUE, "text", value, NULL); does not yield the same results as: g_object_set (actor, "text", value, "use-markup", TRUE, NULL); This is particularly jarring when using ClutterText from ClutterScript, but in general GObject properties should not rely on the order when used from g_object_set(). The fix is to store the contents of the ClutterText as a separate string from the displayed text, and use the contents, instead of the displayed text, when toggling the :use-markup property. Let's also add a unit test for good measure, to try and catch regressions. https://bugzilla.gnome.org/show_bug.cgi?id=651940
2011-09-06 11:45:41 +00:00
static inline void
validate_markup_attributes (ClutterText *text,
PangoAttrType attr_type,
int start_index,
int end_index)
{
PangoLayout *layout;
PangoAttrList *attrs;
PangoAttrIterator *iter;
layout = clutter_text_get_layout (text);
g_assert (layout != NULL);
attrs = pango_layout_get_attributes (layout);
g_assert (attrs != NULL);
iter = pango_attr_list_get_iterator (attrs);
while (pango_attr_iterator_next (iter))
{
GSList *attributes = pango_attr_iterator_get_attrs (iter);
PangoAttribute *a;
if (attributes == NULL)
break;
g_assert (attributes->data != NULL);
a = attributes->data;
g_assert (a->klass->type == attr_type);
g_assert_cmpint (a->start_index, ==, start_index);
g_assert_cmpint (a->end_index, ==, end_index);
g_slist_free_full (attributes, (GDestroyNotify) pango_attribute_destroy);
}
pango_attr_iterator_destroy (iter);
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
static void
conform: Clean up test names Drop the 'test-' prefix: it's the conformance test suite, we know it's full of tests.
2012-02-27 12:54:23 +00:00
text_idempotent_use_markup (void)
text: Make :use-markup set idempotent Setting :use-markup and :text is currently not idempotent, and it depends on the ordering, e.g.: g_object_set (actor, "use-markup", TRUE, "text", value, NULL); does not yield the same results as: g_object_set (actor, "text", value, "use-markup", TRUE, NULL); This is particularly jarring when using ClutterText from ClutterScript, but in general GObject properties should not rely on the order when used from g_object_set(). The fix is to store the contents of the ClutterText as a separate string from the displayed text, and use the contents, instead of the displayed text, when toggling the :use-markup property. Let's also add a unit test for good measure, to try and catch regressions. https://bugzilla.gnome.org/show_bug.cgi?id=651940
2011-09-06 11:45:41 +00:00
{
ClutterText *text;
const char *contents = "foo <b>bar</b>";
const char *display = "foo bar";
int bar_start_index = strstr (display, "bar") - display;
int bar_end_index = bar_start_index + strlen ("bar");
/* case 1: text -> use_markup */
if (g_test_verbose ())
g_print ("text: '%s' -> use-markup: TRUE\n", contents);
text = g_object_new (CLUTTER_TYPE_TEXT,
"text", contents, "use-markup", TRUE,
NULL);
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
g_object_ref_sink (text);
text: Make :use-markup set idempotent Setting :use-markup and :text is currently not idempotent, and it depends on the ordering, e.g.: g_object_set (actor, "use-markup", TRUE, "text", value, NULL); does not yield the same results as: g_object_set (actor, "text", value, "use-markup", TRUE, NULL); This is particularly jarring when using ClutterText from ClutterScript, but in general GObject properties should not rely on the order when used from g_object_set(). The fix is to store the contents of the ClutterText as a separate string from the displayed text, and use the contents, instead of the displayed text, when toggling the :use-markup property. Let's also add a unit test for good measure, to try and catch regressions. https://bugzilla.gnome.org/show_bug.cgi?id=651940
2011-09-06 11:45:41 +00:00
if (g_test_verbose ())
g_print ("Contents: '%s' (expected: '%s')\n",
clutter_text_get_text (text),
display);
g_assert_cmpstr (clutter_text_get_text (text), ==, display);
validate_markup_attributes (text,
PANGO_ATTR_WEIGHT,
bar_start_index,
bar_end_index);
clutter_actor_destroy (CLUTTER_ACTOR (text));
/* case 2: use_markup -> text */
if (g_test_verbose ())
g_print ("use-markup: TRUE -> text: '%s'\n", contents);
text = g_object_new (CLUTTER_TYPE_TEXT,
"use-markup", TRUE, "text", contents,
NULL);
if (g_test_verbose ())
g_print ("Contents: '%s' (expected: '%s')\n",
clutter_text_get_text (text),
display);
g_assert_cmpstr (clutter_text_get_text (text), ==, display);
validate_markup_attributes (text,
PANGO_ATTR_WEIGHT,
bar_start_index,
bar_end_index);
clutter_actor_destroy (CLUTTER_ACTOR (text));
}
conformance: Add more tests Add back some deprecated and general purpose API tests. These are the ones that were written already pretty much conforming to the GTest API and style, and thus require minimal porting.
2013-12-12 15:05:16 +00:00
CLUTTER_TEST_SUITE (
CLUTTER_TEST_UNIT ("/text/utf8-validation", text_utf8_validation)
CLUTTER_TEST_UNIT ("/text/set-empty", text_set_empty)
CLUTTER_TEST_UNIT ("/text/set-text", text_set_text)
CLUTTER_TEST_UNIT ("/text/append-some", text_append_some)
CLUTTER_TEST_UNIT ("/text/prepend-some", text_prepend_some)
CLUTTER_TEST_UNIT ("/text/insert", text_insert)
CLUTTER_TEST_UNIT ("/text/delete-chars", text_delete_chars)
CLUTTER_TEST_UNIT ("/text/get-chars", text_get_chars)
CLUTTER_TEST_UNIT ("/text/delete-text", text_delete_text)
CLUTTER_TEST_UNIT ("/text/password-char", text_password_char)
CLUTTER_TEST_UNIT ("/text/cursor", text_cursor)
CLUTTER_TEST_UNIT ("/text/event", text_event)
CLUTTER_TEST_UNIT ("/text/idempotent-use-markup", text_idempotent_use_markup)
)
Reference in New Issue Copy Permalink