Menu
▾
▴
[Opensync-commits] r5621 - trunk/tests/sync-tests
|
From: <svn...@op...> - 2009-04-19 13:13:16
|
Author: friedrich.beckmann Date: Sun Apr 19 15:13:10 2009 New Revision: 5621 URL: http://www.opensync.org/changeset/5621 Log: Test result check was not working on windows platform Modified: trunk/tests/sync-tests/check_sync.c Modified: trunk/tests/sync-tests/check_sync.c ============================================================================== --- trunk/tests/sync-tests/check_sync.c Sun Apr 19 15:12:20 2009 (r5620) +++ trunk/tests/sync-tests/check_sync.c Sun Apr 19 15:13:10 2009 (r5621) @@ -139,7 +139,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -207,7 +207,7 @@ fail_unless(osync_engine_synchronize_and_block(engine, &error), NULL); fail_unless(error == NULL, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -275,7 +275,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -381,9 +381,9 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1/testdata comp_data)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data2/testdata comp_data)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); + fail_unless(osync_testing_diff("data1/testdata", "comp_data")); + fail_unless(osync_testing_diff("data2/testdata", "comp_data")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -487,7 +487,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -555,7 +555,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -655,7 +655,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 2); @@ -681,7 +681,7 @@ check_hash(table, "testdata-dupe"); osync_hashtable_unref(table); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); osync_testing_system_abort("rm -f data1/testdata-dupe"); reset_counters(); @@ -728,8 +728,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); - + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -842,7 +841,7 @@ fail_unless(num_mapping_conflicts == 0, NULL); /* Still conflicts! */ - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" != \"x\""), NULL); + fail_unless(!osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -871,7 +870,7 @@ osync_hashtable_unref(table); */ - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" != \"x\""), NULL); + fail_unless(!osync_testing_diff("data1", "data2")); // osync_testing_system_abort("rm -f data1/testdata-dupe"); fail_unless(!synchronize_once(engine, &error), NULL); @@ -919,8 +918,7 @@ fail_unless(num_mapping_conflicts == 0, NULL); /* Still different */ - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" != \"x\""), NULL); - + fail_unless(!osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -973,7 +971,7 @@ synchronize_once(engine, NULL); osync_testing_system_abort("diff -x \".*\" data1 data2"); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); OSyncMappingTable *maptable = mappingtable_load(group, 3, 0); check_mapping(maptable, 1, -1, 2, "testdata"); @@ -997,11 +995,12 @@ osync_hashtable_close(table); fail_unless(!system("rm -f data1/testdata-dupe data2/testdata-dupe-dupe"), NULL); + synchronize_once(engine, NULL); osengine_finalize(engine); osengine_free(engine); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); fail_unless(num_conflicts == 0, NULL); maptable = mappingtable_load(group, 1, 0); @@ -1101,7 +1100,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 2); @@ -1178,8 +1177,8 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1/testdata comp_data)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); + fail_unless(osync_testing_diff("data1/testdata", "comp_data")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -1288,7 +1287,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 3, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 3); @@ -1366,7 +1365,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -1430,7 +1429,7 @@ fail_unless(osync_engine_synchronize_and_block(engine, &error), NULL); fail_unless(error == NULL, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); reset_counters(); osync_testing_system_abort("rm data1/testdata"); @@ -1478,7 +1477,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -1542,7 +1541,8 @@ fail_unless(osync_engine_synchronize_and_block(engine, &error), NULL); fail_unless(error == NULL, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); + fail_unless(num_mapping_conflicts == 0, NULL); reset_counters(); @@ -1587,7 +1587,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -1655,7 +1655,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -1719,7 +1719,8 @@ fail_unless(osync_engine_synchronize_and_block(engine, &error), NULL); fail_unless(error == NULL, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); + fail_unless(num_mapping_conflicts == 0, NULL); reset_counters(); @@ -1769,7 +1770,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 1, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -1787,8 +1788,8 @@ g_free(path); osync_hashtable_unref(table); - fail_unless(!system("test \"x$(ls data1)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(ls data2)\" = \"x\""), NULL); + fail_unless(osync_testing_directory_is_empty("data1")); + fail_unless(osync_testing_directory_is_empty("data2")); g_free(formatdir); g_free(plugindir); @@ -1871,7 +1872,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 2); @@ -1947,7 +1948,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -1965,8 +1966,8 @@ g_free(path); osync_hashtable_unref(table); - fail_unless(!system("test \"x$(ls data1)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(ls data2)\" = \"x\""), NULL); + fail_unless(osync_testing_directory_is_empty("data1")); + fail_unless(osync_testing_directory_is_empty("data2")); g_free(formatdir); g_free(plugindir); @@ -2062,7 +2063,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 2, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 10); @@ -2195,7 +2196,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 4, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 10); @@ -2314,9 +2315,8 @@ fail_unless(num_mapping_solved == 10, NULL); fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 0); @@ -2334,8 +2334,8 @@ g_free(path); osync_hashtable_unref(table); - fail_unless(!system("test \"x$(ls data1)\" = \"x\""), NULL); - fail_unless(!system("test \"x$(ls data2)\" = \"x\""), NULL); + fail_unless(osync_testing_directory_is_empty("data1")); + fail_unless(osync_testing_directory_is_empty("data2")); g_free(formatdir); g_free(plugindir); @@ -2534,7 +2534,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" file-1 file-2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("file-1", "file-2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -2764,7 +2764,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" file-1 file-2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("file-1", "file-2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -2875,7 +2875,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -2973,7 +2973,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data3 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data3", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -3087,7 +3087,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -3184,7 +3184,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); path = g_strdup_printf("%s/configs/group/archive.db", testbed); maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -3337,7 +3337,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); @@ -3449,7 +3449,7 @@ fail_unless(num_mapping_errors == 0, NULL); fail_unless(num_mapping_conflicts == 0, NULL); - fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); + fail_unless(osync_testing_diff("data1", "data2")); char *path = g_strdup_printf("%s/configs/group/archive.db", testbed); OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1); |
