From 24a884e9682f07d9dd4fab5cdf64649133d7ba03 Mon Sep 17 00:00:00 2001 From: Junkyeong Kim Date: Tue, 4 May 2021 18:03:42 +0900 Subject: [PATCH] Move verifyTC to etRunner If verifyTC function in etRunner, efl_util_screenshot init and deinit will be executed only once. It is more efficient than in etTCBase. Change-Id: Id8eb963325fc3cfc41d4c271fdcdab3402a985d9 Signed-off-by: Junkyeong Kim --- src/e_test_base.cpp | 413 ----------------------- src/e_test_base.h | 5 - src/e_test_event.cpp | 416 ++++++++++++++++++++++++ src/e_test_event.h | 6 + src/testcase/0002_base_operation.cpp | 8 +- src/testcase/0003_base_operation_multi_wins.cpp | 58 ++-- src/testcase/0004_transient_for.cpp | 10 +- src/testcase/0005_notification.cpp | 24 +- src/testcase/0006_tzsh.cpp | 4 +- src/testcase/0007_rotation.cpp | 2 +- src/testcase/0010_splash.cpp | 8 +- src/testcase/0011_effect.cpp | 10 +- 12 files changed, 484 insertions(+), 480 deletions(-) diff --git a/src/e_test_base.cpp b/src/e_test_base.cpp index 0f40d1d..6fde378 100644 --- a/src/e_test_base.cpp +++ b/src/e_test_base.cpp @@ -1,7 +1,4 @@ #include "e_test_base.h" -#include -#include -#include using ::testing::Test; @@ -9,41 +6,10 @@ using ::testing::Test; #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #endif -#define UT_WAIT(fmt, ...) \ - do \ - { \ - char ch; \ - do \ - { \ - printf(fmt" [n]):next ", ##__VA_ARGS__); \ - ch = tc_getchar(); \ - } while (ch != 'n'); \ - } while (0) - -char -tc_getchar(void) -{ - int c = getchar(); - int ch = c; - - if (ch == '\n' || ch == '\r') - ch = 'y'; - else if (ch < 'a') - ch += ('a' - 'A'); - - while (c != '\n' && c != EOF) - c = getchar(); - - return ch; -} - etTCBase::etTCBase() { etRunner::get().flushEventQueue(); etRunner::get().setTCStart(); - screenshot = efl_util_screenshot_initialize(CAPTURE_WIDTH, CAPTURE_HEIGHT); - if (screenshot == NULL) - ERR("efl_util_screenshot_initialize fail\n"); } etTCBase::~etTCBase() @@ -52,12 +18,6 @@ etTCBase::~etTCBase() numGeomTw = 0; numTw = 0; - if (screenshot) - { - efl_util_screenshot_deinitialize(screenshot); - screenshot = NULL; - } - etRunner::get().setTCEnd(); etRunner::get().flushEventQueue(); @@ -241,376 +201,3 @@ etTCBase::removeTCWin(etWin *tw) return EINA_TRUE; } - -void -_verifyTCGetBufferSize(tbm_surface_h buffer, int *buffer_w, int *buffer_h, int *stride) -{ - tbm_surface_info_s info; - int ret; - - EINA_SAFETY_ON_NULL_RETURN(buffer); - - ret = tbm_surface_get_info(buffer, &info); - if (ret != TBM_SURFACE_ERROR_NONE) - return; - - if (buffer_w) - *buffer_w = info.planes[0].stride >> 2; - - if (buffer_h) - *buffer_h = info.planes[0].size / info.planes[0].stride; - - if (stride) - *stride = info.planes[0].stride; -} - -static void -_verifyTCdumpPng(const char *file, const void *data, int width, int height, int stride) -{ - pixman_image_t *image; - cairo_surface_t *cairo_surface; - cairo_status_t status; - - image = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, width, height, (uint32_t *)data, stride); - if (image == (pixman_image_t *)NULL) - { - ERR("pixman_image_create_bits_no_clear failed"); - return; - } - - cairo_surface = cairo_image_surface_create_for_data((unsigned char *)pixman_image_get_data(image), - CAIRO_FORMAT_RGB24, pixman_image_get_width(image), pixman_image_get_height(image), - pixman_image_get_stride(image)); - if (cairo_surface_status(cairo_surface) != CAIRO_STATUS_SUCCESS) - { - ERR("cairo_image_surface_create_for_data failed"); - pixman_image_unref(image); - return; - } - - status = cairo_surface_write_to_png(cairo_surface, file); - if (status != CAIRO_STATUS_SUCCESS) - { - ERR("Failed to save image '%s': %s\n", file, cairo_status_to_string(status)); - pixman_image_unref(image); - return; - } - - cairo_surface_destroy(cairo_surface); - pixman_image_unref(image); -} - -std::string -_verifyTCMakeDumpPath(std::string basetype, std::string tcname) -{ - std::string path = "/tmp/etTestErr/"; - std::string format = ".png"; - int ret; - - ret = mkdir(path.c_str(), 0755); - if (ret < 0 && errno != EEXIST) - { - ERR("mkdir failed. (%s)\n", path.c_str()); - return "\0"; - } - - path = path + basetype + '/'; - ret = mkdir(path.c_str(), 0755); - if (ret < 0 && errno != EEXIST) - { - ERR("mkdir failed. (%s)\n", path.c_str()); - return "\0"; - } - - path = path + tcname + format; - ERR("path : %s", path.c_str()); - - return path; -} - -void -_verifyTCDumpBuffer(tbm_surface_h buffer, std::string basetype, std::string tcname) -{ - std::string dumppath; - tbm_surface_info_s info; - int ret; - int bo_cnt; - int bw, bh, stride; - - EINA_SAFETY_ON_NULL_RETURN(buffer); - - dumppath = _verifyTCMakeDumpPath(basetype, tcname); - if (dumppath.length() == 0) - { - ERR("getting dumppath failed"); - return; - } - - ret = tbm_surface_map(buffer, TBM_OPTION_READ, &info); - if (ret != TBM_SURFACE_ERROR_NONE) - { - ERR("tbm_surface_map failed"); - return; - } - - _verifyTCGetBufferSize(buffer, &bw, &bh, &stride); - - bo_cnt = tbm_surface_internal_get_num_bos(buffer); - DBG("buffer: bo_cnt(%d) %dx%d(%dx%d) %c%c%c%c, plane: (%p+%d, %d,%d) (%p+%d, %d,%d) (%p+%d, %d,%d)", - bo_cnt, bw, bh, info.width, info.height, FOURCC_STR(info.format), - info.planes[0].ptr, info.planes[0].offset, info.planes[0].stride, info.planes[0].size, - info.planes[1].ptr, info.planes[1].offset, info.planes[1].stride, info.planes[1].size, - info.planes[2].ptr, info.planes[2].offset, info.planes[2].stride, info.planes[2].size); - - if (info.format == TBM_FORMAT_ARGB8888 || info.format == TBM_FORMAT_XRGB8888) - _verifyTCdumpPng(dumppath.c_str(), info.planes[0].ptr, bw, bh, stride); - else - DBG("not supported dump format"); - - tbm_surface_unmap(buffer); -} - -std::string -_verifyTCMakeRefPath(std::string basetype, std::string tcname) -{ - std::string path = "/usr/share/e_tizen_unittests/data/"; - std::string format = ".png"; - - path = path + basetype + '/' + tcname + format; - - return path; -} - -pixman_format_code_t -_verifyTCCairo2Pixman(cairo_format_t fmt) -{ - if (fmt == CAIRO_FORMAT_ARGB32) - return PIXMAN_a8r8g8b8; - else if (fmt == CAIRO_FORMAT_RGB24) - return PIXMAN_x8r8g8b8; - else - return (pixman_format_code_t)0; -} - -static void -destroy_cairo_surface(pixman_image_t *image, void *data) -{ - cairo_surface_t *surface = (cairo_surface_t *)data; - - cairo_surface_destroy(surface); -} - -pixman_image_t * -_verifyTCConvertx8r8g8b8(pixman_image_t *image) -{ - pixman_image_t *ret; - int width; - int height; - - if (pixman_image_get_format(image) == PIXMAN_x8r8g8b8) - return pixman_image_ref(image); - - width = pixman_image_get_width(image); - height = pixman_image_get_height(image); - - ret = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, width, height, NULL, 0); - if (ret == NULL) - { - ERR("pixman_image_create_bits_no_clear failed"); - return NULL; - } - - pixman_image_composite32(PIXMAN_OP_SRC, image, NULL, ret, 0, 0, 0, 0, 0, 0, width, height); - - return ret; -} - -pixman_image_t * -_verifyTCLoadImage(const char *fname) -{ - pixman_image_t *image; - pixman_image_t *converted; - cairo_format_t cairo_fmt; - pixman_format_code_t pixman_fmt; - cairo_surface_t *reference_cairo_surface; - cairo_status_t status; - int width; - int height; - int stride; - void *data; - - reference_cairo_surface = cairo_image_surface_create_from_png(fname); - cairo_surface_flush(reference_cairo_surface); - status = cairo_surface_status(reference_cairo_surface); - if (status != CAIRO_STATUS_SUCCESS) - { - ERR("Could not open %s: %s\n", fname, cairo_status_to_string(status)); - cairo_surface_destroy(reference_cairo_surface); - return NULL; - } - - cairo_fmt = cairo_image_surface_get_format(reference_cairo_surface); - pixman_fmt = _verifyTCCairo2Pixman(cairo_fmt); - ERR("pixman format(PIXMAN_a8r8g8b8:%d,PIXMAN_x8r8g8b8:%d) : %d", PIXMAN_a8r8g8b8, PIXMAN_x8r8g8b8, pixman_fmt); - if (pixman_fmt == (pixman_format_code_t)0) - { - ERR("unknown format"); - cairo_surface_destroy(reference_cairo_surface); - return NULL; - } - - width = cairo_image_surface_get_width(reference_cairo_surface); - height = cairo_image_surface_get_height(reference_cairo_surface); - stride = cairo_image_surface_get_stride(reference_cairo_surface); - data = cairo_image_surface_get_data(reference_cairo_surface); - - image = pixman_image_create_bits_no_clear(pixman_fmt, width, height, (uint32_t *)data, stride); - if (image == (pixman_image_t *)NULL) - { - ERR("pixman_image_create_bits_no_clear failed"); - cairo_surface_destroy(reference_cairo_surface); - return NULL; - } - - pixman_image_set_destroy_function(image, destroy_cairo_surface, reference_cairo_surface); - - converted = _verifyTCConvertx8r8g8b8(image); - pixman_image_unref(image); - - return converted; -} - -Eina_Bool -_verifyTCCheckPixel(uint32_t pix_a, uint32_t pix_b, int w, int h) -{ - int i, shift; - int diffmin = -3; - int diffmax = 4; - int val_a, val_b, diff; - - for (shift = 8, i = 1; i < 4; shift += 8, i++) - { - val_a = (pix_a >> shift) & 0xFF; - val_b = (pix_b >> shift) & 0xFF; - diff = val_b - val_a; - - if (diff < diffmin || diff > diffmax) - return EINA_FALSE; - } - - return EINA_TRUE; -} - -Eina_Bool -_verifyTCCheckImage(pixman_image_t *surface, pixman_image_t *ref) -{ - Eina_Bool ret = EINA_TRUE; - int surface_width, surface_height, surface_stride; - uint32_t *surface_data; - int pixman_width; - uint32_t *pixman_data; - int w, h; - uint32_t *current_surface_data; - uint32_t *current_pixman_data; - - surface_width = pixman_image_get_width(surface); - surface_height = pixman_image_get_height(surface); - surface_stride = pixman_image_get_stride(surface); - surface_data = pixman_image_get_data(surface); - - pixman_width = pixman_image_get_width(ref); - pixman_data = pixman_image_get_data(ref); - - for (h = 0; h < surface_height; h++ ) - { - current_surface_data = surface_data + h * surface_stride; - current_pixman_data = pixman_data + h * pixman_width; - - for (w = 0; w < surface_width; w++) - { - ret = _verifyTCCheckPixel(*current_surface_data, *current_pixman_data, w, h); - if (ret == EINA_FALSE) - return ret; - - current_surface_data++; - current_pixman_data++; - } - } - - return ret; -} - -Eina_Bool -_verifyTC(tbm_surface_h surface, std::string basetype, std::string tcname) -{ - std::string refpath; - pixman_image_t *shot; - pixman_image_t *ref; - Eina_Bool ret = EINA_FALSE; - tbm_surface_info_s info; - int error; - - refpath = _verifyTCMakeRefPath(basetype, tcname); - if (refpath.length() == 0) - { - ERR("getting dumppath failed"); - return EINA_FALSE; - } - - ref = _verifyTCLoadImage(refpath.c_str()); - if (ref == (pixman_image_t *)NULL) - { - ERR("LoadImage failed"); - return EINA_FALSE; - } - - error = tbm_surface_map(surface, TBM_OPTION_READ, &info); - if (error != TBM_SURFACE_ERROR_NONE) - { - ERR("tbm_surface_map failed"); - pixman_image_unref(ref); - return EINA_FALSE; - } - - shot = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, info.width, info.height, (uint32_t *)info.planes[0].ptr, info.planes[0].stride >> 2); - if (shot == (pixman_image_t *)NULL) - { - ERR("pixman_image_create_bits_no_clear failed"); - tbm_surface_unmap(surface); - pixman_image_unref(ref); - return EINA_FALSE; - } - - ret = _verifyTCCheckImage(shot, ref); - - pixman_image_unref(shot); - pixman_image_unref(ref); - - return ret; -} - -Eina_Bool -etTCBase::verifyTC(std::string basetype, std::string tcname) -{ - tbm_surface_h surface = NULL; - Eina_Bool ret = EINA_FALSE; - - surface = efl_util_screenshot_take_tbm_surface(screenshot); - if (surface == NULL) - { - ERR("screenshot failed"); - return EINA_FALSE; - } - - ret = _verifyTC(surface, basetype, tcname); - if (ret == EINA_FALSE) - { - ERR("verify failed"); - _verifyTCDumpBuffer(surface, basetype, tcname); - } - - tbm_surface_destroy(surface); -// UT_WAIT("test"); - - return ret; -} diff --git a/src/e_test_base.h b/src/e_test_base.h index f9e85d6..f3e1c37 100644 --- a/src/e_test_base.h +++ b/src/e_test_base.h @@ -2,9 +2,6 @@ #define __ET_TESTCASE_BASE__ #include "e_test_event.h" -#include -#include -#include using ::testing::Test; @@ -26,7 +23,6 @@ class etTCBase : public ::testing::Test Eina_Bool showTCWin(etWin *tw); Eina_Bool showActivateTCWin(etWin *tw); Eina_Bool removeTCWin(etWin *tw); - Eina_Bool verifyTC(std::string basetype, std::string tcname); protected: std::shared_ptr ev_result; @@ -40,7 +36,6 @@ class etTCBase : public ::testing::Test int numTw = 0; // number of wins int numGeomTw = 0; // number of wins using usr_geom - efl_util_screenshot_h screenshot; etWin *createWindow(Elm_Win_Type type, const char *name, Eina_Bool usr_geom, int x, int y, int w, int h); }; diff --git a/src/e_test_event.cpp b/src/e_test_event.cpp index 0a17cf8..4966a90 100644 --- a/src/e_test_event.cpp +++ b/src/e_test_event.cpp @@ -1,10 +1,41 @@ #include +#include +#include +#include #include "e_test_event.h" #define E_TEST_WORK_TIME 3.0 #define E_TC_SIGN_WIN_INFO "usiiiiibbbiibbbbbi" +#define UT_WAIT(fmt, ...) \ + do \ + { \ + char ch; \ + do \ + { \ + printf(fmt" [n]):next ", ##__VA_ARGS__); \ + ch = tc_getchar(); \ + } while (ch != 'n'); \ + } while (0) + +char +tc_getchar(void) +{ + int c = getchar(); + int ch = c; + + if (ch == '\n' || ch == '\r') + ch = 'y'; + else if (ch < 'a') + ch += ('a' - 'A'); + + while (c != '\n' && c != EOF) + c = getchar(); + + return ch; +} + static const char effect_started[] = "effect,started"; static const char effect_done[] = "effect,done"; static const char launch_done[] = "launch,done"; @@ -184,6 +215,10 @@ etRunner::init() res = addSignalHandlers(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EINA_FALSE); + screenshot = efl_util_screenshot_initialize(CAPTURE_WIDTH, CAPTURE_HEIGHT); + if (screenshot == NULL) + ERR("efl_util_screenshot_initialize fail\n"); + return EINA_TRUE; } @@ -193,6 +228,13 @@ etRunner::shutdown() eina_log_domain_unregister(logDomain); freeLastWinInfoList(); + + if (screenshot) + { + efl_util_screenshot_deinitialize(screenshot); + screenshot = NULL; + } + delSignalHandlers(); // deinit tizen_extension protocol @@ -2652,3 +2694,377 @@ etRunner::generateEdgeDragGesture() return EINA_TRUE; } + +void +_verifyTCGetBufferSize(tbm_surface_h buffer, int *buffer_w, int *buffer_h, int *stride) +{ + tbm_surface_info_s info; + int ret; + + EINA_SAFETY_ON_NULL_RETURN(buffer); + + ret = tbm_surface_get_info(buffer, &info); + if (ret != TBM_SURFACE_ERROR_NONE) + return; + + if (buffer_w) + *buffer_w = info.planes[0].stride >> 2; + + if (buffer_h) + *buffer_h = info.planes[0].size / info.planes[0].stride; + + if (stride) + *stride = info.planes[0].stride; +} + +static void +_verifyTCdumpPng(const char *file, const void *data, int width, int height, int stride) +{ + pixman_image_t *image; + cairo_surface_t *cairo_surface; + cairo_status_t status; + + image = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, width, height, (uint32_t *)data, stride); + if (image == (pixman_image_t *)NULL) + { + ERR("pixman_image_create_bits_no_clear failed"); + return; + } + + cairo_surface = cairo_image_surface_create_for_data((unsigned char *)pixman_image_get_data(image), + CAIRO_FORMAT_RGB24, pixman_image_get_width(image), pixman_image_get_height(image), + pixman_image_get_stride(image)); + if (cairo_surface_status(cairo_surface) != CAIRO_STATUS_SUCCESS) + { + ERR("cairo_image_surface_create_for_data failed"); + pixman_image_unref(image); + return; + } + + status = cairo_surface_write_to_png(cairo_surface, file); + if (status != CAIRO_STATUS_SUCCESS) + { + ERR("Failed to save image '%s': %s\n", file, cairo_status_to_string(status)); + pixman_image_unref(image); + return; + } + + cairo_surface_destroy(cairo_surface); + pixman_image_unref(image); +} + +std::string +_verifyTCMakeDumpPath(std::string basetype, std::string tcname) +{ + std::string path = "/tmp/etTestErr/"; + std::string format = ".png"; + int ret; + + ret = mkdir(path.c_str(), 0755); + if (ret < 0 && errno != EEXIST) + { + ERR("mkdir failed. (%s)\n", path.c_str()); + return "\0"; + } + + path = path + basetype + '/'; + ret = mkdir(path.c_str(), 0755); + if (ret < 0 && errno != EEXIST) + { + ERR("mkdir failed. (%s)\n", path.c_str()); + return "\0"; + } + + path = path + tcname + format; + ERR("path : %s", path.c_str()); + + return path; +} + +void +_verifyTCDumpBuffer(tbm_surface_h buffer, std::string basetype, std::string tcname) +{ + std::string dumppath; + tbm_surface_info_s info; + int ret; + int bo_cnt; + int bw, bh, stride; + + EINA_SAFETY_ON_NULL_RETURN(buffer); + + dumppath = _verifyTCMakeDumpPath(basetype, tcname); + if (dumppath.length() == 0) + { + ERR("getting dumppath failed"); + return; + } + + ret = tbm_surface_map(buffer, TBM_OPTION_READ, &info); + if (ret != TBM_SURFACE_ERROR_NONE) + { + ERR("tbm_surface_map failed"); + return; + } + + _verifyTCGetBufferSize(buffer, &bw, &bh, &stride); + + bo_cnt = tbm_surface_internal_get_num_bos(buffer); + DBG("buffer: bo_cnt(%d) %dx%d(%dx%d) %c%c%c%c, plane: (%p+%d, %d,%d) (%p+%d, %d,%d) (%p+%d, %d,%d)", + bo_cnt, bw, bh, info.width, info.height, FOURCC_STR(info.format), + info.planes[0].ptr, info.planes[0].offset, info.planes[0].stride, info.planes[0].size, + info.planes[1].ptr, info.planes[1].offset, info.planes[1].stride, info.planes[1].size, + info.planes[2].ptr, info.planes[2].offset, info.planes[2].stride, info.planes[2].size); + + if (info.format == TBM_FORMAT_ARGB8888 || info.format == TBM_FORMAT_XRGB8888) + _verifyTCdumpPng(dumppath.c_str(), info.planes[0].ptr, bw, bh, stride); + else + DBG("not supported dump format"); + + tbm_surface_unmap(buffer); +} + +std::string +_verifyTCMakeRefPath(std::string basetype, std::string tcname) +{ + std::string path = "/usr/share/e_tizen_unittests/data/"; + std::string format = ".png"; + + path = path + basetype + '/' + tcname + format; + + return path; +} + +pixman_format_code_t +_verifyTCCairo2Pixman(cairo_format_t fmt) +{ + if (fmt == CAIRO_FORMAT_ARGB32) + return PIXMAN_a8r8g8b8; + else if (fmt == CAIRO_FORMAT_RGB24) + return PIXMAN_x8r8g8b8; + else + return (pixman_format_code_t)0; +} + +static void +destroy_cairo_surface(pixman_image_t *image, void *data) +{ + cairo_surface_t *surface = (cairo_surface_t *)data; + + cairo_surface_destroy(surface); +} + +pixman_image_t * +_verifyTCConvertx8r8g8b8(pixman_image_t *image) +{ + pixman_image_t *ret; + int width; + int height; + + if (pixman_image_get_format(image) == PIXMAN_x8r8g8b8) + return pixman_image_ref(image); + + width = pixman_image_get_width(image); + height = pixman_image_get_height(image); + + ret = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, width, height, NULL, 0); + if (ret == NULL) + { + ERR("pixman_image_create_bits_no_clear failed"); + return NULL; + } + + pixman_image_composite32(PIXMAN_OP_SRC, image, NULL, ret, 0, 0, 0, 0, 0, 0, width, height); + + return ret; +} + +pixman_image_t * +_verifyTCLoadImage(const char *fname) +{ + pixman_image_t *image; + pixman_image_t *converted; + cairo_format_t cairo_fmt; + pixman_format_code_t pixman_fmt; + cairo_surface_t *reference_cairo_surface; + cairo_status_t status; + int width; + int height; + int stride; + void *data; + + reference_cairo_surface = cairo_image_surface_create_from_png(fname); + cairo_surface_flush(reference_cairo_surface); + status = cairo_surface_status(reference_cairo_surface); + if (status != CAIRO_STATUS_SUCCESS) + { + ERR("Could not open %s: %s\n", fname, cairo_status_to_string(status)); + cairo_surface_destroy(reference_cairo_surface); + return NULL; + } + + cairo_fmt = cairo_image_surface_get_format(reference_cairo_surface); + pixman_fmt = _verifyTCCairo2Pixman(cairo_fmt); + if (pixman_fmt == (pixman_format_code_t)0) + { + ERR("unknown format"); + cairo_surface_destroy(reference_cairo_surface); + return NULL; + } + + width = cairo_image_surface_get_width(reference_cairo_surface); + height = cairo_image_surface_get_height(reference_cairo_surface); + stride = cairo_image_surface_get_stride(reference_cairo_surface); + data = cairo_image_surface_get_data(reference_cairo_surface); + + image = pixman_image_create_bits_no_clear(pixman_fmt, width, height, (uint32_t *)data, stride); + if (image == (pixman_image_t *)NULL) + { + ERR("pixman_image_create_bits_no_clear failed"); + cairo_surface_destroy(reference_cairo_surface); + return NULL; + } + + pixman_image_set_destroy_function(image, destroy_cairo_surface, reference_cairo_surface); + + converted = _verifyTCConvertx8r8g8b8(image); + pixman_image_unref(image); + + return converted; +} + +Eina_Bool +_verifyTCCheckPixel(uint32_t pix_a, uint32_t pix_b, int w, int h) +{ + int i, shift; + int diffmin = -3; + int diffmax = 4; + int val_a, val_b, diff; + + for (shift = 8, i = 1; i < 4; shift += 8, i++) + { + val_a = (pix_a >> shift) & 0xFF; + val_b = (pix_b >> shift) & 0xFF; + diff = val_b - val_a; + + if (diff < diffmin || diff > diffmax) + return EINA_FALSE; + } + + return EINA_TRUE; +} + +Eina_Bool +_verifyTCCheckImage(pixman_image_t *surface, pixman_image_t *ref) +{ + Eina_Bool ret = EINA_TRUE; + int surface_width, surface_height, surface_stride; + uint32_t *surface_data; + int pixman_width; + uint32_t *pixman_data; + int w, h; + uint32_t *current_surface_data; + uint32_t *current_pixman_data; + + surface_width = pixman_image_get_width(surface); + surface_height = pixman_image_get_height(surface); + surface_stride = pixman_image_get_stride(surface); + surface_data = pixman_image_get_data(surface); + + pixman_width = pixman_image_get_width(ref); + pixman_data = pixman_image_get_data(ref); + + for (h = 0; h < surface_height; h++ ) + { + current_surface_data = surface_data + h * surface_stride; + current_pixman_data = pixman_data + h * pixman_width; + + for (w = 0; w < surface_width; w++) + { + ret = _verifyTCCheckPixel(*current_surface_data, *current_pixman_data, w, h); + if (ret == EINA_FALSE) + return ret; + + current_surface_data++; + current_pixman_data++; + } + } + + return ret; +} + +Eina_Bool +_verifyTC(tbm_surface_h surface, std::string basetype, std::string tcname) +{ + std::string refpath; + pixman_image_t *shot; + pixman_image_t *ref; + Eina_Bool ret = EINA_FALSE; + tbm_surface_info_s info; + int error; + + refpath = _verifyTCMakeRefPath(basetype, tcname); + if (refpath.length() == 0) + { + ERR("getting dumppath failed"); + return EINA_FALSE; + } + + ref = _verifyTCLoadImage(refpath.c_str()); + if (ref == (pixman_image_t *)NULL) + { + ERR("LoadImage failed"); + return EINA_FALSE; + } + + error = tbm_surface_map(surface, TBM_OPTION_READ, &info); + if (error != TBM_SURFACE_ERROR_NONE) + { + ERR("tbm_surface_map failed"); + pixman_image_unref(ref); + return EINA_FALSE; + } + + shot = pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8, info.width, info.height, (uint32_t *)info.planes[0].ptr, info.planes[0].stride >> 2); + if (shot == (pixman_image_t *)NULL) + { + ERR("pixman_image_create_bits_no_clear failed"); + tbm_surface_unmap(surface); + pixman_image_unref(ref); + return EINA_FALSE; + } + + ret = _verifyTCCheckImage(shot, ref); + + pixman_image_unref(shot); + pixman_image_unref(ref); + + return ret; +} + +Eina_Bool +etRunner::verifyTC(std::string basetype, std::string tcname) +{ + tbm_surface_h surface = NULL; + Eina_Bool ret = EINA_FALSE; + + EINA_SAFETY_ON_NULL_RETURN_VAL(screenshot, EINA_FALSE); + + surface = efl_util_screenshot_take_tbm_surface(screenshot); + if (surface == NULL) + { + ERR("screenshot failed"); + return EINA_FALSE; + } + + ret = _verifyTC(surface, basetype, tcname); + if (ret == EINA_FALSE) + { + ERR("verify failed"); + _verifyTCDumpBuffer(surface, basetype, tcname); + } + + tbm_surface_destroy(surface); +// UT_WAIT("test"); + + return ret; +} \ No newline at end of file diff --git a/src/e_test_event.h b/src/e_test_event.h index 9464de6..0f611c3 100644 --- a/src/e_test_event.h +++ b/src/e_test_event.h @@ -3,6 +3,9 @@ #include #include +#include +#include +#include #include "e_test_util.h" #include "e_test_win.h" @@ -307,10 +310,13 @@ public: int getLogDomain() { return logDomain; } efl_util_gesture_h getGestureHandler() { return gestureHandler; } + Eina_Bool verifyTC(std::string basetype, std::string tcname); + protected: Eina_Bool initProtocols(); efl_util_inputgen_h inputGenerator = NULL; efl_util_gesture_h gestureHandler = NULL; + efl_util_screenshot_h screenshot = NULL; }; #endif // end of __ET_EVENT_LOOP_H__ diff --git a/src/testcase/0002_base_operation.cpp b/src/testcase/0002_base_operation.cpp index 4ba5f64..43e6cd4 100644 --- a/src/testcase/0002_base_operation.cpp +++ b/src/testcase/0002_base_operation.cpp @@ -30,7 +30,7 @@ TEST_F(etTestBaseOperation, win_show) ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseOperation", "win_show"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "win_show"), EINA_TRUE); } TEST_F(etTestBaseOperation, win_stack) @@ -61,7 +61,7 @@ TEST_F(etTestBaseOperation, win_stack) ASSERT_TRUE(res); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseOperation", "win_stack"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "win_stack"), EINA_TRUE); } TEST_F(etTestBaseOperation, alpha_win_show) @@ -71,7 +71,7 @@ TEST_F(etTestBaseOperation, alpha_win_show) ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseOperation", "alpha_win_show"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "alpha_win_show"), EINA_TRUE); } TEST_F(etTestBaseOperation, alpha_win_stack) @@ -102,5 +102,5 @@ TEST_F(etTestBaseOperation, alpha_win_stack) ASSERT_TRUE(res); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseOperation", "alpha_win_stack"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "alpha_win_stack"), EINA_TRUE); } diff --git a/src/testcase/0003_base_operation_multi_wins.cpp b/src/testcase/0003_base_operation_multi_wins.cpp index 7dad6fd..e02cd0d 100644 --- a/src/testcase/0003_base_operation_multi_wins.cpp +++ b/src/testcase/0003_base_operation_multi_wins.cpp @@ -86,7 +86,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_basic) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_basic"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_basic"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_show1) @@ -148,7 +148,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_show1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_show2) @@ -210,7 +210,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_show2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_show3) @@ -272,7 +272,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show3) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_show3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show3"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_raise1) @@ -322,7 +322,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_raise1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_raise1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_raise2) @@ -372,7 +372,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_raise2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_raise2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_stack_above1) @@ -422,7 +422,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_stack_above1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_stack_above2) @@ -472,7 +472,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_stack_above2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_stack_above3) @@ -522,7 +522,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above3) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_stack_above3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above3"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_lower1) @@ -588,7 +588,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_lower1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_lower1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_wins_lower2) @@ -654,7 +654,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_wins_lower2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_lower2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_basic) @@ -700,7 +700,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_basic) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_basic"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_basic"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_show1) @@ -762,7 +762,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_show1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_show2) @@ -824,7 +824,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_show2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_show3) @@ -886,7 +886,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show3) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_show3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show3"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_raise1) @@ -936,7 +936,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_raise1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_raise1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_raise2) @@ -986,7 +986,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_raise2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_raise2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1) @@ -1036,7 +1036,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2) @@ -1086,7 +1086,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3) @@ -1136,7 +1136,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above3"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_lower1) @@ -1202,7 +1202,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower1) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_lower1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_lower2) @@ -1268,7 +1268,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_lower2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate) @@ -1320,7 +1320,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_all_full_wins_lower_activate"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower_activate"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_2wins_show1) @@ -1371,7 +1371,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show1) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_2wins_show1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_2wins_show2) @@ -1422,7 +1422,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show2) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_2wins_show2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_2wins_show3) @@ -1473,7 +1473,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show3) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_2wins_show3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show3"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_full_2wins_show1) @@ -1524,7 +1524,7 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show1) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_full_2wins_show1"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show1"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_full_2wins_show2) @@ -1575,7 +1575,7 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show2) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_full_2wins_show2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show2"), EINA_TRUE); } TEST_F(etTestBaseMulti, multi_full_2wins_show3) @@ -1626,5 +1626,5 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show3) ASSERT_EQ(2, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestBaseMulti", "multi_full_2wins_show3"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show3"), EINA_TRUE); } diff --git a/src/testcase/0004_transient_for.cpp b/src/testcase/0004_transient_for.cpp index e74edaa..164d044 100644 --- a/src/testcase/0004_transient_for.cpp +++ b/src/testcase/0004_transient_for.cpp @@ -91,7 +91,7 @@ TEST_F(etTestTransientFor, transient_for_basic) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestTransientFor", "transient_for_basic"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_basic"), EINA_TRUE); } TEST_F(etTestTransientFor, transient_for_basic2) @@ -146,7 +146,7 @@ TEST_F(etTestTransientFor, transient_for_basic2) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestTransientFor", "transient_for_basic2"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_basic2"), EINA_TRUE); } TEST_F(etTestTransientFor, transient_for_raise) @@ -203,7 +203,7 @@ TEST_F(etTestTransientFor, transient_for_raise) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestTransientFor", "transient_for_raise"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_raise"), EINA_TRUE); } TEST_F(etTestTransientFor, transient_for_lower) @@ -276,7 +276,7 @@ TEST_F(etTestTransientFor, transient_for_lower) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestTransientFor", "transient_for_lower"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_lower"), EINA_TRUE); } TEST_F(etTestTransientFor, transient_for_above) @@ -332,5 +332,5 @@ TEST_F(etTestTransientFor, transient_for_above) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestTransientFor", "transient_for_above"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_above"), EINA_TRUE); } diff --git a/src/testcase/0005_notification.cpp b/src/testcase/0005_notification.cpp index d06ef7a..bb01730 100644 --- a/src/testcase/0005_notification.cpp +++ b/src/testcase/0005_notification.cpp @@ -97,7 +97,7 @@ TEST_F(etTestNotification, notification_level_default) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_default"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_default"), EINA_TRUE); } TEST_F(etTestNotification, notification_level_medium) @@ -162,7 +162,7 @@ TEST_F(etTestNotification, notification_level_medium) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_medium"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_medium"), EINA_TRUE); } TEST_F(etTestNotification, notification_level_high) @@ -227,7 +227,7 @@ TEST_F(etTestNotification, notification_level_high) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_high"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_high"), EINA_TRUE); } TEST_F(etTestNotification, notification_level_top) @@ -292,7 +292,7 @@ TEST_F(etTestNotification, notification_level_top) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_top"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_top"), EINA_TRUE); } TEST_F(etTestNotification, notification_level_none) @@ -414,7 +414,7 @@ TEST_F(etTestNotification, notification_level_none) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_none"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_none"), EINA_TRUE); } TEST_F(etTestNotification, notification_level_change) @@ -586,7 +586,7 @@ TEST_F(etTestNotification, notification_level_change) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_level_change"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_change"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_default) @@ -651,7 +651,7 @@ TEST_F(etTestNotification, notification_fullsize_level_default) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_default"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_default"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_medium) @@ -716,7 +716,7 @@ TEST_F(etTestNotification, notification_fullsize_level_medium) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_medium"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_medium"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_high) @@ -781,7 +781,7 @@ TEST_F(etTestNotification, notification_fullsize_level_high) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_high"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_high"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_top) @@ -846,7 +846,7 @@ TEST_F(etTestNotification, notification_fullsize_level_top) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_top"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_top"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_none) @@ -968,7 +968,7 @@ TEST_F(etTestNotification, notification_fullsize_level_none) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_none"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_none"), EINA_TRUE); } TEST_F(etTestNotification, notification_fullsize_level_change) @@ -1140,5 +1140,5 @@ TEST_F(etTestNotification, notification_fullsize_level_change) ASSERT_EQ(3, pass_count); - ASSERT_EQ(etTCBase::verifyTC("etTestNotification", "notification_fullsize_level_change"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_change"), EINA_TRUE); } diff --git a/src/testcase/0006_tzsh.cpp b/src/testcase/0006_tzsh.cpp index 0ca4d61..861da07 100644 --- a/src/testcase/0006_tzsh.cpp +++ b/src/testcase/0006_tzsh.cpp @@ -150,7 +150,7 @@ TEST_F(etTestTzsh, scrsaver_basic) etRunner::get().freeWinInfoList(list); - ASSERT_EQ(etTCBase::verifyTC("etTestTzsh", "scrsaver_basic"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTzsh", "scrsaver_basic"), EINA_TRUE); } /* Name: @@ -204,5 +204,5 @@ TEST_F(etTestTzsh, scrsaver_mng_basic) ASSERT_TRUE(chk_timeout_val_); ASSERT_EQ(2, chk_cb_called_); - ASSERT_EQ(etTCBase::verifyTC("etTestTzsh", "scrsaver_mng_basic"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestTzsh", "scrsaver_mng_basic"), EINA_TRUE); } diff --git a/src/testcase/0007_rotation.cpp b/src/testcase/0007_rotation.cpp index 9e5538a..097990e 100644 --- a/src/testcase/0007_rotation.cpp +++ b/src/testcase/0007_rotation.cpp @@ -65,5 +65,5 @@ TEST_F(etTestRotation, available_rotations) testWinRotation(tw_base, rot); } - ASSERT_EQ(etTCBase::verifyTC("etTestRotation", "available_rotations"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestRotation", "available_rotations"), EINA_TRUE); } diff --git a/src/testcase/0010_splash.cpp b/src/testcase/0010_splash.cpp index 93368e9..21b3c3c 100644 --- a/src/testcase/0010_splash.cpp +++ b/src/testcase/0010_splash.cpp @@ -55,7 +55,7 @@ TEST_F(etTestSplash, splash_edc) ASSERT_TRUE(res); - ASSERT_EQ(etTCBase::verifyTC("etTestSplash", "splash_edc"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_edc"), EINA_TRUE); } TEST_F(etTestSplash, splash_img) @@ -81,7 +81,7 @@ TEST_F(etTestSplash, splash_img) ASSERT_TRUE(res); - ASSERT_EQ(etTCBase::verifyTC("etTestSplash", "splash_img"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_img"), EINA_TRUE); } TEST_F(etTestSplash, splash_disappear_after_real) @@ -112,7 +112,7 @@ TEST_F(etTestSplash, splash_disappear_after_real) } etRunner::get().freeWinInfoList(list); - ASSERT_EQ(etTCBase::verifyTC("etTestSplash", "splash_disappear_after_real"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_disappear_after_real"), EINA_TRUE); } TEST_F(etTestSplash, splash_evas_callback_after_real) @@ -144,6 +144,6 @@ TEST_F(etTestSplash, splash_evas_callback_after_real) } etRunner::get().freeWinInfoList(list); - ASSERT_EQ(etTCBase::verifyTC("etTestSplash", "splash_evas_callback_after_real"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_evas_callback_after_real"), EINA_TRUE); } diff --git a/src/testcase/0011_effect.cpp b/src/testcase/0011_effect.cpp index fae63f1..95377a9 100644 --- a/src/testcase/0011_effect.cpp +++ b/src/testcase/0011_effect.cpp @@ -36,7 +36,7 @@ TEST_F(etTestEffect, effect_show) showTCWin(tw); ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_EQ(etTCBase::verifyTC("etTestEffect", "effect_show"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_show"), EINA_TRUE); return; } @@ -53,7 +53,7 @@ TEST_F(etTestEffect, effect_show_evas_callback) showTCWin(tw); ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB); - ASSERT_EQ(etTCBase::verifyTC("etTestEffect", "effect_show_evas_callback"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_show_evas_callback"), EINA_TRUE); return; } @@ -73,7 +73,7 @@ TEST_F(etTestEffect, effect_hide_bylower) elm_win_lower(tw->elm_win); ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_EQ(etTCBase::verifyTC("etTestEffect", "effect_hide_bylower"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_hide_bylower"), EINA_TRUE); return; } @@ -93,7 +93,7 @@ TEST_F(etTestEffect, effect_hide_byunmap) tw->hide(); ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_EQ(etTCBase::verifyTC("etTestEffect", "effect_hide_byunmap"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_hide_byunmap"), EINA_TRUE); return; } @@ -114,7 +114,7 @@ TEST_F(etTestEffect, effect_bg) showTCWin(tw_green); ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_EQ(etTCBase::verifyTC("etTestEffect", "effect_bg"), EINA_TRUE); + ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_bg"), EINA_TRUE); return; } -- 2.7.4