X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.h;h=5c449ab02f9e3c0341b4c1638f3f70f83c93fa3d;hb=25efe3485198149616820ab4e52d2f18f0abe5a7;hp=a79109f12f69ad298ae5ed7e4a1e6df9d48751a6;hpb=a67b1fe8d0b14a166ec0f6028a0ec40dc390e37e;p=m6w6%2Flibmemcached diff --git a/libtest/test.h b/libtest/test.h index a79109f1..5c449ab0 100644 --- a/libtest/test.h +++ b/libtest/test.h @@ -1,25 +1,39 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * This library 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 - * Lesser General Public License for more details. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - #pragma once #ifndef __INTEL_COMPILER @@ -78,16 +92,11 @@ do \ } \ } while (0) -#define test_true_got(__expected, __hint) \ -do \ -{ \ - if (not libtest::_compare_truth_hint(__FILE__, __LINE__, __func__, ((__expected)), #__expected, ((__hint)))) \ - { \ - libtest::create_core(); \ - return TEST_FAILURE; \ - } \ -} while (0) -#define test_true_hint test_true_got +#define test_true_got(A, B) test_true(A); +#define test_true_hint(A, B) test_true(A); + +#define test_compare_hint(A, B, C) test_compare(A, B); +#define test_compare_got(A, B, C) test_compare(A, B); #define test_skip(__expected, __actual) \ do \ @@ -138,39 +147,37 @@ do \ } \ } while (0) -#define test_compare(__expected, __actual) \ +#define test_ne_compare(__expected, __actual) \ do \ { \ - if (libtest::_compare(__FILE__, __LINE__, __func__, ((__expected)), ((__actual)), true) == false) \ + if (libtest::_ne_compare(__FILE__, __LINE__, __func__, ((__expected)), ((__actual)), true) == false) \ { \ libtest::create_core(); \ return TEST_FAILURE; \ } \ } while (0) -#define test_zero(__actual) \ +#define test_compare(__expected, __actual) \ do \ { \ - if (not libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual)))) \ + if (libtest::_compare(__FILE__, __LINE__, __func__, ((__expected)), ((__actual)), true) == false) \ { \ libtest::create_core(); \ return TEST_FAILURE; \ } \ } while (0) -#define test_null test_zero - -#define test_compare_got(__expected, __actual, __hint) \ +#define test_zero(__actual) \ do \ { \ - if (not libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint))) \ + if (not libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual)))) \ { \ libtest::create_core(); \ return TEST_FAILURE; \ } \ } while (0) -#define test_compare_hint test_compare_got +#define test_null test_zero #define test_compare_warn(__expected, __actual) \ do \ @@ -178,35 +185,16 @@ do \ void(libtest::_compare(__FILE__, __LINE__, __func__, (__expected), (__actual)), true); \ } while (0) -#define test_compare_warn_hint(__expected, __actual, __hint) \ -do \ -{ \ - libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint)); \ -} while (0) - -#define test_warn(__truth) \ +#define test_warn(__truth, __explain) \ do \ { \ - void(libtest::_truth(__FILE__, __LINE__, __func__, (__truth))); \ + void(libtest::_assert_truth(__FILE__, __LINE__, __func__, bool((__truth)), #__truth, __explain)); \ } while (0) -#define test_warn_hint(__truth, __hint) \ +#define test_strcmp(__expected, __actual) \ do \ { \ - void(libtest::_compare_truth_hint(__FILE__, __LINE__, __func__, (__truth), #__truth, (__hint))); \ -} while (0) - - -#define test_strcmp(A,B) \ -do \ -{ \ - if ((A) == NULL or (B) == NULL or strcmp((A), (B))) \ - { \ - if ((B) == NULL) fprintf(stderr, "\n%s:%d: Expected %s, got \n", __FILE__, __LINE__, (A)); \ - else fprintf(stderr, "\n%s:%d: Expected %s, got \"%s\"\n", __FILE__, __LINE__, (A), (B)); \ - libtest::create_core(); \ - return TEST_FAILURE; \ - } \ + void(libtest::_compare_strcmp(__FILE__, __LINE__, __func__, (__expected), (__actual))); \ } while (0) #define test_memcmp(A,B,C) \ @@ -220,17 +208,6 @@ do \ } \ } while (0) -#define test_memcmp_hint(A,B,C,__hint) \ -do \ -{ \ - if ((A) == NULL or (B) == NULL or memcmp((A), (B), (C))) \ - { \ - fprintf(stderr, "\n%s:%d: (hint:%s) %.*s -> %.*s\n", __FILE__, __LINE__, __hint, (int)(C), (char *)(A), (int)(C), (char *)(B)); \ - libtest::create_core(); \ - return TEST_FAILURE; \ - } \ -} while (0) - #define test_return_if(__test_return_t) \ do \ { \