diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | meson.build | 36 | ||||
| -rw-r--r-- | src/wcmCommon.c | 317 | ||||
| -rw-r--r-- | src/wcmConfig.c | 166 | ||||
| -rw-r--r-- | src/wcmFilter.c | 116 | ||||
| -rw-r--r-- | src/wcmUSB.c | 26 | ||||
| -rw-r--r-- | src/xf86Wacom.h | 28 | ||||
| -rw-r--r-- | test/Makefile.am | 23 | ||||
| -rw-r--r-- | test/fake-symbols.c | 512 | ||||
| -rw-r--r-- | test/fake-symbols.h | 8 | ||||
| -rw-r--r-- | test/tester.c | 48 | ||||
| -rw-r--r-- | test/wacom-test-suite.c | 49 | ||||
| -rw-r--r-- | test/wacom-test-suite.h | 58 | ||||
| -rw-r--r-- | test/wacom-tests.c | 624 |
14 files changed, 833 insertions, 1187 deletions
diff --git a/configure.ac b/configure.ac index 7bdf7da..aae6aa5 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,12 @@ if test "x$UNITTESTS" != xno ; then [linker_can_wrap="no"]) AC_MSG_RESULT([$linker_can_wrap]) LDFLAGS="$save_LDFLAGS" + + # Check for the availability of dlsym and friends + AC_CHECK_LIB([dl], [dlsym], + [libdl_available="yes"], + [libdl_available="no"] + ) fi if test "x$UNITTESTS" = xauto; then @@ -164,6 +170,9 @@ if test "x$UNITTESTS" = xyes; then if test "x$linker_can_wrap" = xno; then AC_MSG_ERROR([ld -wrap support required to build unit tests]) fi + if test "x$libdl_available" = xno; then + AC_MSG_ERROR([dlsym required to build unit tests]) + fi AC_DEFINE(UNITTESTS, 1, [Enable unit tests]) fi AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes]) diff --git a/meson.build b/meson.build index d2e616b..a450650 100644 --- a/meson.build +++ b/meson.build @@ -331,19 +331,31 @@ if build_unittests ) test('xsetwacom-tests', xsetwacom_test) - src_wacom_tests = src_wacom + [ - 'test/fake-symbols.c', - 'test/fake-symbols.h', - 'test/wacom-tests.c', - ] - wacom_tests = executable( - 'wacom-tests', - src_wacom_tests, - c_args: ['-DUNIT_TESTS'], - dependencies: [dep_xserver, dep_m], - include_directories: [dir_include, dir_src], + # Rebuild the driver with -DENABLE_TESTS to enable all the various + # local tests in the files. This is built as a module (like the + # driver) so we don't need to resolve any symbols until runtime. + # Look at wacom-test-suite.(c|h) for the magic sauce. + wacom_drv_test = shared_module( + 'wacom_drv_test', + src_wacom + ['test/wacom-test-suite.c', 'test/wacom-test-suite.h'], + include_directories: [dir_src, dir_include, dir_src_test], + dependencies: [dep_xserver, dep_m], + name_prefix: '', # we want wacom_drv_test.so, not libwacom_drv_test.so + install: false, + c_args: ['-DENABLE_TESTS', '-fvisibility=default'], ) - test('wacom-tests', wacom_tests) + dep_wacom_drv_test = declare_dependency(link_with: wacom_drv_test) + dep_dl = cc.find_library('dl') + # wacom-tests.c is just a stub to load the above driver and run the + # entry point. + test('wacom-tests', + executable( + 'wacom-tests', + 'test/wacom-tests.c', + dependencies: [dep_wacom_drv_test, dep_dl], + install: false) + ) + endif diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 093ae58..2ad2156 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -27,6 +27,9 @@ #include <xkbsrv.h> #include <xf86_OSproc.h> +#ifdef ENABLE_TESTS +#include "wacom-test-suite.h" +#endif static struct _WacomDriverRec { @@ -468,7 +471,7 @@ static void sendAButton(WacomDevicePtr priv, const WacomDeviceState* ds, int but * @param flags Flags defining axis attributes: AXIS_INVERT and AXIS_BITWISE * @return Relative change in axis value */ -TEST_NON_STATIC int getScrollDelta(int current, int old, int wrap, int flags) +static int getScrollDelta(int current, int old, int wrap, int flags) { int delta; @@ -513,7 +516,7 @@ TEST_NON_STATIC int getScrollDelta(int current, int old, int wrap, int flags) * @param action_dn Array index of action to send on scroll down * @return Array index of action that should be performed, or -1 if none. */ -TEST_NON_STATIC int getWheelButton(int delta, int action_up, int action_dn) +static int getWheelButton(int delta, int action_up, int action_dn) { if (delta > 0) return action_up; @@ -977,7 +980,7 @@ void wcmSendEvents(WacomDevicePtr priv, const WacomDeviceState* ds) * @retval SUPPRESS_NONE Process event normally. * @retval SUPPRESS_NON_MOTION Suppress all data but motion data. */ -TEST_NON_STATIC enum WacomSuppressMode +static enum WacomSuppressMode wcmCheckSuppress(WacomCommonPtr common, const WacomDeviceState* dsOrig, WacomDeviceState* dsNew) @@ -1252,7 +1255,7 @@ void wcmEvent(WacomCommonPtr common, unsigned int channel, * * @see normalizePressure */ -TEST_NON_STATIC int +static int rebasePressure(const WacomDevicePtr priv, const WacomDeviceState *ds) { int min_pressure; @@ -1281,7 +1284,7 @@ rebasePressure(const WacomDevicePtr priv, const WacomDeviceState *ds) * @return normalized pressure * @see rebasePressure */ -TEST_NON_STATIC int +static int normalizePressure(const WacomDevicePtr priv, const int raw_pressure) { WacomCommonPtr common = priv->common; @@ -1746,4 +1749,308 @@ WacomCommonPtr wcmRefCommon(WacomCommonPtr common) return common; } +#ifdef ENABLE_TESTS + +TEST_CASE(test_get_scroll_delta) +{ + int test_table[][5] = { + { 100, 25, 0, 0, 75}, { 25, 100, 0, 0, -75}, + {-100, -25, 0, 0, -75}, {-25, -100, 0, 0, 75}, + { 100, -25, 0, 0, 125}, {-25, 100, 0, 0,-125}, + { 100, 100, 0, 0, 0}, {-25, -25, 0, 0, 0}, + + {23, 0, 50, 0, 23}, {0, 23, 50, 0, -23}, + {24, 0, 50, 0, 24}, {0, 24, 50, 0, -24}, + {25, 0, 50, 0, 25}, {0, 25, 50, 0, -25}, + {26, 0, 50, 0, -25}, {0, 26, 50, 0, 25}, + {27, 0, 50, 0, -24}, {0, 27, 50, 0, 24}, + {28, 0, 50, 0, -23}, {0, 28, 50, 0, 23}, + + {1024, 0, 0, AXIS_BITWISE, 11}, {0, 1024, 0, AXIS_BITWISE, -11}, + + { 0, 4, 256, AXIS_BITWISE, -3}, {4, 0, 256, AXIS_BITWISE, 3}, + { 1, 4, 256, AXIS_BITWISE, -2}, {4, 1, 256, AXIS_BITWISE, 2}, + { 2, 4, 256, AXIS_BITWISE, -1}, {4, 2, 256, AXIS_BITWISE, 1}, + { 4, 4, 256, AXIS_BITWISE, 0}, {4, 4, 256, AXIS_BITWISE, 0}, + { 8, 4, 256, AXIS_BITWISE, 1}, {4, 8, 256, AXIS_BITWISE, -1}, + { 16, 4, 256, AXIS_BITWISE, 2}, {4, 16, 256, AXIS_BITWISE, -2}, + { 32, 4, 256, AXIS_BITWISE, 3}, {4, 32, 256, AXIS_BITWISE, -3}, + { 64, 4, 256, AXIS_BITWISE, 4}, {4, 64, 256, AXIS_BITWISE, -4}, + {128, 4, 256, AXIS_BITWISE, 5}, {4, 128, 256, AXIS_BITWISE, -5}, + {256, 4, 256, AXIS_BITWISE, -4}, {4, 256, 256, AXIS_BITWISE, 4} + }; + int i; + + for (i = 0; i < ARRAY_SIZE(test_table); i++) + { + int delta; + int current, old, wrap, flags; + current = test_table[i][0]; + old = test_table[i][1]; + wrap = test_table[i][2]; + flags = test_table[i][3]; + + delta = getScrollDelta(current, old, wrap, flags); + assert(delta == test_table[i][4]); + + flags |= AXIS_INVERT; + delta = getScrollDelta(current, old, wrap, flags); + assert(delta == -1 * test_table[i][4]); + } +} + +TEST_CASE(test_get_wheel_button) +{ + int delta; + int action_up, action_dn; + + action_up = 300; + action_dn = 400; + + for (delta = -32; delta <= 32; delta++) + { + int action; + action = getWheelButton(delta, action_up, action_dn); + if (delta < 0) + { + assert(action == action_dn); + } + else if (delta == 0) + { + assert(action == -1); + } + else + { + assert(action == action_up); + } + } +} + + +TEST_CASE(test_common_ref) +{ + WacomCommonPtr common; + WacomCommonPtr second; + + common = wcmNewCommon(); + assert(common); + assert(common->refcnt == 1); + + second = wcmRefCommon(common); + + assert(second == common); + assert(second->refcnt == 2); + + wcmFreeCommon(&second); + assert(common); + assert(!second); + assert(common->refcnt == 1); + + second = wcmRefCommon(NULL); + assert(common != second); + assert(second->refcnt == 1); + assert(common->refcnt == 1); + + wcmFreeCommon(&second); + wcmFreeCommon(&common); + assert(!second && !common); +} + +TEST_CASE(test_rebase_pressure) +{ + WacomDeviceRec priv = {0}; + WacomDeviceRec base = {0}; + WacomDeviceState ds = {0}; + int pressure; + + priv.minPressure = 4; + ds.pressure = 10; + + /* Pressure in out-of-proximity means get new preloaded pressure */ + priv.oldState.proximity = 0; + + /* make sure we don't touch priv, not really needed, the compiler should + * honor the consts but... */ + base = priv; + + pressure = rebasePressure(&priv, &ds); + assert(pressure == ds.pressure); + + assert(memcmp(&priv, &base, sizeof(priv)) == 0); + + /* Pressure in-proximity means rebase to new minimum */ + priv.oldState.proximity = 1; + + base = priv; + + pressure = rebasePressure(&priv, &ds); + assert(pressure == priv.minPressure); + assert(memcmp(&priv, &base, sizeof(priv)) == 0); +} + +TEST_CASE(test_normalize_pressure) +{ + InputInfoRec pInfo = {0}; + WacomDeviceRec priv = {0}; + WacomCommonRec common = {0}; + int normalized_max = 65536; + int pressure, prev_pressure = -1; + int i, j, k; + + priv.common = &common; + priv.frontend = &pInfo; + pInfo.name = strdupa("Wacom test device"); + common.wcmPressureRecalibration = 1; + + priv.minPressure = 0; + + /* Check various maxCurve values */ + for (k = 512; k <= normalized_max; k += 239) { + priv.maxCurve = k; + + /* Some random loop to check various maxZ pressure values. Starting at + * 1, because if wcmMaxZ is 0 we have other problems. */ + for (j = 1; j <= 256; j += 17) + { + common.wcmMaxZ = j; + prev_pressure = -1; + + for (i = 0; i <= common.wcmMaxZ; i++) + { + pressure = i; + + pressure = normalizePressure(&priv, pressure); + assert(pressure >= 0); + assert(pressure <= k); + + /* we count up, so assume normalised pressure goes up too */ + assert(prev_pressure < pressure); + prev_pressure = pressure; + } + + assert(pressure == k); + } + } + + /* If minPressure is higher than ds->pressure, normalizePressure takes + * minPressure and ignores actual pressure. This would be a bug in the + * driver code, but we might as well test for it. */ + priv.minPressure = 10; + priv.maxCurve = normalized_max; + + prev_pressure = normalizePressure(&priv, 0); + for (i = 0; i < priv.minPressure; i++) + { + + pressure = normalizePressure(&priv, i); + + assert(pressure >= 0); + assert(pressure < normalized_max); + + /* we count up, so assume normalised pressure goes up too */ + assert(prev_pressure == pressure); + } +} + +TEST_CASE(test_suppress) +{ + enum WacomSuppressMode rc; + WacomCommonRec common = {0}; + WacomDeviceState old = {0}, + new = {0}; + + common.wcmSuppress = 2; + + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_ALL); + + /* proximity, buttons and strip send for any change */ + +#define test_any_suppress(field) \ + old.field = 1; \ + rc = wcmCheckSuppress(&common, &old, &new); \ + assert(rc == SUPPRESS_NONE); \ + new.field = old.field; + + test_any_suppress(proximity); + test_any_suppress(buttons); + test_any_suppress(stripx); + test_any_suppress(stripy); + +#undef test_any_suppress + + /* pressure, capacity, throttle, rotation, abswheel only when + * difference is above suppress */ + + /* test negative and positive transition */ +#define test_above_suppress(field) \ + old.field = common.wcmSuppress; \ + rc = wcmCheckSuppress(&common, &old, &new); \ + assert(rc == SUPPRESS_ALL); \ + old.field = common.wcmSuppress + 1; \ + rc = wcmCheckSuppress(&common, &old, &new); \ + assert(rc == SUPPRESS_NONE); \ + old.field = -common.wcmSuppress; \ + rc = wcmCheckSuppress(&common, &old, &new); \ + assert(rc == SUPPRESS_ALL); \ + old.field = -common.wcmSuppress - 1; \ + rc = wcmCheckSuppress(&common, &old, &new); \ + assert(rc == SUPPRESS_NONE); \ + new.field = old.field; + + test_above_suppress(pressure); + test_above_suppress(throttle); + test_above_suppress(rotation); + test_above_suppress(abswheel); + +#undef test_above_suppress + + /* any movement on relwheel counts */ + new.relwheel = 1; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_NONE); + new.relwheel = 0; + + /* x axis movement */ + + /* not enough movement */ + new.x = common.wcmSuppress; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_ALL); + assert(old.x == new.x); + assert(old.y == new.y); + + /* only x axis above thresh */ + new.x = common.wcmSuppress + 1; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_NON_MOTION); + + /* x and other field above thres */ + new.pressure = ~old.pressure; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_NONE); + + new.pressure = old.pressure; + new.x = old.x; + + /* y axis movement */ + new.y = common.wcmSuppress; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_ALL); + assert(old.x == new.x); + assert(old.y == new.y); + + new.y = common.wcmSuppress + 1; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_NON_MOTION); + + new.pressure = ~old.pressure; + rc = wcmCheckSuppress(&common, &old, &new); + assert(rc == SUPPRESS_NONE); + new.pressure = old.pressure; +} + + +#endif + /* vim: set noexpandtab tabstop=8 shiftwidth=8: */ diff --git a/src/wcmConfig.c b/src/wcmConfig.c index c1e84f9..e0ab818 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -25,6 +25,10 @@ #include <fcntl.h> #include <unistd.h> +#ifdef ENABLE_TESTS +#include "wacom-test-suite.h" +#endif + /***************************************************************************** * wcmAllocate -- * Allocate the generic bits needed by any wacom device, regardless of type. @@ -125,7 +129,7 @@ static void wcmFree(WacomDevicePtr priv) free(priv); } -TEST_NON_STATIC Bool +static Bool wcmSetFlags(WacomDevicePtr priv, WacomType type) { int flags = 0; @@ -620,7 +624,7 @@ char *wcmEventAutoDevProbe (WacomDevicePtr priv) * Initialize logical size and resolution for individual tool. ****************************************************************************/ -TEST_NON_STATIC void +static void wcmInitialToolSize(WacomDevicePtr priv) { WacomCommonPtr common = priv->common; @@ -1079,4 +1083,162 @@ void wcmDevClose(WacomDevicePtr priv) } } +#ifdef ENABLE_TESTS + +/** + * After a call to wcmInitialToolSize, the min/max and resolution must be + * set up correctly. + * + * wcmInitialToolSize takes the data from the common rec, so test that the + * priv has all the values of the common. + */ +TEST_CASE(test_initial_size) +{ + WacomDeviceRec priv = {0}; + WacomCommonRec common = {0}; + + /* pin to some numbers */ + int xres = 1920, yres = 1600; + int minx, maxx = 2 * xres, miny, maxy = 2 * yres; + + priv.common = &common; + + /* FIXME: we currently assume min of 0 in the driver. we cannot cope + * with non-zero devices */ + minx = miny = 0; + + common.wcmMaxX = maxx; + common.wcmMaxY = maxy; + common.wcmResolX = xres; + common.wcmResolY = yres; + + wcmInitialToolSize(&priv); + + assert(priv.topX == minx); + assert(priv.topY == minx); + assert(priv.bottomX == maxx); + assert(priv.bottomY == maxy); + assert(priv.resolX == xres); + assert(priv.resolY == yres); + + /* Same thing for a touch-enabled device */ + memset(&common, 0, sizeof(common)); + + priv.flags = TOUCH_ID; + assert(IsTouch(&priv)); + + common.wcmMaxTouchX = maxx; + common.wcmMaxTouchY = maxy; + common.wcmTouchResolX = xres; + common.wcmTouchResolY = yres; + + wcmInitialToolSize(&priv); + + assert(priv.topX == minx); + assert(priv.topY == minx); + assert(priv.bottomX == maxx); + assert(priv.bottomY == maxy); + assert(priv.resolX == xres); + assert(priv.resolY == yres); + +} + +TEST_CASE(test_set_type) +{ + InputInfoRec info = {0}; + WacomDeviceRec priv = {0}; + WacomTool tool = {0}; + WacomCommonRec common = {0}; + int rc; + +#define reset(_info, _priv, _tool, _common) \ + memset(&(_info), 0, sizeof(_info)); \ + memset(&(_priv), 0, sizeof(_priv)); \ + memset(&(_tool), 0, sizeof(_tool)); \ + (_priv).frontend = &(_info); \ + (_info).private = &(_priv); \ + (_priv).tool = &(_tool); \ + (_priv).common = &(_common); + + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_STYLUS); + assert(rc == 1); + assert(is_absolute(&priv)); + assert(IsStylus(&priv)); + assert(!IsTouch(&priv)); + assert(!IsEraser(&priv)); + assert(!IsCursor(&priv)); + assert(!IsPad(&priv)); + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_TOUCH); + assert(rc == 1); + /* only some touch screens are absolute */ + assert(!is_absolute(&priv)); + assert(!IsStylus(&priv)); + assert(IsTouch(&priv)); + assert(!IsEraser(&priv)); + assert(!IsCursor(&priv)); + assert(!IsPad(&priv)); + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_ERASER); + assert(rc == 1); + assert(is_absolute(&priv)); + assert(!IsStylus(&priv)); + assert(!IsTouch(&priv)); + assert(IsEraser(&priv)); + assert(!IsCursor(&priv)); + assert(!IsPad(&priv)); + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_CURSOR); + assert(rc == 1); + assert(!is_absolute(&priv)); + assert(!IsStylus(&priv)); + assert(!IsTouch(&priv)); + assert(!IsEraser(&priv)); + assert(IsCursor(&priv)); + assert(!IsPad(&priv)); + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_PAD); + assert(rc == 1); + assert(is_absolute(&priv)); + assert(!IsStylus(&priv)); + assert(!IsTouch(&priv)); + assert(!IsEraser(&priv)); + assert(!IsCursor(&priv)); + assert(IsPad(&priv)); + + reset(info, priv, tool, common); + rc = wcmSetFlags(&priv, WTYPE_INVALID); + assert(rc == 0); + +#undef reset +} + +TEST_CASE(test_flag_set) +{ + int i; + unsigned int flags = 0; + + for (i = 0; i < sizeof(flags); i++) + { + int mask = 1 << i; + flags = 0; + + assert(!MaskIsSet(flags, mask)); + MaskSet(flags, mask); + assert(flags != 0); + assert(MaskIsSet(flags, mask)); + MaskClear(flags, mask); + assert(!MaskIsSet(flags, mask)); + assert(flags == 0); + } +} + +#endif + /* vim: set noexpandtab tabstop=8 shiftwidth=8: */ diff --git a/src/wcmFilter.c b/src/wcmFilter.c index 3758ee3..a2f573a 100644 --- a/src/wcmFilter.c +++ b/src/wcmFilter.c @@ -382,4 +382,120 @@ int wcmTilt2R(int x, int y, double offset) return rotation; } +#ifdef ENABLE_TESTS + +#include "wacom-test-suite.h" + +TEST_CASE(test_tilt_to_rotation) +{ +#if 0 + This table below was generated from wcmTilt2R with the following code + + for (angle = 0; angle < 360; angle++) + { + double rad = angle * M_PI / 180.0; + double x, y; + x = sin(rad); + y = cos(rad); + + /* wcmTilt2R only uses it for the angle anyway, let's try to + get as precise as possible */ + ds.tiltx = x * 1000; + ds.tilty = y * 1000; + ds.rotation = 0; + + wcmTilt2R(&ds); + + printf("{ %d, %d, %d},\n", ds.tiltx, ds.tilty, ds.rotation); + } +#endif + + int rotation_table[][3] = { + { 17, 999, 20}, { 34, 999, 15}, { 52, 998, 10}, { 69, 997, 5}, { 87, 996, 0}, + { 104, 994, -5}, { 121, 992, -10}, { 139, 990, -15}, { 156, 987, -20}, { 173, 984, -25}, + { 190, 981, -30}, { 207, 978, -35}, { 224, 974, -40}, { 241, 970, -45}, { 258, 965, -50}, + { 275, 961, -55}, { 292, 956, -60}, { 309, 951, -65}, { 325, 945, -70}, { 342, 939, -75}, + { 358, 933, -80}, { 374, 927, -85}, { 390, 920, -90}, { 406, 913, -95}, { 422, 906, -100}, + { 438, 898, -105}, { 453, 891, -110}, { 469, 882, -115}, { 484, 874, -120}, { 499, 866, -125}, + { 515, 857, -130}, { 529, 848, -135}, { 544, 838, -140}, { 559, 829, -145}, { 573, 819, -150}, + { 587, 809, -155}, { 601, 798, -160}, { 615, 788, -165}, { 629, 777, -170}, { 642, 766, -175}, + { 656, 754, -180}, { 669, 743, -185}, { 681, 731, -190}, { 694, 719, -195}, { 707, 707, -200}, + { 719, 694, -205}, { 731, 681, -210}, { 743, 669, -215}, { 754, 656, -220}, { 766, 642, -225}, + { 777, 629, -230}, { 788, 615, -235}, { 798, 601, -240}, { 809, 587, -245}, { 819, 573, -250}, + { 829, 559, -255}, { 838, 544, -260}, { 848, 529, -265}, { 857, 515, -270}, { 866, 500, -275}, + { 874, 484, -280}, { 882, 469, -285}, { 891, 453, -290}, { 898, 438, -295}, { 906, 422, -300}, + { 913, 406, -305}, { 920, 390, -310}, { 927, 374, -315}, { 933, 358, -320}, { 939, 342, -325}, + { 945, 325, -330}, { 951, 309, -335}, { 956, 292, -340}, { 961, 275, -345}, { 965, 258, -350}, + { 970, 241, -355}, { 974, 224, -360}, { 978, 207, -365}, { 981, 190, -370}, { 984, 173, -375}, + { 987, 156, -380}, { 990, 139, -385}, { 992, 121, -390}, { 994, 104, -395}, { 996, 87, -400}, + { 997, 69, -405}, { 998, 52, -410}, { 999, 34, -415}, { 999, 17, -420}, { 1000, 0, -425}, + { 999, -17, -430}, { 999, -34, -435}, { 998, -52, -440}, { 997, -69, -445}, { 996, -87, -450}, + { 994, -104, -455}, { 992, -121, -460}, { 990, -139, -465}, { 987, -156, -470}, { 984, -173, -475}, + { 981, -190, -480}, { 978, -207, -485}, { 974, -224, -490}, { 970, -241, -495}, { 965, -258, -500}, + { 961, -275, -505}, { 956, -292, -510}, { 951, -309, -515}, { 945, -325, -520}, { 939, -342, -525}, + { 933, -358, -530}, { 927, -374, -535}, { 920, -390, -540}, { 913, -406, -545}, { 906, -422, -550}, + { 898, -438, -555}, { 891, -453, -560}, { 882, -469, -565}, { 874, -484, -570}, { 866, -499, -575}, + { 857, -515, -580}, { 848, -529, -585}, { 838, -544, -590}, { 829, -559, -595}, { 819, -573, -600}, + { 809, -587, -605}, { 798, -601, -610}, { 788, -615, -615}, { 777, -629, -620}, { 766, -642, -625}, + { 754, -656, -630}, { 743, -669, -635}, { 731, -681, -640}, { 719, -694, -645}, { 707, -707, -650}, + { 694, -719, -655}, { 681, -731, -660}, { 669, -743, -665}, { 656, -754, -670}, { 642, -766, -675}, + { 629, -777, -680}, { 615, -788, -685}, { 601, -798, -690}, { 587, -809, -695}, { 573, -819, -700}, + { 559, -829, -705}, { 544, -838, -710}, { 529, -848, -715}, { 515, -857, -720}, { 499, -866, -725}, + { 484, -874, -730}, { 469, -882, -735}, { 453, -891, -740}, { 438, -898, -745}, { 422, -906, -750}, + { 406, -913, -755}, { 390, -920, -760}, { 374, -927, -765}, { 358, -933, -770}, { 342, -939, -775}, + { 325, -945, -780}, { 309, -951, -785}, { 292, -956, -790}, { 275, -961, -795}, { 258, -965, -800}, + { 241, -970, -805}, { 224, -974, -810}, { 207, -978, -815}, { 190, -981, -820}, { 173, -984, -825}, + { 156, -987, -830}, { 139, -990, -835}, { 121, -992, -840}, { 104, -994, -845}, { 87, -996, -850}, + { 69, -997, -855}, { 52, -998, -860}, { 34, -999, -865}, { 17, -999, -870}, { 0, -1000, -875}, + { -17, -999, -880}, { -34, -999, -885}, { -52, -998, -890}, { -69, -997, -895}, { -87, -996, -900}, + { -104, -994, 895}, { -121, -992, 890}, { -139, -990, 885}, { -156, -987, 880}, { -173, -984, 875}, + { -190, -981, 870}, { -207, -978, 865}, { -224, -974, 860}, { -241, -970, 855}, { -258, -965, 850}, + { -275, -961, 845}, { -292, -956, 840}, { -309, -951, 835}, { -325, -945, 830}, { -342, -939, 825}, + { -358, -933, 820}, { -374, -927, 815}, { -390, -920, 810}, { -406, -913, 805}, { -422, -906, 800}, + { -438, -898, 795}, { -453, -891, 790}, { -469, -882, 785}, { -484, -874, 780}, { -500, -866, 775}, + { -515, -857, 770}, { -529, -848, 765}, { -544, -838, 760}, { -559, -829, 755}, { -573, -819, 750}, + { -587, -809, 745}, { -601, -798, 740}, { -615, -788, 735}, { -629, -777, 730}, { -642, -766, 725}, + { -656, -754, 720}, { -669, -743, 715}, { -681, -731, 710}, { -694, -719, 705}, { -707, -707, 700}, + { -719, -694, 695}, { -731, -681, 690}, { -743, -669, 685}, { -754, -656, 680}, { -766, -642, 675}, + { -777, -629, 670}, { -788, -615, 665}, { -798, -601, 660}, { -809, -587, 655}, { -819, -573, 650}, + { -829, -559, 645}, { -838, -544, 640}, { -848, -529, 635}, { -857, -515, 630}, { -866, -500, 625}, + { -874, -484, 620}, { -882, -469, 615}, { -891, -453, 610}, { -898, -438, 605}, { -906, -422, 600}, + { -913, -406, 595}, { -920, -390, 590}, { -927, -374, 585}, { -933, -358, 580}, { -939, -342, 575}, + { -945, -325, 570}, { -951, -309, 565}, { -956, -292, 560}, { -961, -275, 555}, { -965, -258, 550}, + { -970, -241, 545}, { -974, -224, 540}, { -978, -207, 535}, { -981, -190, 530}, { -984, -173, 525}, + { -987, -156, 520}, { -990, -139, 515}, { -992, -121, 510}, { -994, -104, 505}, { -996, -87, 500}, + { -997, -69, 495}, { -998, -52, 490}, { -999, -34, 485}, { -999, -17, 480}, { -1000, 0, 475}, + { -999, 17, 470}, { -999, 34, 465}, { -998, 52, 460}, { -997, 69, 455}, { -996, 87, 450}, + { -994, 104, 445}, { -992, 121, 440}, { -990, 139, 435}, { -987, 156, 430}, { -984, 173, 425}, + { -981, 190, 420}, { -978, 207, 415}, { -974, 224, 410}, { -970, 241, 405}, { -965, 258, 400}, + { -961, 275, 395}, { -956, 292, 390}, { -951, 309, 385}, { -945, 325, 380}, { -939, 342, 375}, + { -933, 358, 370}, { -927, 374, 365}, { -920, 390, 360}, { -913, 406, 355}, { -906, 422, 350}, + { -898, 438, 345}, { -891, 453, 340}, { -882, 469, 335}, { -874, 484, 330}, { -866, 500, 325}, + { -857, 515, 320}, { -848, 529, 315}, { -838, 544, 310}, { -829, 559, 305}, { -819, 573, 300}, + { -809, 587, 295}, { -798, 601, 290}, { -788, 615, 285}, { -777, 629, 280}, { -766, 642, 275}, + { -754, 656, 270}, { -743, 669, 265}, { -731, 681, 260}, { -719, 694, 255}, { -707, 707, 250}, + { -694, 719, 245}, { -681, 731, 240}, { -669, 743, 235}, { -656, 754, 230}, { -642, 766, 225}, + { -629, 777, 220}, { -615, 788, 215}, { -601, 798, 210}, { -587, 809, 205}, { -573, 819, 200}, + { -559, 829, 195}, { -544, 838, 190}, { -529, 848, 185}, { -515, 857, 180}, { -500, 866, 175}, + { -484, 874, 170}, { -469, 882, 165}, { -453, 891, 160}, { -438, 898, 155}, { -422, 906, 150}, + { -406, 913, 145}, { -390, 920, 140}, { -374, 927, 135}, { -358, 933, 130}, { -342, 939, 125}, + { -325, 945, 120}, { -309, 951, 115}, { -292, 956, 110}, { -275, 961, 105}, { -258, 965, 100}, + { -241, 970, 95}, { -224, 974, 90}, { -207, 978, 85}, { -190, 981, 80}, { -173, 984, 75}, + { -156, 987, 70}, { -139, 990, 65}, { -121, 992, 60}, { -104, 994, 55}, { -87, 996, 50}, + { -69, 997, 45}, { -52, 998, 40}, { -34, 999, 35}, { -17, 999, 30}, + }; + int i; + + for (i = 0; i < ARRAY_SIZE(rotation_table); i++) + { + int rotation; + int x, y; + x = rotation_table[i][0]; + y = rotation_table[i][1]; + rotation = wcmTilt2R(x, y, INTUOS4_CURSOR_ROTATION_OFFSET); + assert(rotation == rotation_table[i][2]); + } +} +#endif + /* vim: set noexpandtab tabstop=8 shiftwidth=8: */ diff --git a/src/wcmUSB.c b/src/wcmUSB.c index dd38f35..5b10ee3 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -21,6 +21,10 @@ #include "xf86Wacom.h" +#if ENABLE_TESTS +#include "wacom-test-suite.h" +#endif + #include <math.h> #include <asm/types.h> #include <linux/input.h> @@ -1347,7 +1351,7 @@ static void usbParseAbsEvent(WacomCommonPtr common, * * @return The new button mask */ -TEST_NON_STATIC int +static int mod_buttons(WacomCommonPtr common, int buttons, int btn, int state) { int mask; @@ -2066,4 +2070,24 @@ static int usbProbeKeys(WacomDevicePtr priv) } +#ifdef ENABLE_TESTS + +TEST_CASE(test_mod_buttons) +{ + WacomCommonRec common = {0}; + int i; + for (i = 0; i < sizeof(int) * 8; i++) + { + int buttons = mod_buttons(&common, 0, i, 1); + assert(buttons == (1 << i)); + buttons = mod_buttons(&common, 0, i, 0); + assert(buttons == 0); + } + + assert(mod_buttons(&common, 0, sizeof(int) * 8, 1) == 0); +} + + +#endif + /* vim: set noexpandtab tabstop=8 shiftwidth=8: */ diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 6c69a60..9d65f8d 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -190,34 +190,6 @@ enum WacomSuppressMode { /****************************************************************************/ -#ifndef UNIT_TESTS - -# define TEST_NON_STATIC static - -#else - -# define TEST_NON_STATIC - -/* For test suite */ -/* xf86Wacom.c */ -extern void wcmInitialToolSize(WacomDevicePtr priv); - -/* wcmConfig.c */ -extern int wcmSetFlags(WacomDevicePtr priv, WacomType type); - -/* wcmCommon.c */ -extern int getScrollDelta(int current, int old, int wrap, int flags); -extern int getWheelButton(int delta, int action_up, int action_dn); -extern int rebasePressure(const WacomDevicePtr priv, const WacomDeviceState *ds); -extern int normalizePressure(const WacomDevicePtr priv, const int raw_pressure); -extern enum WacomSuppressMode wcmCheckSuppress(WacomCommonPtr common, - const WacomDeviceState* dsOrig, - WacomDeviceState* dsNew); - -/* wcmUSB.c */ -extern int mod_buttons(WacomCommonPtr common, int buttons, int btn, int state); -#endif /* UNIT_TESTS */ - #endif /* __XF86WACOM_H */ /* vim: set noexpandtab tabstop=8 shiftwidth=8: */ diff --git a/test/Makefile.am b/test/Makefile.am index 1d8378b..fe371e2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,20 +1,19 @@ if UNITTESTS include ../src/common.mk -noinst_PROGRAMS = wacom-tests -noinst_LTLIBRARIES = libwacom-test.la -libwacom_test_la_SOURCES =$(DRIVER_SOURCES) -libwacom_test_la_CFLAGS = -DUNIT_TESTS -I$(top_srcdir)/src $(XORG_CFLAGS) $(CWARNFLAGS) -fvisibility=default +check_PROGRAMS = wacom-tests +check_LTLIBRARIES = wacom_drv_test.la -TESTS=$(noinst_PROGRAMS) +wacom_drv_test_la_SOURCES = $(DRIVER_SOURCES) wacom-test-suite.c wacom-test-suite.h +wacom_drv_test_la_CFLAGS = -DENABLE_TESTS -I$(top_srcdir)/include -I$(top_srcdir)/src $(XORG_CFLAGS) $(CWARNFLAGS) -fvisibility=default +wacom_drv_test_la_LDFLAGS = -module -avoid-version -rpath $(abs_builddir) +wacom_drv_test_la_LIBADD = $(XORG_LIBS) -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(UDEV_CFLAGS) -TEST_LDADD= libwacom-test.la -COMMON_SOURCES=fake-symbols.c fake-symbols.h +wacom_tests_LDADD = -ldl +wacom_tests_LDFLAGS = -rpath $(abs_builddir)/.libs +wacom_tests_CFLAGS = -DENABLE_TESTS $(CWARNFLAGS) +wacom_tests_SOURCES = wacom-tests.c -wacom_tests_LDADD=$(TEST_LDADD) $(UDEV_LIBS) -wacom_tests_CFLAGS= -DUNIT_TESTS $(AM_CFLAGS) -wacom_tests_SOURCES=wacom-tests.c $(COMMON_SOURCES) +TESTS=$(check_PROGRAMS) endif diff --git a/test/fake-symbols.c b/test/fake-symbols.c deleted file mode 100644 index cb7ba03..0000000 --- a/test/fake-symbols.c +++ /dev/null @@ -1,512 +0,0 @@ -#include "fake-symbols.h" - -_X_EXPORT int -xf86CloseSerial (int fd) -{ - return 0; -} - -_X_EXPORT int -xf86WaitForInput (int fd, int timeout) -{ - return 0; -} - -_X_EXPORT int -xf86OpenSerial (XF86OptionPtr options) -{ - return 0; -} - -_X_EXPORT int -xf86SetSerialSpeed (int fd, int speed) -{ - return 0; -} - -_X_EXPORT XF86OptionPtr -xf86ReplaceIntOption(XF86OptionPtr optlist, const char *name, const int val) -{ - return NULL; -} - -_X_EXPORT XF86OptionPtr -xf86ReplaceBoolOption(XF86OptionPtr optlist, const char *name, Bool val) -{ - return NULL; -} - -_X_EXPORT char * -xf86SetStrOption(XF86OptionPtr optlist, const char *name, const char *deflt) -{ - return NULL; -} - -_X_EXPORT int -xf86SetBoolOption(XF86OptionPtr optlist, const char *name, int deflt) -{ - return 0; -} - -_X_EXPORT XF86OptionPtr -xf86AddNewOption(XF86OptionPtr head, const char *name, const char *val) -{ - return NULL; -} - -_X_EXPORT void -xf86OptionListFree(XF86OptionPtr opt) -{ - return; -} - -_X_EXPORT const char * -xf86FindOptionValue(XF86OptionPtr options, const char *name) -{ - return NULL; -} - -_X_EXPORT char * -xf86OptionName(XF86OptionPtr opt) -{ - return NULL; -} - -_X_EXPORT char * -xf86OptionValue(XF86OptionPtr opt) -{ - return NULL; -} - -_X_EXPORT char * -xf86CheckStrOption(XF86OptionPtr optlist, const char *name, const char *deflt) -{ - return NULL; -} - -_X_EXPORT int -xf86CheckBoolOption(XF86OptionPtr list, const char *name, int deflt) -{ - return 0; -} - -_X_EXPORT int -xf86CheckIntOption(XF86OptionPtr list, const char *name, int deflt) -{ - return 0; -} - -_X_EXPORT void -xf86AddEnabledDevice(InputInfoPtr pInfo) -{ - return; -} - -_X_EXPORT void -xf86RemoveEnabledDevice(InputInfoPtr pInfo) -{ - return; -} - -_X_EXPORT Atom -XIGetKnownProperty(const char *name) -{ - return None; -} - -_X_EXPORT void -xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags) -{ - return; -} - -_X_EXPORT void -DeleteInputDeviceRequest(DeviceIntPtr pDev) -{ - return; -} - -_X_EXPORT void -FreeInputAttributes(InputAttributes *attrs) -{ - return; -} - -_X_EXPORT void -xf86PostButtonEvent(DeviceIntPtr device, - int is_absolute, - int button, - int is_down, - int first_valuator, - int num_valuators, - ...) -{ - return; -} - -_X_EXPORT int -Xasprintf(char ** ret, const char * format, ...) -{ - return 0; -} - - -_X_EXPORT int -XISetDevicePropertyDeletable(DeviceIntPtr dev, Atom property, Bool deletable) -{ - return 0; -} - - -_X_EXPORT InputInfoPtr -xf86FirstLocalDevice(void) -{ - return NULL; -} - - -_X_EXPORT void -xf86DeleteInput(InputInfoPtr pInp, int flags) -{ - return; -} - -_X_EXPORT XF86OptionPtr -xf86OptionListDuplicate(XF86OptionPtr options) -{ - return NULL; -} - -_X_EXPORT Bool -InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom* labels, - CARD8 *map) -{ - return FALSE; -} - - -_X_EXPORT Bool -InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, - int minval, int maxval, int resolution, - int min_res, int max_res, int mode) -{ - return TRUE; -} - -_X_EXPORT void -xf86PostKeyboardEvent(DeviceIntPtr device, - unsigned int key_code, - int is_down) -{ - return; -} - -_X_EXPORT int -xf86SetIntOption(XF86OptionPtr optlist, const char *name, int deflt) -{ - return 0; -} - -_X_EXPORT void -xf86PostButtonEventP(DeviceIntPtr device, - int is_absolute, - int button, - int is_down, - int first_valuator, - int num_valuators, - const int *valuators) -{ - return; -} - -_X_EXPORT Bool -InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) -{ - return FALSE; -} - -_X_EXPORT int -XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type, - int format, int mode, unsigned long len, - const void * value, Bool sendevent) -{ - return 0; -} - -_X_EXPORT CARD32 -GetTimeInMillis (void) -{ - return 0; -} - - -_X_EXPORT int -NewInputDeviceRequest (InputOption *options, - InputAttributes *attrs, - DeviceIntPtr *pdev) -{ - return 0; -} - - -_X_EXPORT Bool -InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc) -{ - return FALSE; -} - - -_X_EXPORT InputAttributes* -DuplicateInputAttributes(InputAttributes *attrs) -{ - return NULL; -} - -_X_EXPORT int -ValidAtom(Atom atom) -{ - return None; -} - -_X_EXPORT Bool -InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, - BellProcPtr bell_func, KbdCtrlProcPtr ctrl_func) -{ - return FALSE; -} - -_X_EXPORT long -XIRegisterPropertyHandler(DeviceIntPtr dev, - int (*SetProperty) (DeviceIntPtr dev, - Atom property, - XIPropertyValuePtr prop, - BOOL checkonly), - int (*GetProperty) (DeviceIntPtr dev, - Atom property), - int (*DelProperty) (DeviceIntPtr dev, - Atom property)) -{ - return 0; -} - -_X_EXPORT int -InitProximityClassDeviceStruct(DeviceIntPtr dev) -{ - return 0; -} - -_X_EXPORT void -LogMessageVerbSigSafe(MessageType type, int verb, const char *format, ...) -{ - return; -} - -_X_EXPORT void -LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list args) -{ - return; -} - -_X_EXPORT void -LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) -{ - return; -} - -_X_EXPORT void -xf86MsgVerb(MessageType type, int verb, const char *format, ...) -{ - return; -} - -_X_EXPORT void -xf86Msg(MessageType type, const char *format, ...) -{ - return; -} - -_X_EXPORT void -xf86IDrvMsg(InputInfoPtr pInfo, MessageType type, const char *format, ...) -{ - return; -} - -_X_EXPORT void -xf86VIDrvMsgVerb(InputInfoPtr pInfo, MessageType type, int level, const char *format, va_list args) -{ - return; -} - -_X_EXPORT void -xf86PostMotionEventP(DeviceIntPtr device, - int is_absolute, - int first_valuator, - int num_valuators, - const int *valuators) -{ - return; -} - - -_X_EXPORT Bool -InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels, - int numMotionEvents, int mode) -{ - return FALSE; -} - - -_X_EXPORT XF86OptionPtr -xf86ReplaceStrOption(XF86OptionPtr optlist, const char *name, const char* val) -{ - return NULL; -} - - -_X_EXPORT XF86OptionPtr -xf86NextOption(XF86OptionPtr list) -{ - return NULL; -} - - -_X_EXPORT int -XIGetDeviceProperty (DeviceIntPtr dev, Atom property, XIPropertyValuePtr *value) -{ - return 0; -} - - -_X_EXPORT Atom -MakeAtom(const char *string, unsigned len, Bool makeit) -{ - return None; -} - - -_X_EXPORT int -GetMotionHistorySize(void) -{ - return 0; -} - - -_X_EXPORT void -xf86PostProximityEventP(DeviceIntPtr device, - int is_in, - int first_valuator, - int num_valuators, - const int *valuators) -{ - return; -} - - -_X_EXPORT Bool -InitFocusClassDeviceStruct(DeviceIntPtr dev) -{ - return FALSE; -} - -ClientPtr serverClient; - -Bool QueueWorkProc ( - Bool (*function)(ClientPtr /* pClient */, pointer /* closure */), - ClientPtr client, pointer closure) -{ - return FALSE; -} - - -OsTimerPtr -TimerSet(OsTimerPtr timer, int flags, CARD32 millis, - OsTimerCallback func, pointer arg) -{ - return NULL; -} - -void TimerFree(OsTimerPtr timer) -{ -} - -void TimerCancel(OsTimerPtr timer) -{ -} - -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24 -int -xf86BlockSIGIO (void) -{ - return 0; -} - -void -xf86UnblockSIGIO (int wasset) -{ -} -#else -void input_lock (void) -{ -} - -void input_unlock (void) -{ -} -#endif - -/* This is not the same as the X server one, but it'll do for the tests */ -typedef struct _InputOption { - struct _InputOption *next; - char *key; - char *value; -} InputOption; - -InputOption* -input_option_new(InputOption *list, const char *key, const char *value) -{ - InputOption *new; - - new = calloc(1, sizeof(InputOption)); - new->key = strdup(key); - new->value = strdup(value); - new->next = list; - return new; -} - -void -input_option_free_list(InputOption **opts) -{ - InputOption *tmp = *opts; - while(*opts) - { - tmp = (*opts)->next; - free((*opts)->key); - free((*opts)->value); - free((*opts)); - *opts = tmp; - } -} - -_X_EXPORT Bool -InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches, - unsigned int mode, unsigned int numAxes) { - return TRUE; -} - -_X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators) { - return NULL; -} - -_X_EXPORT void valuator_mask_set(ValuatorMask *mask, int valuator, int data) { - return; -} - -_X_EXPORT void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid, uint16_t type, - uint32_t flags, const ValuatorMask *mask) { - return; -} - -_X_EXPORT void -xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) -{ -} diff --git a/test/fake-symbols.h b/test/fake-symbols.h deleted file mode 100644 index 2190b80..0000000 --- a/test/fake-symbols.h +++ /dev/null @@ -1,8 +0,0 @@ -#include <xorg-server.h> -#include <dix.h> -#include <os.h> -#include <exevents.h> -#include <Xprintf.h> -#include <xf86.h> -#include <xf86Xinput.h> -#include <xf86_OSproc.h> diff --git a/test/tester.c b/test/tester.c new file mode 100644 index 0000000..268dbeb --- /dev/null +++ b/test/tester.c @@ -0,0 +1,48 @@ + +/* + * Copyright 2022 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include <config.h> + +#include <assert.h> +#include <dlfcn.h> +#include <stdio.h> + +#define TESTDRV "wacom_drv_test.so" +#define TESTFUNC "run_tests" + +void *serverClient; + +int main(void) { + void *handle = dlopen(TESTDRV, RTLD_LAZY); + if (handle == NULL) { + fprintf(stderr, "Failed to open %s: %s\n", TESTDRV, dlerror()); + return 1; + } + + void (*func)(void) = dlsym(handle, TESTFUNC); + + if (func == NULL) { + fprintf(stderr, "Failed to load %s: %s\n", TESTFUNC, dlerror()); + return 1; + } + + func(); + + return 0; +} diff --git a/test/wacom-test-suite.c b/test/wacom-test-suite.c new file mode 100644 index 0000000..ff51b9a --- /dev/null +++ b/test/wacom-test-suite.c @@ -0,0 +1,49 @@ +/* + * Copyright 2022 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#ifndef ENABLE_TESTS +#error "Expected ENABLE_TESTS to be defined" +#endif + +#include <config.h> +#include <stdio.h> +#include "wacom-test-suite.h" + +void wcm_run_tests(void); + +extern const struct test_case_decl __start_test_section; +extern const struct test_case_decl __stop_test_section; + +/* This one needs to be defined for dlopen to be able to load our test module, + * RTLD_LAZY only applies to functions. */ +void *serverClient; + +/* The entry point: iterate through the tests and run them one-by-one. Any + * test that doesn't assert is considered successful. + */ +void wcm_run_tests(void) { + + const struct test_case_decl *t; + for (t = &__start_test_section; t < &__stop_test_section; t++) { + printf("- running %-32s", t->name); + fflush(stdout); + t->func(); + printf("SUCCCESS\n"); + } +} diff --git a/test/wacom-test-suite.h b/test/wacom-test-suite.h new file mode 100644 index 0000000..2678241 --- /dev/null +++ b/test/wacom-test-suite.h @@ -0,0 +1,58 @@ +/* + * Copyright 2022 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __WACOM_TEST_SUITE_H +#define __WACOM_TEST_SUITE_H + +#include <config.h> + +struct test_case_decl { + const char *name; + void (*func)(void); +}; + +/** + * For each test case with "tname", define a struct "_decl_tname" and put it + * in the "test_section" of the resulting ELF object. + * + * wcm_run_tests() then iterates through these objects using a + * compiler-provided variable and can call the actual function for each test. + */ +#define TEST_CASE(tname) \ + static void (tname)(void); \ + static const struct test_case_decl _decl_##tname \ + __attribute__((used)) \ + __attribute((section("test_section"))) = { \ + .name = #tname, \ + .func = tname, \ + }; \ + static void (tname)(void) + + +/** + * These may be called by a test function - #define them so they are always + * available. + */ +#define wcmLog(priv, type, ...) fprintf(stderr, __VA_ARGS__) +#define wcmLogSafe(priv, type, ...) fprintf(stderr, __VA_ARGS__) +#define wcmLogCommon(common, type, ...) fprintf(stderr, __VA_ARGS__) +#define wcmLogCommonSafe(common, type, ...) fprintf(stderr, __VA_ARGS__) +#define wcmLogDebugCommon(common, level, func, ...) fprintf(stderr, __VA_ARGS__) +#define wcmLogDebugDevice(priv, level, func, ...) fprintf(stderr, __VA_ARGS__) + +#endif /* __WACOM_TEST_SUITE_H */ diff --git a/test/wacom-tests.c b/test/wacom-tests.c index 0fbbe71..ddc9c84 100644 --- a/test/wacom-tests.c +++ b/test/wacom-tests.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 © Red Hat, Inc. + * Copyright 2022 © Red Hat, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,620 +18,30 @@ #include <config.h> -#include "fake-symbols.h" -#include <xf86Wacom.h> +#include <assert.h> +#include <dlfcn.h> +#include <stdio.h> -/** - * NOTE: this file may not contain tests that require static variables. The - * current compiler undef static magic makes them local variables and thus - * change the behaviour. - */ - -static void -test_get_scroll_delta(void) -{ - int test_table[][5] = { - { 100, 25, 0, 0, 75}, { 25, 100, 0, 0, -75}, - {-100, -25, 0, 0, -75}, {-25, -100, 0, 0, 75}, - { 100, -25, 0, 0, 125}, {-25, 100, 0, 0,-125}, - { 100, 100, 0, 0, 0}, {-25, -25, 0, 0, 0}, - - {23, 0, 50, 0, 23}, {0, 23, 50, 0, -23}, - {24, 0, 50, 0, 24}, {0, 24, 50, 0, -24}, - {25, 0, 50, 0, 25}, {0, 25, 50, 0, -25}, - {26, 0, 50, 0, -25}, {0, 26, 50, 0, 25}, - {27, 0, 50, 0, -24}, {0, 27, 50, 0, 24}, - {28, 0, 50, 0, -23}, {0, 28, 50, 0, 23}, - - {1024, 0, 0, AXIS_BITWISE, 11}, {0, 1024, 0, AXIS_BITWISE, -11}, - - { 0, 4, 256, AXIS_BITWISE, -3}, {4, 0, 256, AXIS_BITWISE, 3}, - { 1, 4, 256, AXIS_BITWISE, -2}, {4, 1, 256, AXIS_BITWISE, 2}, - { 2, 4, 256, AXIS_BITWISE, -1}, {4, 2, 256, AXIS_BITWISE, 1}, - { 4, 4, 256, AXIS_BITWISE, 0}, {4, 4, 256, AXIS_BITWISE, 0}, - { 8, 4, 256, AXIS_BITWISE, 1}, {4, 8, 256, AXIS_BITWISE, -1}, - { 16, 4, 256, AXIS_BITWISE, 2}, {4, 16, 256, AXIS_BITWISE, -2}, - { 32, 4, 256, AXIS_BITWISE, 3}, {4, 32, 256, AXIS_BITWISE, -3}, - { 64, 4, 256, AXIS_BITWISE, 4}, {4, 64, 256, AXIS_BITWISE, -4}, - {128, 4, 256, AXIS_BITWISE, 5}, {4, 128, 256, AXIS_BITWISE, -5}, - {256, 4, 256, AXIS_BITWISE, -4}, {4, 256, 256, AXIS_BITWISE, 4} - }; - int i; - - for (i = 0; i < ARRAY_SIZE(test_table); i++) - { - int delta; - int current, old, wrap, flags; - current = test_table[i][0]; - old = test_table[i][1]; - wrap = test_table[i][2]; - flags = test_table[i][3]; - - delta = getScrollDelta(current, old, wrap, flags); - assert(delta == test_table[i][4]); - - flags |= AXIS_INVERT; - delta = getScrollDelta(current, old, wrap, flags); - assert(delta == -1 * test_table[i][4]); - } -} - -static void -test_get_wheel_button(void) -{ - int delta; - int action_up, action_dn; - - action_up = 300; - action_dn = 400; - - for (delta = -32; delta <= 32; delta++) - { - int action; - action = getWheelButton(delta, action_up, action_dn); - if (delta < 0) - { - assert(action == action_dn); - } - else if (delta == 0) - { - assert(action == -1); - } - else - { - assert(action == action_up); - } - } -} - -/** - * Test refcounting of the common struct. - */ -static void -test_common_ref(void) -{ - WacomCommonPtr common; - WacomCommonPtr second; - - common = wcmNewCommon(); - assert(common); - assert(common->refcnt == 1); - - second = wcmRefCommon(common); - - assert(second == common); - assert(second->refcnt == 2); - - wcmFreeCommon(&second); - assert(common); - assert(!second); - assert(common->refcnt == 1); - - second = wcmRefCommon(NULL); - assert(common != second); - assert(second->refcnt == 1); - assert(common->refcnt == 1); - - wcmFreeCommon(&second); - wcmFreeCommon(&common); - assert(!second && !common); -} - - -static void -test_rebase_pressure(void) -{ - WacomDeviceRec priv = {0}; - WacomDeviceRec base = {0}; - WacomDeviceState ds = {0}; - int pressure; - - priv.minPressure = 4; - ds.pressure = 10; - - /* Pressure in out-of-proximity means get new preloaded pressure */ - priv.oldState.proximity = 0; - - /* make sure we don't touch priv, not really needed, the compiler should - * honor the consts but... */ - base = priv; - - pressure = rebasePressure(&priv, &ds); - assert(pressure == ds.pressure); - - assert(memcmp(&priv, &base, sizeof(priv)) == 0); - - /* Pressure in-proximity means rebase to new minimum */ - priv.oldState.proximity = 1; - - base = priv; - - pressure = rebasePressure(&priv, &ds); - assert(pressure == priv.minPressure); - assert(memcmp(&priv, &base, sizeof(priv)) == 0); -} - -static void -test_normalize_pressure(void) -{ - InputInfoRec pInfo = {0}; - WacomDeviceRec priv = {0}; - WacomCommonRec common = {0}; - int normalized_max = 65536; - int pressure, prev_pressure = -1; - int i, j, k; - - priv.common = &common; - priv.frontend = &pInfo; - pInfo.name = strdupa("Wacom test device"); - common.wcmPressureRecalibration = 1; - - priv.minPressure = 0; - - /* Check various maxCurve values */ - for (k = 512; k <= normalized_max; k += 239) { - priv.maxCurve = k; - - /* Some random loop to check various maxZ pressure values. Starting at - * 1, because if wcmMaxZ is 0 we have other problems. */ - for (j = 1; j <= 256; j += 17) - { - common.wcmMaxZ = j; - prev_pressure = -1; - - for (i = 0; i <= common.wcmMaxZ; i++) - { - pressure = i; - - pressure = normalizePressure(&priv, pressure); - assert(pressure >= 0); - assert(pressure <= k); - - /* we count up, so assume normalised pressure goes up too */ - assert(prev_pressure < pressure); - prev_pressure = pressure; - } - - assert(pressure == k); - } - } - - /* If minPressure is higher than ds->pressure, normalizePressure takes - * minPressure and ignores actual pressure. This would be a bug in the - * driver code, but we might as well test for it. */ - priv.minPressure = 10; - priv.maxCurve = normalized_max; - - prev_pressure = normalizePressure(&priv, 0); - for (i = 0; i < priv.minPressure; i++) - { - - pressure = normalizePressure(&priv, i); - - assert(pressure >= 0); - assert(pressure < normalized_max); - - /* we count up, so assume normalised pressure goes up too */ - assert(prev_pressure == pressure); - } -} - -/** - * After a call to wcmInitialToolSize, the min/max and resolution must be - * set up correctly. - * - * wcmInitialToolSize takes the data from the common rec, so test that the - * priv has all the values of the common. - */ -static void -test_initial_size(void) -{ - WacomDeviceRec priv = {0}; - WacomCommonRec common = {0}; - - /* pin to some numbers */ - int xres = 1920, yres = 1600; - int minx, maxx = 2 * xres, miny, maxy = 2 * yres; - - priv.common = &common; +#define TESTDRV "wacom_drv_test.so" +#define TESTFUNC "wcm_run_tests" - /* FIXME: we currently assume min of 0 in the driver. we cannot cope - * with non-zero devices */ - minx = miny = 0; +int main(void) { + void *handle = dlopen(TESTDRV, RTLD_LAZY); + void (*func)(void); - common.wcmMaxX = maxx; - common.wcmMaxY = maxy; - common.wcmResolX = xres; - common.wcmResolY = yres; - - wcmInitialToolSize(&priv); - - assert(priv.topX == minx); - assert(priv.topY == minx); - assert(priv.bottomX == maxx); - assert(priv.bottomY == maxy); - assert(priv.resolX == xres); - assert(priv.resolY == yres); - - /* Same thing for a touch-enabled device */ - memset(&common, 0, sizeof(common)); - - priv.flags = TOUCH_ID; - assert(IsTouch(&priv)); - - common.wcmMaxTouchX = maxx; - common.wcmMaxTouchY = maxy; - common.wcmTouchResolX = xres; - common.wcmTouchResolY = yres; - - wcmInitialToolSize(&priv); - - assert(priv.topX == minx); - assert(priv.topY == minx); - assert(priv.bottomX == maxx); - assert(priv.bottomY == maxy); - assert(priv.resolX == xres); - assert(priv.resolY == yres); - -} - -static void -test_suppress(void) -{ - enum WacomSuppressMode rc; - WacomCommonRec common = {0}; - WacomDeviceState old = {0}, - new = {0}; - - common.wcmSuppress = 2; - - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_ALL); - - /* proximity, buttons and strip send for any change */ - -#define test_any_suppress(field) \ - old.field = 1; \ - rc = wcmCheckSuppress(&common, &old, &new); \ - assert(rc == SUPPRESS_NONE); \ - new.field = old.field; - - test_any_suppress(proximity); - test_any_suppress(buttons); - test_any_suppress(stripx); - test_any_suppress(stripy); - -#undef test_any_suppress - - /* pressure, capacity, throttle, rotation, abswheel only when - * difference is above suppress */ - - /* test negative and positive transition */ -#define test_above_suppress(field) \ - old.field = common.wcmSuppress; \ - rc = wcmCheckSuppress(&common, &old, &new); \ - assert(rc == SUPPRESS_ALL); \ - old.field = common.wcmSuppress + 1; \ - rc = wcmCheckSuppress(&common, &old, &new); \ - assert(rc == SUPPRESS_NONE); \ - old.field = -common.wcmSuppress; \ - rc = wcmCheckSuppress(&common, &old, &new); \ - assert(rc == SUPPRESS_ALL); \ - old.field = -common.wcmSuppress - 1; \ - rc = wcmCheckSuppress(&common, &old, &new); \ - assert(rc == SUPPRESS_NONE); \ - new.field = old.field; - - test_above_suppress(pressure); - test_above_suppress(throttle); - test_above_suppress(rotation); - test_above_suppress(abswheel); - -#undef test_above_suppress - - /* any movement on relwheel counts */ - new.relwheel = 1; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_NONE); - new.relwheel = 0; - - /* x axis movement */ - - /* not enough movement */ - new.x = common.wcmSuppress; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_ALL); - assert(old.x == new.x); - assert(old.y == new.y); - - /* only x axis above thresh */ - new.x = common.wcmSuppress + 1; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_NON_MOTION); - - /* x and other field above thres */ - new.pressure = ~old.pressure; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_NONE); - - new.pressure = old.pressure; - new.x = old.x; - - /* y axis movement */ - new.y = common.wcmSuppress; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_ALL); - assert(old.x == new.x); - assert(old.y == new.y); - - new.y = common.wcmSuppress + 1; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_NON_MOTION); - - new.pressure = ~old.pressure; - rc = wcmCheckSuppress(&common, &old, &new); - assert(rc == SUPPRESS_NONE); - new.pressure = old.pressure; -} - -static void -test_tilt_to_rotation(void) -{ -#if 0 - This table below was generated from wcmTilt2R with the following code - - for (angle = 0; angle < 360; angle++) - { - double rad = angle * M_PI / 180.0; - double x, y; - x = sin(rad); - y = cos(rad); - - /* wcmTilt2R only uses it for the angle anyway, let's try to - get as precise as possible */ - ds.tiltx = x * 1000; - ds.tilty = y * 1000; - ds.rotation = 0; - - wcmTilt2R(&ds); - - printf("{ %d, %d, %d},\n", ds.tiltx, ds.tilty, ds.rotation); - } -#endif - - int rotation_table[][3] = { - { 17, 999, 20}, { 34, 999, 15}, { 52, 998, 10}, { 69, 997, 5}, { 87, 996, 0}, - { 104, 994, -5}, { 121, 992, -10}, { 139, 990, -15}, { 156, 987, -20}, { 173, 984, -25}, - { 190, 981, -30}, { 207, 978, -35}, { 224, 974, -40}, { 241, 970, -45}, { 258, 965, -50}, - { 275, 961, -55}, { 292, 956, -60}, { 309, 951, -65}, { 325, 945, -70}, { 342, 939, -75}, - { 358, 933, -80}, { 374, 927, -85}, { 390, 920, -90}, { 406, 913, -95}, { 422, 906, -100}, - { 438, 898, -105}, { 453, 891, -110}, { 469, 882, -115}, { 484, 874, -120}, { 499, 866, -125}, - { 515, 857, -130}, { 529, 848, -135}, { 544, 838, -140}, { 559, 829, -145}, { 573, 819, -150}, - { 587, 809, -155}, { 601, 798, -160}, { 615, 788, -165}, { 629, 777, -170}, { 642, 766, -175}, - { 656, 754, -180}, { 669, 743, -185}, { 681, 731, -190}, { 694, 719, -195}, { 707, 707, -200}, - { 719, 694, -205}, { 731, 681, -210}, { 743, 669, -215}, { 754, 656, -220}, { 766, 642, -225}, - { 777, 629, -230}, { 788, 615, -235}, { 798, 601, -240}, { 809, 587, -245}, { 819, 573, -250}, - { 829, 559, -255}, { 838, 544, -260}, { 848, 529, -265}, { 857, 515, -270}, { 866, 500, -275}, - { 874, 484, -280}, { 882, 469, -285}, { 891, 453, -290}, { 898, 438, -295}, { 906, 422, -300}, - { 913, 406, -305}, { 920, 390, -310}, { 927, 374, -315}, { 933, 358, -320}, { 939, 342, -325}, - { 945, 325, -330}, { 951, 309, -335}, { 956, 292, -340}, { 961, 275, -345}, { 965, 258, -350}, - { 970, 241, -355}, { 974, 224, -360}, { 978, 207, -365}, { 981, 190, -370}, { 984, 173, -375}, - { 987, 156, -380}, { 990, 139, -385}, { 992, 121, -390}, { 994, 104, -395}, { 996, 87, -400}, - { 997, 69, -405}, { 998, 52, -410}, { 999, 34, -415}, { 999, 17, -420}, { 1000, 0, -425}, - { 999, -17, -430}, { 999, -34, -435}, { 998, -52, -440}, { 997, -69, -445}, { 996, -87, -450}, - { 994, -104, -455}, { 992, -121, -460}, { 990, -139, -465}, { 987, -156, -470}, { 984, -173, -475}, - { 981, -190, -480}, { 978, -207, -485}, { 974, -224, -490}, { 970, -241, -495}, { 965, -258, -500}, - { 961, -275, -505}, { 956, -292, -510}, { 951, -309, -515}, { 945, -325, -520}, { 939, -342, -525}, - { 933, -358, -530}, { 927, -374, -535}, { 920, -390, -540}, { 913, -406, -545}, { 906, -422, -550}, - { 898, -438, -555}, { 891, -453, -560}, { 882, -469, -565}, { 874, -484, -570}, { 866, -499, -575}, - { 857, -515, -580}, { 848, -529, -585}, { 838, -544, -590}, { 829, -559, -595}, { 819, -573, -600}, - { 809, -587, -605}, { 798, -601, -610}, { 788, -615, -615}, { 777, -629, -620}, { 766, -642, -625}, - { 754, -656, -630}, { 743, -669, -635}, { 731, -681, -640}, { 719, -694, -645}, { 707, -707, -650}, - { 694, -719, -655}, { 681, -731, -660}, { 669, -743, -665}, { 656, -754, -670}, { 642, -766, -675}, - { 629, -777, -680}, { 615, -788, -685}, { 601, -798, -690}, { 587, -809, -695}, { 573, -819, -700}, - { 559, -829, -705}, { 544, -838, -710}, { 529, -848, -715}, { 515, -857, -720}, { 499, -866, -725}, - { 484, -874, -730}, { 469, -882, -735}, { 453, -891, -740}, { 438, -898, -745}, { 422, -906, -750}, - { 406, -913, -755}, { 390, -920, -760}, { 374, -927, -765}, { 358, -933, -770}, { 342, -939, -775}, - { 325, -945, -780}, { 309, -951, -785}, { 292, -956, -790}, { 275, -961, -795}, { 258, -965, -800}, - { 241, -970, -805}, { 224, -974, -810}, { 207, -978, -815}, { 190, -981, -820}, { 173, -984, -825}, - { 156, -987, -830}, { 139, -990, -835}, { 121, -992, -840}, { 104, -994, -845}, { 87, -996, -850}, - { 69, -997, -855}, { 52, -998, -860}, { 34, -999, -865}, { 17, -999, -870}, { 0, -1000, -875}, - { -17, -999, -880}, { -34, -999, -885}, { -52, -998, -890}, { -69, -997, -895}, { -87, -996, -900}, - { -104, -994, 895}, { -121, -992, 890}, { -139, -990, 885}, { -156, -987, 880}, { -173, -984, 875}, - { -190, -981, 870}, { -207, -978, 865}, { -224, -974, 860}, { -241, -970, 855}, { -258, -965, 850}, - { -275, -961, 845}, { -292, -956, 840}, { -309, -951, 835}, { -325, -945, 830}, { -342, -939, 825}, - { -358, -933, 820}, { -374, -927, 815}, { -390, -920, 810}, { -406, -913, 805}, { -422, -906, 800}, - { -438, -898, 795}, { -453, -891, 790}, { -469, -882, 785}, { -484, -874, 780}, { -500, -866, 775}, - { -515, -857, 770}, { -529, -848, 765}, { -544, -838, 760}, { -559, -829, 755}, { -573, -819, 750}, - { -587, -809, 745}, { -601, -798, 740}, { -615, -788, 735}, { -629, -777, 730}, { -642, -766, 725}, - { -656, -754, 720}, { -669, -743, 715}, { -681, -731, 710}, { -694, -719, 705}, { -707, -707, 700}, - { -719, -694, 695}, { -731, -681, 690}, { -743, -669, 685}, { -754, -656, 680}, { -766, -642, 675}, - { -777, -629, 670}, { -788, -615, 665}, { -798, -601, 660}, { -809, -587, 655}, { -819, -573, 650}, - { -829, -559, 645}, { -838, -544, 640}, { -848, -529, 635}, { -857, -515, 630}, { -866, -500, 625}, - { -874, -484, 620}, { -882, -469, 615}, { -891, -453, 610}, { -898, -438, 605}, { -906, -422, 600}, - { -913, -406, 595}, { -920, -390, 590}, { -927, -374, 585}, { -933, -358, 580}, { -939, -342, 575}, - { -945, -325, 570}, { -951, -309, 565}, { -956, -292, 560}, { -961, -275, 555}, { -965, -258, 550}, - { -970, -241, 545}, { -974, -224, 540}, { -978, -207, 535}, { -981, -190, 530}, { -984, -173, 525}, - { -987, -156, 520}, { -990, -139, 515}, { -992, -121, 510}, { -994, -104, 505}, { -996, -87, 500}, - { -997, -69, 495}, { -998, -52, 490}, { -999, -34, 485}, { -999, -17, 480}, { -1000, 0, 475}, - { -999, 17, 470}, { -999, 34, 465}, { -998, 52, 460}, { -997, 69, 455}, { -996, 87, 450}, - { -994, 104, 445}, { -992, 121, 440}, { -990, 139, 435}, { -987, 156, 430}, { -984, 173, 425}, - { -981, 190, 420}, { -978, 207, 415}, { -974, 224, 410}, { -970, 241, 405}, { -965, 258, 400}, - { -961, 275, 395}, { -956, 292, 390}, { -951, 309, 385}, { -945, 325, 380}, { -939, 342, 375}, - { -933, 358, 370}, { -927, 374, 365}, { -920, 390, 360}, { -913, 406, 355}, { -906, 422, 350}, - { -898, 438, 345}, { -891, 453, 340}, { -882, 469, 335}, { -874, 484, 330}, { -866, 500, 325}, - { -857, 515, 320}, { -848, 529, 315}, { -838, 544, 310}, { -829, 559, 305}, { -819, 573, 300}, - { -809, 587, 295}, { -798, 601, 290}, { -788, 615, 285}, { -777, 629, 280}, { -766, 642, 275}, - { -754, 656, 270}, { -743, 669, 265}, { -731, 681, 260}, { -719, 694, 255}, { -707, 707, 250}, - { -694, 719, 245}, { -681, 731, 240}, { -669, 743, 235}, { -656, 754, 230}, { -642, 766, 225}, - { -629, 777, 220}, { -615, 788, 215}, { -601, 798, 210}, { -587, 809, 205}, { -573, 819, 200}, - { -559, 829, 195}, { -544, 838, 190}, { -529, 848, 185}, { -515, 857, 180}, { -500, 866, 175}, - { -484, 874, 170}, { -469, 882, 165}, { -453, 891, 160}, { -438, 898, 155}, { -422, 906, 150}, - { -406, 913, 145}, { -390, 920, 140}, { -374, 927, 135}, { -358, 933, 130}, { -342, 939, 125}, - { -325, 945, 120}, { -309, 951, 115}, { -292, 956, 110}, { -275, 961, 105}, { -258, 965, 100}, - { -241, 970, 95}, { -224, 974, 90}, { -207, 978, 85}, { -190, 981, 80}, { -173, 984, 75}, - { -156, 987, 70}, { -139, 990, 65}, { -121, 992, 60}, { -104, 994, 55}, { -87, 996, 50}, - { -69, 997, 45}, { -52, 998, 40}, { -34, 999, 35}, { -17, 999, 30}, - }; - int i; - - for (i = 0; i < ARRAY_SIZE(rotation_table); i++) - { - int rotation; - int x, y; - x = rotation_table[i][0]; - y = rotation_table[i][1]; - rotation = wcmTilt2R(x, y, INTUOS4_CURSOR_ROTATION_OFFSET); - assert(rotation == rotation_table[i][2]); + if (handle == NULL) { + fprintf(stderr, "Failed to open %s: %s\n", TESTDRV, dlerror()); + return 1; } -} - -static void -test_mod_buttons(void) -{ - WacomCommonRec common = {0}; - int i; - for (i = 0; i < sizeof(int) * 8; i++) - { - int buttons = mod_buttons(&common, 0, i, 1); - assert(buttons == (1 << i)); - buttons = mod_buttons(&common, 0, i, 0); - assert(buttons == 0); + func = dlsym(handle, TESTFUNC); + if (func == NULL) { + fprintf(stderr, "Failed to load %s: %s\n", TESTFUNC, dlerror()); + return 1; } - assert(mod_buttons(&common, 0, sizeof(int) * 8, 1) == 0); -} - -static void test_set_type(void) -{ - InputInfoRec info = {0}; - WacomDeviceRec priv = {0}; - WacomTool tool = {0}; - WacomCommonRec common = {0}; - int rc; - -#define reset(_info, _priv, _tool, _common) \ - memset(&(_info), 0, sizeof(_info)); \ - memset(&(_priv), 0, sizeof(_priv)); \ - memset(&(_tool), 0, sizeof(_tool)); \ - (_priv).frontend = &(_info); \ - (_info).private = &(_priv); \ - (_priv).tool = &(_tool); \ - (_priv).common = &(_common); - - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_STYLUS); - assert(rc == 1); - assert(is_absolute(&priv)); - assert(IsStylus(&priv)); - assert(!IsTouch(&priv)); - assert(!IsEraser(&priv)); - assert(!IsCursor(&priv)); - assert(!IsPad(&priv)); - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_TOUCH); - assert(rc == 1); - /* only some touch screens are absolute */ - assert(!is_absolute(&priv)); - assert(!IsStylus(&priv)); - assert(IsTouch(&priv)); - assert(!IsEraser(&priv)); - assert(!IsCursor(&priv)); - assert(!IsPad(&priv)); - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_ERASER); - assert(rc == 1); - assert(is_absolute(&priv)); - assert(!IsStylus(&priv)); - assert(!IsTouch(&priv)); - assert(IsEraser(&priv)); - assert(!IsCursor(&priv)); - assert(!IsPad(&priv)); - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_CURSOR); - assert(rc == 1); - assert(!is_absolute(&priv)); - assert(!IsStylus(&priv)); - assert(!IsTouch(&priv)); - assert(!IsEraser(&priv)); - assert(IsCursor(&priv)); - assert(!IsPad(&priv)); - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_PAD); - assert(rc == 1); - assert(is_absolute(&priv)); - assert(!IsStylus(&priv)); - assert(!IsTouch(&priv)); - assert(!IsEraser(&priv)); - assert(!IsCursor(&priv)); - assert(IsPad(&priv)); - - reset(info, priv, tool, common); - rc = wcmSetFlags(&priv, WTYPE_INVALID); - assert(rc == 0); - -#undef reset -} - -static void test_flag_set(void) -{ - int i; - unsigned int flags = 0; - - for (i = 0; i < sizeof(flags); i++) - { - int mask = 1 << i; - flags = 0; - - assert(!MaskIsSet(flags, mask)); - MaskSet(flags, mask); - assert(flags != 0); - assert(MaskIsSet(flags, mask)); - MaskClear(flags, mask); - assert(!MaskIsSet(flags, mask)); - assert(flags == 0); - } -} + func(); -int main(int argc, char** argv) -{ - test_common_ref(); - test_rebase_pressure(); - test_normalize_pressure(); - test_suppress(); - test_initial_size(); - test_tilt_to_rotation(); - test_mod_buttons(); - test_set_type(); - test_flag_set(); - test_get_scroll_delta(); - test_get_wheel_button(); return 0; } |