diff options
| -rw-r--r-- | test/csync/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/csync/csync_tests/check_csync_misc.cpp | 55 | ||||
| -rw-r--r-- | test/testutility.cpp | 20 |
3 files changed, 20 insertions, 56 deletions
diff --git a/test/csync/CMakeLists.txt b/test/csync/CMakeLists.txt index 28d224377..621c8a154 100644 --- a/test/csync/CMakeLists.txt +++ b/test/csync/CMakeLists.txt @@ -25,7 +25,6 @@ add_cmocka_test(check_std_c_str std_tests/check_std_c_str.c ${TEST_TARGET_LIBRAR # csync tests add_cmocka_test(check_csync_exclude csync_tests/check_csync_exclude.cpp ${TEST_TARGET_LIBRARIES}) -add_cmocka_test(check_csync_util csync_tests/check_csync_util.cpp ${TEST_TARGET_LIBRARIES}) # vio add_cmocka_test(check_vio_ext vio_tests/check_vio_ext.cpp ${TEST_TARGET_LIBRARIES}) diff --git a/test/csync/csync_tests/check_csync_misc.cpp b/test/csync/csync_tests/check_csync_misc.cpp deleted file mode 100644 index 4d07d4335..000000000 --- a/test/csync/csync_tests/check_csync_misc.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * libcsync -- a library to sync a directory with another - * - * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org> - * - * 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 2.1 of the License, or (at your option) any later version. - * - * 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. - * - * 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 - */ -#include "common/utility.h" -#include <stdlib.h> -#include "torture.h" - -static void check_csync_normalize_etag(void **state) -{ - QByteArray str; - - (void) state; /* unused */ - -#define CHECK_NORMALIZE_ETAG(TEST, EXPECT) \ - str = OCC::Utility::normalizeEtag(TEST); \ - assert_string_equal(str.constData(), EXPECT); \ - - - CHECK_NORMALIZE_ETAG("foo", "foo"); - CHECK_NORMALIZE_ETAG("\"foo\"", "foo"); - CHECK_NORMALIZE_ETAG("\"nar123\"", "nar123"); - CHECK_NORMALIZE_ETAG("", ""); - CHECK_NORMALIZE_ETAG("\"\"", ""); - - /* Test with -gzip (all combinaison) */ - CHECK_NORMALIZE_ETAG("foo-gzip", "foo"); - CHECK_NORMALIZE_ETAG("\"foo\"-gzip", "foo"); - CHECK_NORMALIZE_ETAG("\"foo-gzip\"", "foo"); -} - -int torture_run_tests(void) -{ - const struct CMUnitTest tests[] = { - cmocka_unit_test(check_csync_normalize_etag), - }; - - return cmocka_run_group_tests(tests, NULL, NULL); -} - diff --git a/test/testutility.cpp b/test/testutility.cpp index 20fb0a458..2e6c07dbe 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -212,6 +212,26 @@ private slots: QFETCH(QString, output); QCOMPARE(sanitizeForFileName(input), output); } + + void testNormalizeEtag() + { + QByteArray str; + +#define CHECK_NORMALIZE_ETAG(TEST, EXPECT) \ + str = OCC::Utility::normalizeEtag(TEST); \ + QCOMPARE(str.constData(), EXPECT); \ + + CHECK_NORMALIZE_ETAG("foo", "foo"); + CHECK_NORMALIZE_ETAG("\"foo\"", "foo"); + CHECK_NORMALIZE_ETAG("\"nar123\"", "nar123"); + CHECK_NORMALIZE_ETAG("", ""); + CHECK_NORMALIZE_ETAG("\"\"", ""); + + /* Test with -gzip (all combinaison) */ + CHECK_NORMALIZE_ETAG("foo-gzip", "foo"); + CHECK_NORMALIZE_ETAG("\"foo\"-gzip", "foo"); + CHECK_NORMALIZE_ETAG("\"foo-gzip\"", "foo"); + } }; QTEST_GUILESS_MAIN(TestUtility) |