[Pkg-owncloud-commits] [owncloud-client] 90/333: csync: Remove outdated tests
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 6906b8d30c846bf0e03f1252b71e169e50786efa
Author: Markus Goetz <markus at woboq.com>
Date: Fri Feb 28 16:43:15 2014 +0100
csync: Remove outdated tests
---
csync/tests/CMakeLists.txt | 2 -
csync/tests/csync_tests/check_csync_create.c | 3 -
csync/tests/csync_tests/check_csync_time.c | 69 -----
csync/tests/vio_tests/check_vio.c | 359 +--------------------------
csync/tests/vio_tests/check_vio_handle.c | 74 ------
5 files changed, 3 insertions(+), 504 deletions(-)
diff --git a/csync/tests/CMakeLists.txt b/csync/tests/CMakeLists.txt
index 1c364c3..a43bb27 100644
--- a/csync/tests/CMakeLists.txt
+++ b/csync/tests/CMakeLists.txt
@@ -38,7 +38,6 @@ add_cmocka_test(check_csync_create csync_tests/check_csync_create.c ${TEST_TARGE
add_cmocka_test(check_csync_log csync_tests/check_csync_log.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_csync_exclude csync_tests/check_csync_exclude.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_csync_statedb_load csync_tests/check_csync_statedb_load.c ${TEST_TARGET_LIBRARIES})
-add_cmocka_test(check_csync_time csync_tests/check_csync_time.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_csync_util csync_tests/check_csync_util.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_csync_misc csync_tests/check_csync_misc.c ${TEST_TARGET_LIBRARIES})
@@ -51,7 +50,6 @@ add_cmocka_test(check_csync_commit csync_tests/check_csync_commit.c ${TEST_TARGE
add_cmocka_test(check_csync_treewalk csync_tests/check_csync_treewalk.c ${TEST_TARGET_LIBRARIES})
# vio
-add_cmocka_test(check_vio_handle vio_tests/check_vio_handle.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_vio_file_stat vio_tests/check_vio_file_stat.c ${TEST_TARGET_LIBRARIES})
add_cmocka_test(check_vio vio_tests/check_vio.c ${TEST_TARGET_LIBRARIES})
diff --git a/csync/tests/csync_tests/check_csync_create.c b/csync/tests/csync_tests/check_csync_create.c
index 869fdb0..37c82a8 100644
--- a/csync/tests/csync_tests/check_csync_create.c
+++ b/csync/tests/csync_tests/check_csync_create.c
@@ -46,9 +46,6 @@ static void check_csync_create(void **state)
rc = csync_create(&csync, "/tmp/csync1", "/tmp/csync2");
assert_int_equal(rc, 0);
- assert_int_equal(csync->options.max_depth, MAX_DEPTH);
- assert_int_equal(csync->options.max_time_difference, MAX_TIME_DIFFERENCE);
-
snprintf(confdir, sizeof(confdir), "%s/%s", getenv("HOME"), CSYNC_CONF_DIR);
assert_string_equal(csync->options.config_dir, confdir);
diff --git a/csync/tests/csync_tests/check_csync_time.c b/csync/tests/csync_tests/check_csync_time.c
deleted file mode 100644
index 31394ff..0000000
--- a/csync/tests/csync_tests/check_csync_time.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * libcsync -- a library to sync a directory with another
- *
- * Copyright (c) 2008-2013 by Andreas Schneider <asn at 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 "torture.h"
-
-#include "csync_time.h"
-
-static void setup(void **state) {
- CSYNC *csync;
- int rc;
-
- rc = system("mkdir -p /tmp/check_csync1");
- assert_int_equal(rc, 0);
- rc = system("mkdir -p /tmp/check_csync2");
- assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
-
- *state = csync;
-}
-
-static void teardown(void **state) {
- CSYNC *csync = *state;
- int rc;
-
- rc = csync_destroy(csync);
- assert_int_equal(rc, 0);
-
- rc = system("rm -rf /tmp/check_csync1");
- assert_int_equal(rc, 0);
- rc = system("rm -rf /tmp/check_csync2");
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_time(void **state)
-{
- CSYNC *csync = *state;
- /*
- * The creation should took less than 1 second, so the return
- * value should be 0.
- */
- assert_int_equal(csync_timediff(csync), 0);
-}
-
-int torture_run_tests(void)
-{
- const UnitTest tests[] = {
- unit_test_setup_teardown(check_csync_time, setup, teardown),
- };
-
- return run_tests(tests);
-}
-
diff --git a/csync/tests/vio_tests/check_vio.c b/csync/tests/vio_tests/check_vio.c
index b790da7..9824a1d 100644
--- a/csync/tests/vio_tests/check_vio.c
+++ b/csync/tests/vio_tests/check_vio.c
@@ -103,84 +103,10 @@ static void teardown(void **state) {
* Test directory function
*/
-static void check_csync_vio_mkdir(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- int rc;
- mbchar_t *dir = c_utf8_to_locale(CSYNC_TEST_DIR);
-
- rc = csync_vio_mkdir(csync, CSYNC_TEST_DIR, MKDIR_MASK);
- assert_int_equal(rc, 0);
-
- rc = _tstat(dir, &sb);
- assert_int_equal(rc, 0);
-
- _trmdir(dir);
- c_free_locale_string(dir);
-}
-
-static void check_csync_vio_mkdirs(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- int rc;
- mbchar_t *dir = c_utf8_to_locale(CSYNC_TEST_DIR);
-
- rc = csync_vio_mkdirs(csync, CSYNC_TEST_DIRS, MKDIR_MASK);
- assert_int_equal(rc, 0);
-
- rc = _tstat(dir, &sb);
- assert_int_equal(rc, 0);
-
- _trmdir(dir);
- c_free_locale_string(dir);
-}
-
-static void check_csync_vio_mkdirs_some_exist(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- mbchar_t *this_dir = c_utf8_to_locale("/tmp/csync_test/this");
- mbchar_t *stat_dir = c_utf8_to_locale(CSYNC_TEST_DIRS);
- int rc;
-
- rc = _tmkdir(this_dir, MKDIR_MASK);
- assert_int_equal(rc, 0);
- rc = csync_vio_mkdirs(csync, CSYNC_TEST_DIRS, MKDIR_MASK);
- assert_int_equal(rc, 0);
-
- rc = _tstat(stat_dir, &sb);
- assert_int_equal(rc, 0);
-
- _trmdir(stat_dir);
- c_free_locale_string(this_dir);
- c_free_locale_string(stat_dir);
-}
-
-static void check_csync_vio_rmdir(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- int rc;
-
- rc = csync_vio_mkdir(csync, CSYNC_TEST_DIR, MKDIR_MASK);
- assert_int_equal(rc, 0);
-
- rc = lstat(CSYNC_TEST_DIR, &sb);
- assert_int_equal(rc, 0);
-
- rc = csync_vio_rmdir(csync, CSYNC_TEST_DIR);
- assert_int_equal(rc, 0);
-
- rc = lstat(CSYNC_TEST_DIR, &sb);
- assert_int_equal(rc, -1);
-}
-
static void check_csync_vio_opendir(void **state)
{
CSYNC *csync = *state;
- csync_vio_method_handle_t *dh;
+ csync_vio_handle_t *dh;
int rc;
dh = csync_vio_opendir(csync, CSYNC_TEST_DIR);
@@ -193,7 +119,7 @@ static void check_csync_vio_opendir(void **state)
static void check_csync_vio_opendir_perm(void **state)
{
CSYNC *csync = *state;
- csync_vio_method_handle_t *dh;
+ csync_vio_handle_t *dh;
int rc;
mbchar_t *dir = c_utf8_to_locale(CSYNC_TEST_DIR);
@@ -222,7 +148,7 @@ static void check_csync_vio_closedir_null(void **state)
static void check_csync_vio_readdir(void **state)
{
CSYNC *csync = *state;
- csync_vio_method_handle_t *dh;
+ csync_vio_handle_t *dh;
csync_vio_file_stat_t *dirent;
int rc;
@@ -237,153 +163,6 @@ static void check_csync_vio_readdir(void **state)
assert_int_equal(rc, 0);
}
-/*
- * Test file functions (open, read, write, close ...)
- */
-
-static void check_csync_vio_close_null(void **state)
-{
- CSYNC *csync = *state;
- int rc;
-
- rc = csync_vio_close(csync, NULL);
- assert_int_equal(rc, -1);
-}
-
-static void check_csync_vio_creat_close(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh;
- int rc;
-
- fh = csync_vio_creat(csync, CSYNC_TEST_FILE, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_vio_open_close(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh;
- int rc;
-
- fh = csync_vio_open(csync, CSYNC_TEST_FILE, O_RDONLY, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_vio_read_null(void **state)
-{
- CSYNC *csync = *state;
- char test[16] = {0};
- int rc;
-
- rc = csync_vio_read(csync, NULL, test, 10);
- assert_int_equal(rc, -1);
-}
-
-static void check_csync_vio_read(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh;
- char test[16] = {0};
- int rc;
-
- fh = csync_vio_open(csync, CSYNC_TEST_FILE, O_RDONLY, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_read(csync, fh, test, 14);
- assert_int_equal(rc, 14);
-
- assert_string_equal(test, "This is a test");
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_vio_read_0(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh = NULL;
- char test[16] = {0};
- int rc;
-
- fh = csync_vio_open(csync, CSYNC_TEST_FILE, O_RDONLY, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_read(csync, fh, test, 0);
- assert_int_equal(rc, 0);
-
- assert_true(test[0] == '\0');
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_vio_write_null(void **state)
-{
- CSYNC *csync = *state;
- char test[16] = {0};
- int rc;
-
- rc = csync_vio_write(csync, NULL, test, 10);
- assert_int_equal(rc, -1);
-}
-
-static void check_csync_vio_write(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh;
- char str[] = "This is a test";
- char test[16] = {0};
- int rc;
-
- fh = csync_vio_creat(csync, CSYNC_TEST_FILE, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_write(csync, fh, str, sizeof(str));
- assert_int_equal(rc, sizeof(str));
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-
- fh = csync_vio_open(csync, CSYNC_TEST_FILE, O_RDONLY, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_read(csync, fh, test, 14);
- assert_int_equal(rc, 14);
-
- assert_string_equal(test, "This is a test");
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
-
-static void check_csync_vio_lseek(void **state)
-{
- CSYNC *csync = *state;
- csync_vio_method_handle_t *fh;
- char test[16] = {0};
- int rc;
-
- fh = csync_vio_open(csync, CSYNC_TEST_FILE, O_RDONLY, 0644);
- assert_non_null(fh);
-
- rc = csync_vio_lseek(csync, fh, 10, SEEK_SET);
- assert_int_equal(rc, 10);
-
- rc = csync_vio_read(csync, fh, test, 4);
- assert_int_equal(rc, 4);
-
- assert_string_equal(test, "test");
-
- rc = csync_vio_close(csync, fh);
- assert_int_equal(rc, 0);
-}
/*
* Test for general functions (stat, chmod, chown, ...)
@@ -425,148 +204,16 @@ static void check_csync_vio_stat_file(void **state)
csync_vio_file_stat_destroy(fs);
}
-static void check_csync_vio_rename_dir(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- int rc;
-
- mbchar_t *dir = c_utf8_to_locale("test");
- mbchar_t *dir2 = c_utf8_to_locale("test2");
-
- assert_non_null(dir);
- assert_non_null(dir2);
-
- rc = _tmkdir(dir, MKDIR_MASK);
- assert_int_equal(rc, 0);
-
- rc = csync_vio_rename(csync, "test", "test2");
- assert_int_equal(rc, 0);
-
-
- rc = _tstat(dir2, &sb);
- assert_int_equal(rc, 0);
-
- c_free_locale_string(dir);
- c_free_locale_string(dir2);
-}
-
-static void check_csync_vio_rename_file(void **state)
-{
- CSYNC *csync = *state;
- mbchar_t *file = c_utf8_to_locale(CSYNC_TEST_DIR "file2.txt");
- csync_stat_t sb;
- int rc;
-
- rc = csync_vio_rename(csync, CSYNC_TEST_FILE, CSYNC_TEST_DIR "file2.txt");
- assert_int_equal(rc, 0);
-
- rc = _tstat(file, &sb);
- assert_int_equal(rc, 0);
-
- c_free_locale_string(file);
-}
-
-static void check_csync_vio_unlink(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- mbchar_t *file = c_utf8_to_locale(CSYNC_TEST_FILE);
- int rc;
-
- rc = csync_vio_unlink(csync, CSYNC_TEST_FILE);
- assert_int_equal(rc, 0);
-
- rc = _tstat(file, &sb);
- assert_int_equal(rc, -1);
-
- c_free_locale_string(file);
-}
-
-static void check_csync_vio_chmod(void **state)
-{
- CSYNC *csync = *state;
- int rc;
-
- rc = csync_vio_chmod(csync, CSYNC_TEST_FILE, 0777);
- assert_int_equal(rc, 0);
-}
-
-#ifndef _WIN32
-static void check_csync_vio_chown(void **state)
-{
- CSYNC *csync = *state;
- int rc;
-
- rc = csync_vio_chown(csync, CSYNC_TEST_FILE, getuid(), getgid());
- assert_int_equal(rc, 0);
-}
-#endif
-
-static void check_csync_vio_utimes(void **state)
-{
- CSYNC *csync = *state;
- csync_stat_t sb;
- struct timeval times[2];
- long modtime = 0;
- mbchar_t *file = c_utf8_to_locale(CSYNC_TEST_FILE);
- int rc;
-
- rc = _tstat(file, &sb);
- assert_int_equal(rc, 0);
- modtime = sb.st_mtime + 10;
-
- times[0].tv_sec = modtime;
- times[0].tv_usec = 0;
-
- times[1].tv_sec = modtime;
- times[1].tv_usec = 0;
-
- rc = csync_vio_utimes(csync, CSYNC_TEST_FILE, times);
- assert_int_equal(rc, 0);
-
- rc = _tstat(file, &sb);
- assert_int_equal(rc, 0);
-
- assert_int_equal(modtime, sb.st_mtime);
-
- c_free_locale_string(file);
-}
-
int torture_run_tests(void)
{
const UnitTest tests[] = {
-
- unit_test_setup_teardown(check_csync_vio_mkdir, setup, teardown),
- unit_test_setup_teardown(check_csync_vio_mkdirs, setup, teardown),
- unit_test_setup_teardown(check_csync_vio_mkdirs_some_exist, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_rmdir, setup, teardown),
unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown),
unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown),
unit_test(check_csync_vio_closedir_null),
unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_close_null, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_creat_close, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_open_close, setup_file, teardown),
- unit_test(check_csync_vio_read_null),
- unit_test_setup_teardown(check_csync_vio_read, setup_file, teardown),
- unit_test_setup_teardown(check_csync_vio_read_0, setup_file, teardown),
- unit_test(check_csync_vio_write_null),
- unit_test_setup_teardown(check_csync_vio_write, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_lseek, setup_file, teardown),
-
unit_test_setup_teardown(check_csync_vio_stat_dir, setup_dir, teardown),
unit_test_setup_teardown(check_csync_vio_stat_file, setup_file, teardown),
-
- unit_test_setup_teardown(check_csync_vio_rename_dir, setup_dir, teardown),
- unit_test_setup_teardown(check_csync_vio_rename_file, setup_file, teardown),
- unit_test_setup_teardown(check_csync_vio_unlink, setup_file, teardown),
- unit_test_setup_teardown(check_csync_vio_chmod, setup_file, teardown),
-#ifndef _WIN32
- unit_test_setup_teardown(check_csync_vio_chown, setup_file, teardown),
-#endif
- unit_test_setup_teardown(check_csync_vio_utimes, setup_file, teardown),
};
return run_tests(tests);
diff --git a/csync/tests/vio_tests/check_vio_handle.c b/csync/tests/vio_tests/check_vio_handle.c
deleted file mode 100644
index dfe394f..0000000
--- a/csync/tests/vio_tests/check_vio_handle.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * libcsync -- a library to sync a directory with another
- *
- * Copyright (c) 2008-2013 by Andreas Schneider <asn at 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 <stdlib.h>
-
-#include "torture.h"
-
-#include "vio/csync_vio_handle.h"
-#include "vio/csync_vio_handle_private.h"
-
-static void check_csync_vio_handle_new(void **state)
-{
- int *number;
- csync_vio_handle_t *handle;
-
- (void) state; /* unused */
-
- number = malloc(sizeof(int));
- *number = 42;
-
- handle = csync_vio_handle_new("/tmp", (csync_vio_method_handle_t *) number);
- assert_non_null(handle);
- assert_string_equal(handle->uri, "/tmp");
-
- free(handle->method_handle);
-
- csync_vio_handle_destroy(handle);
-}
-
-static void check_csync_vio_handle_new_null(void **state)
-{
- int *number;
- csync_vio_handle_t *handle;
-
- (void) state; /* unused */
-
- number = malloc(sizeof(int));
- *number = 42;
-
- handle = csync_vio_handle_new(NULL, (csync_vio_method_handle_t *) number);
- assert_null(handle);
-
- handle = csync_vio_handle_new((char *) "/tmp", NULL);
- assert_null(handle);
-
- free(number);
-}
-
-int torture_run_tests(void)
-{
- const UnitTest tests[] = {
- unit_test(check_csync_vio_handle_new),
- unit_test(check_csync_vio_handle_new_null),
- };
-
- return run_tests(tests);
-}
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list