[PATCH] richedit: shorten EM_AUTOURLDETECT tests
Alex Villacís Lasso
alex at karlalex.palosanto.com
Sun Jul 20 12:29:57 CDT 2008
EM_AUTOURLDETECT tests are taking too much time, so this patch tests just one URL and one non-URL for all messages but WM_SETTEXT. Also, remove one trace that spams the output needlessly.
---
dlls/riched20/tests/editor.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 49b13e8..24dd0ff 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -1383,6 +1383,9 @@ static HWND new_static_wnd(HWND parent) {
static void test_EM_AUTOURLDETECT(void)
{
+ /* DO NOT change the properties of the first two elements. To shorten the
+ tests, all tests after WM_SETTEXT test just the first two elements -
+ one non-URL and one URL */
struct urls_s {
const char *text;
int is_url;
@@ -1647,10 +1650,12 @@ static void test_EM_AUTOURLDETECT(void)
}
/* Test detection of URLs within normal text - WM_CHAR case. */
- for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
+ /* Test only the first two URL examples for brevity */
+ for (i = 0; i < 2; i++) {
hwndRichEdit = new_richedit(parent);
- for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) {
+ /* Also for brevity, test only the first three delimiters */
+ for (j = 0; j < 3; j++) {
char * at_pos;
int at_offset;
int end_offset;
@@ -1674,7 +1679,6 @@ static void test_EM_AUTOURLDETECT(void)
}
}
SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer);
- trace("Using template: %s\n", templates_delim[j]);
/* This assumes no templates start with the URL itself, and that they
have at least two characters before the URL text */
@@ -1784,7 +1788,8 @@ static void test_EM_AUTOURLDETECT(void)
}
/* Test detection of URLs within normal text - EM_SETTEXTEX case. */
- for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
+ /* Test just the first two URL examples for brevity */
+ for (i = 0; i < 2; i++) {
SETTEXTEX st;
hwndRichEdit = new_richedit(parent);
@@ -1971,7 +1976,8 @@ static void test_EM_AUTOURLDETECT(void)
}
/* Test detection of URLs within normal text - EM_REPLACESEL case. */
- for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
+ /* Test just the first two URL examples for brevity */
+ for (i = 0; i < 2; i++) {
hwndRichEdit = new_richedit(parent);
/* Set selection with X to the URL */
--
1.5.4.1
--------------080803090308080003020903--
More information about the wine-patches
mailing list