Navigation

← Previous Changeset
Next Changeset →

Changeset 3459

Timestamp:

07/17/08 12:47:30 (2 months ago)

Author:

bricks

Message:

Modified tests to use osync_testing_diff and OSyncXMLFormatSchema in osnyc engine

Files:

trunk/tests/engine-tests/check_engine.c (modified) (9 diffs)
trunk/tests/engine-tests/check_engine_error.c (modified) (64 diffs)
trunk/tests/group-tests/check_lock.c (modified) (7 diffs)
trunk/tests/sync-tests/check_filter.c (modified) (5 diffs)
trunk/tests/sync-tests/check_sync.c (modified) (20 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/tests/engine-tests/check_engine.c

r3409	r3459
99	99	fail_unless(engine != NULL, NULL);
100	100	fail_unless(error == NULL, NULL);
	101
	102	osync_engine_set_schemadir(engine, testbed);
101	103	osync_engine_set_plugindir(engine, testbed);
102	104	osync_engine_set_formatdir(engine, testbed);
…	…
319	321
320	322	OSyncEngine *engine = osync_engine_new(debug->group, &error);
	323	osync_engine_set_schemadir(engine, testbed);
	324
321	325	fail_unless(engine != NULL, NULL);
322	326	fail_unless(error == NULL, NULL);
…	…
627	631	fail_unless(error == NULL, NULL);
628	632	osync_engine_set_formatdir(engine, testbed);
	633	osync_engine_set_schemadir(engine, testbed);
629	634
630	635	_engine_instrument_pluginenv(engine, debug);
…	…
1019	1024	fail_unless(error == NULL, NULL);
1020	1025	osync_engine_set_formatdir(engine, testbed);
	1026	osync_engine_set_schemadir(engine, testbed);
1021	1027
1022	1028	_engine_instrument_pluginenv(engine, debug);
…	…
1243	1249	fail_unless(error == NULL, NULL);
1244	1250	osync_engine_set_formatdir(engine, testbed);
	1251	osync_engine_set_schemadir(engine, testbed);
1245	1252
1246	1253	_engine_instrument_pluginenv(engine, debug);
…	…
1283	1290	fail_unless(error == NULL, NULL);
1284	1291	osync_engine_set_formatdir(engine, testbed);
	1292	osync_engine_set_schemadir(engine, testbed);
1285	1293
1286	1294	_engine_instrument_pluginenv(engine, debug);
…	…
1512	1520	fail_unless(error == NULL, NULL);
1513	1521	osync_engine_set_formatdir(engine, testbed);
	1522	osync_engine_set_schemadir(engine, testbed);
1514	1523
1515	1524	_engine_instrument_pluginenv(engine, debug);
…	…
1708	1717	fail_unless(error == NULL, NULL);
1709	1718	osync_engine_set_formatdir(engine, testbed);
	1719	osync_engine_set_schemadir(engine, testbed);
1710	1720
1711	1721	_engine_instrument_pluginenv(engine, debug);
…	…
1905	1915	fail_unless(error == NULL, NULL);
1906	1916	osync_engine_set_formatdir(engine, testbed);
	1917	osync_engine_set_schemadir(engine, testbed);
1907	1918
1908	1919	_engine_instrument_pluginenv(engine, debug);

trunk/tests/engine-tests/check_engine_error.c

r3409	r3459
606	606	fail_unless(engine != NULL, NULL);
607	607	fail_unless(error == NULL, NULL);
	608
	609	osync_engine_set_schemadir(engine, testbed);
608	610	osync_engine_set_plugindir(engine, testbed);
609	611	osync_engine_set_formatdir(engine, testbed);
…	…
637	639	fail_unless(engine != NULL, NULL);
638	640	fail_unless(error == NULL, NULL);
	641
	642	osync_engine_set_schemadir(engine, testbed);
639	643	osync_engine_set_plugindir(engine, testbed);
640	644	osync_engine_set_formatdir(engine, testbed);
…	…
668	672	fail_unless(engine != NULL, NULL);
669	673	fail_unless(error == NULL, NULL);
	674
	675	osync_engine_set_schemadir(engine, testbed);
670	676	osync_engine_set_plugindir(engine, testbed);
671	677	osync_engine_set_formatdir(engine, testbed);
…	…
699	705	fail_unless(engine != NULL, NULL);
700	706	fail_unless(error == NULL, NULL);
	707
	708	osync_engine_set_schemadir(engine, testbed);
701	709	osync_engine_set_plugindir(engine, testbed);
702	710	osync_engine_set_formatdir(engine, testbed);
…	…
730	738	fail_unless(engine != NULL, NULL);
731	739	fail_unless(error == NULL, NULL);
	740
	741	osync_engine_set_schemadir(engine, testbed);
732	742	osync_engine_set_plugindir(engine, testbed);
733	743	osync_engine_set_formatdir(engine, testbed);
…	…
818	828	fail_unless(engine != NULL, NULL);
819	829	fail_unless(error == NULL, NULL);
	830
	831	osync_engine_set_schemadir(engine, testbed);
820	832	osync_engine_set_plugindir(engine, testbed);
821	833	osync_engine_set_formatdir(engine, testbed);
…	…
864	876	fail_unless(engine != NULL, NULL);
865	877	fail_unless(error == NULL, NULL);
	878
	879	osync_engine_set_schemadir(engine, testbed);
866	880	osync_engine_set_plugindir(engine, testbed);
867	881	osync_engine_set_formatdir(engine, testbed);
…	…
911	925	fail_unless(engine != NULL, NULL);
912	926	fail_unless(error == NULL, NULL);
	927
	928	osync_engine_set_schemadir(engine, testbed);
913	929	osync_engine_set_plugindir(engine, testbed);
914	930	osync_engine_set_formatdir(engine, testbed);
…	…
958	974	fail_unless(engine != NULL, NULL);
959	975	fail_unless(error == NULL, NULL);
	976
	977	osync_engine_set_schemadir(engine, testbed);
960	978	osync_engine_set_plugindir(engine, testbed);
961	979	osync_engine_set_formatdir(engine, testbed);
…	…
1003	1021	fail_unless(engine != NULL, NULL);
1004	1022	fail_unless(error == NULL, NULL);
	1023
	1024	osync_engine_set_schemadir(engine, testbed);
1005	1025	osync_engine_set_plugindir(engine, testbed);
1006	1026	osync_engine_set_formatdir(engine, testbed);
…	…
1049	1069	fail_unless(engine != NULL, NULL);
1050	1070	fail_unless(error == NULL, NULL);
	1071
	1072	osync_engine_set_schemadir(engine, testbed);
1051	1073	osync_engine_set_plugindir(engine, testbed);
1052	1074	osync_engine_set_formatdir(engine, testbed);
…	…
1075	1097	fail_unless(num_engine_successful == 1, NULL);
1076	1098
1077		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
1078		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	1099	fail_unless(!osync_testing_diff("data1", "data2"));
	1100	fail_unless(!osync_testing_diff("data1", "data3"));
1079	1101
1080	1102	destroy_testbed(testbed);
…	…
1098	1120	fail_unless(engine != NULL, NULL);
1099	1121	fail_unless(error == NULL, NULL);
	1122
	1123	osync_engine_set_schemadir(engine, testbed);
1100	1124	osync_engine_set_plugindir(engine, testbed);
1101	1125	osync_engine_set_formatdir(engine, testbed);
…	…
1148	1172	fail_unless(engine != NULL, NULL);
1149	1173	fail_unless(error == NULL, NULL);
	1174
	1175	osync_engine_set_schemadir(engine, testbed);
1150	1176	osync_engine_set_plugindir(engine, testbed);
1151	1177	osync_engine_set_formatdir(engine, testbed);
…	…
1197	1223	fail_unless(engine != NULL, NULL);
1198	1224	fail_unless(error == NULL, NULL);
	1225
	1226	osync_engine_set_schemadir(engine, testbed);
1199	1227	osync_engine_set_plugindir(engine, testbed);
1200	1228	osync_engine_set_formatdir(engine, testbed);
…	…
1247	1275	fail_unless(engine != NULL, NULL);
1248	1276	fail_unless(error == NULL, NULL);
	1277
	1278	osync_engine_set_schemadir(engine, testbed);
1249	1279	osync_engine_set_plugindir(engine, testbed);
1250	1280	osync_engine_set_formatdir(engine, testbed);
…	…
1297	1327	fail_unless(engine != NULL, NULL);
1298	1328	fail_unless(error == NULL, NULL);
	1329
	1330	osync_engine_set_schemadir(engine, testbed);
1299	1331	osync_engine_set_plugindir(engine, testbed);
1300	1332	osync_engine_set_formatdir(engine, testbed);
…	…
1348	1380	fail_unless(engine != NULL, NULL);
1349	1381	fail_unless(error == NULL, NULL);
	1382
	1383	osync_engine_set_schemadir(engine, testbed);
1350	1384	osync_engine_set_plugindir(engine, testbed);
1351	1385	osync_engine_set_formatdir(engine, testbed);
…	…
1401	1435	fail_unless(engine != NULL, NULL);
1402	1436	fail_unless(error == NULL, NULL);
	1437
	1438	osync_engine_set_schemadir(engine, testbed);
1403	1439	osync_engine_set_plugindir(engine, testbed);
1404	1440	osync_engine_set_formatdir(engine, testbed);
…	…
1452	1488	fail_unless(engine != NULL, NULL);
1453	1489	fail_unless(error == NULL, NULL);
	1490
	1491	osync_engine_set_schemadir(engine, testbed);
1454	1492	osync_engine_set_plugindir(engine, testbed);
1455	1493	osync_engine_set_formatdir(engine, testbed);
…	…
1503	1541	fail_unless(engine != NULL, NULL);
1504	1542	fail_unless(error == NULL, NULL);
	1543
	1544	osync_engine_set_schemadir(engine, testbed);
1505	1545	osync_engine_set_plugindir(engine, testbed);
1506	1546	osync_engine_set_formatdir(engine, testbed);
…	…
1558	1598	fail_unless(engine != NULL, NULL);
1559	1599	fail_unless(error == NULL, NULL);
	1600
	1601	osync_engine_set_schemadir(engine, testbed);
1560	1602	osync_engine_set_plugindir(engine, testbed);
1561	1603	osync_engine_set_formatdir(engine, testbed);
…	…
1614	1656	fail_unless(engine != NULL, NULL);
1615	1657	fail_unless(error == NULL, NULL);
	1658
	1659	osync_engine_set_schemadir(engine, testbed);
1616	1660	osync_engine_set_plugindir(engine, testbed);
1617	1661	osync_engine_set_formatdir(engine, testbed);
…	…
1671	1715	fail_unless(engine != NULL, NULL);
1672	1716	fail_unless(error == NULL, NULL);
	1717
	1718	osync_engine_set_schemadir(engine, testbed);
1673	1719	osync_engine_set_plugindir(engine, testbed);
1674	1720	osync_engine_set_formatdir(engine, testbed);
…	…
1707	1753	fail_unless(num_engine_successful == 0, NULL);
1708	1754
1709		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
	1755	fail_unless(!osync_testing_diff("data1", "data2"));
1710	1756	fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
1711	1757
…	…
1729	1775	fail_unless(engine != NULL, NULL);
1730	1776	fail_unless(error == NULL, NULL);
	1777
	1778	osync_engine_set_schemadir(engine, testbed);
1731	1779	osync_engine_set_plugindir(engine, testbed);
1732	1780	osync_engine_set_formatdir(engine, testbed);
…	…
1783	1831	fail_unless(engine != NULL, NULL);
1784	1832	fail_unless(error == NULL, NULL);
	1833
	1834	osync_engine_set_schemadir(engine, testbed);
1785	1835	osync_engine_set_plugindir(engine, testbed);
1786	1836	osync_engine_set_formatdir(engine, testbed);
…	…
1817	1867	fail_unless(num_engine_successful == 0, NULL);
1818	1868
1819		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
	1869	fail_unless(!osync_testing_diff("data1", "data2"));
1820	1870	fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
1821	1871
…	…
1839	1889	fail_unless(engine != NULL, NULL);
1840	1890	fail_unless(error == NULL, NULL);
	1891
	1892	osync_engine_set_schemadir(engine, testbed);
1841	1893	osync_engine_set_plugindir(engine, testbed);
1842	1894	osync_engine_set_formatdir(engine, testbed);
…	…
1896	1948	fail_unless(engine != NULL, NULL);
1897	1949	fail_unless(error == NULL, NULL);
	1950
	1951	osync_engine_set_schemadir(engine, testbed);
1898	1952	osync_engine_set_plugindir(engine, testbed);
1899	1953	osync_engine_set_formatdir(engine, testbed);
…	…
1953	2007	fail_unless(engine != NULL, NULL);
1954	2008	fail_unless(error == NULL, NULL);
	2009
	2010	osync_engine_set_schemadir(engine, testbed);
1955	2011	osync_engine_set_plugindir(engine, testbed);
1956	2012	osync_engine_set_formatdir(engine, testbed);
…	…
2008	2064	fail_unless(engine != NULL, NULL);
2009	2065	fail_unless(error == NULL, NULL);
	2066
	2067	osync_engine_set_schemadir(engine, testbed);
2010	2068	osync_engine_set_plugindir(engine, testbed);
2011	2069	osync_engine_set_formatdir(engine, testbed);
…	…
2054	2112	fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" != \"x\""), NULL);
2055	2113	fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
2056		fail_unless(!~~system("test \"x$(diff -x \".*\" data2 data3)\" == \"x\""), NULL~~);
	2114	fail_unless(!osync_testing_diff("data2", "data3"));
2057	2115
2058	2116	destroy_testbed(testbed);
…	…
2074	2132	fail_unless(engine != NULL, NULL);
2075	2133	fail_unless(error == NULL, NULL);
	2134
	2135	osync_engine_set_schemadir(engine, testbed);
2076	2136	osync_engine_set_plugindir(engine, testbed);
2077	2137	osync_engine_set_formatdir(engine, testbed);
…	…
2120	2180	fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" != \"x\""), NULL);
2121	2181	fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
2122		fail_unless(!~~system("test \"x$(diff -x \".*\" data2 data3)\" == \"x\""), NULL~~);
	2182	fail_unless(!osync_testing_diff("data2", "data3"));
2123	2183
2124	2184	destroy_testbed(testbed);
…	…
2142	2202	fail_unless(engine != NULL, NULL);
2143	2203	fail_unless(error == NULL, NULL);
	2204
	2205	osync_engine_set_schemadir(engine, testbed);
2144	2206	osync_engine_set_plugindir(engine, testbed);
2145	2207	osync_engine_set_formatdir(engine, testbed);
…	…
2173	2235	fail_unless(num_engine_successful == 0, NULL);
2174	2236
2175		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL~~);
2176		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL~~);
	2237	fail_unless(!osync_testing_diff("data1", "data2"));
	2238	fail_unless(!osync_testing_diff("data1", "data3"));
2177	2239
2178	2240	destroy_testbed(testbed);
…	…
2197	2259	fail_unless(engine != NULL, NULL);
2198	2260	fail_unless(error == NULL, NULL);
	2261
	2262	osync_engine_set_schemadir(engine, testbed);
2199	2263	osync_engine_set_plugindir(engine, testbed);
2200	2264	osync_engine_set_formatdir(engine, testbed);
…	…
2228	2292	fail_unless(num_engine_successful == 0, NULL);
2229	2293
2230		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL~~);
2231		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL~~);
	2294	fail_unless(!osync_testing_diff("data1", "data2"));
	2295	fail_unless(!osync_testing_diff("data1", "data3"));
2232	2296
2233	2297	destroy_testbed(testbed);
…	…
2251	2315	fail_unless(engine != NULL, NULL);
2252	2316	fail_unless(error == NULL, NULL);
	2317
	2318	osync_engine_set_schemadir(engine, testbed);
2253	2319	osync_engine_set_plugindir(engine, testbed);
2254	2320	osync_engine_set_formatdir(engine, testbed);
…	…
2282	2348	fail_unless(num_engine_successful == 0, NULL);
2283	2349
2284		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2285		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2350	fail_unless(!osync_testing_diff("data1", "data2"));
	2351	fail_unless(!osync_testing_diff("data1", "data3"));
2286	2352
2287	2353	destroy_testbed(testbed);
…	…
2305	2371	fail_unless(engine != NULL, NULL);
2306	2372	fail_unless(error == NULL, NULL);
	2373
	2374	osync_engine_set_schemadir(engine, testbed);
2307	2375	osync_engine_set_plugindir(engine, testbed);
2308	2376	osync_engine_set_formatdir(engine, testbed);
…	…
2336	2404	fail_unless(num_engine_successful == 0, NULL);
2337	2405
2338		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2339		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2406	fail_unless(!osync_testing_diff("data1", "data2"));
	2407	fail_unless(!osync_testing_diff("data1", "data3"));
2340	2408
2341	2409	destroy_testbed(testbed);
…	…
2359	2427	fail_unless(engine != NULL, NULL);
2360	2428	fail_unless(error == NULL, NULL);
	2429
	2430	osync_engine_set_schemadir(engine, testbed);
2361	2431	osync_engine_set_plugindir(engine, testbed);
2362	2432	osync_engine_set_formatdir(engine, testbed);
…	…
2390	2460	fail_unless(num_engine_successful == 0, NULL);
2391	2461
2392		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2393		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2462	fail_unless(!osync_testing_diff("data1", "data2"));
	2463	fail_unless(!osync_testing_diff("data1", "data3"));
2394	2464
2395	2465	destroy_testbed(testbed);
…	…
2413	2483	fail_unless(engine != NULL, NULL);
2414	2484	fail_unless(error == NULL, NULL);
	2485
	2486	osync_engine_set_schemadir(engine, testbed);
2415	2487	osync_engine_set_plugindir(engine, testbed);
2416	2488	osync_engine_set_formatdir(engine, testbed);
…	…
2446	2518	fail_unless(num_engine_successful == 0, NULL);
2447	2519
2448		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2449		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2520	fail_unless(!osync_testing_diff("data1", "data2"));
	2521	fail_unless(!osync_testing_diff("data1", "data3"));
2450	2522
2451	2523	destroy_testbed(testbed);
…	…
2469	2541	fail_unless(engine != NULL, NULL);
2470	2542	fail_unless(error == NULL, NULL);
	2543
	2544	osync_engine_set_schemadir(engine, testbed);
2471	2545	osync_engine_set_plugindir(engine, testbed);
2472	2546	osync_engine_set_formatdir(engine, testbed);
…	…
2502	2576	fail_unless(num_engine_successful == 0, NULL);
2503	2577
2504		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2505		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2578	fail_unless(!osync_testing_diff("data1", "data2"));
	2579	fail_unless(!osync_testing_diff("data1", "data3"));
2506	2580
2507	2581	destroy_testbed(testbed);
…	…
2526	2600	fail_unless(engine != NULL, NULL);
2527	2601	fail_unless(error == NULL, NULL);
	2602
	2603	osync_engine_set_schemadir(engine, testbed);
2528	2604	osync_engine_set_plugindir(engine, testbed);
2529	2605	osync_engine_set_formatdir(engine, testbed);
…	…
2559	2635	fail_unless(num_engine_successful == 0, NULL);
2560	2636
2561		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2562		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2637	fail_unless(!osync_testing_diff("data1", "data2"));
	2638	fail_unless(!osync_testing_diff("data1", "data3"));
2563	2639
2564	2640	destroy_testbed(testbed);
…	…
2582	2658	fail_unless(engine != NULL, NULL);
2583	2659	fail_unless(error == NULL, NULL);
	2660
	2661	osync_engine_set_schemadir(engine, testbed);
2584	2662	osync_engine_set_plugindir(engine, testbed);
2585	2663	osync_engine_set_formatdir(engine, testbed);
…	…
2613	2691	fail_unless(num_engine_successful == 1, NULL);
2614	2692
2615		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2616		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2693	fail_unless(!osync_testing_diff("data1", "data2"));
	2694	fail_unless(!osync_testing_diff("data1", "data3"));
2617	2695
2618	2696	destroy_testbed(testbed);
…	…
2636	2714	fail_unless(engine != NULL, NULL);
2637	2715	fail_unless(error == NULL, NULL);
	2716
	2717	osync_engine_set_schemadir(engine, testbed);
2638	2718	osync_engine_set_plugindir(engine, testbed);
2639	2719	osync_engine_set_formatdir(engine, testbed);
…	…
2667	2747	fail_unless(num_engine_successful == 1, NULL);
2668	2748
2669		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2670		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2749	fail_unless(!osync_testing_diff("data1", "data2"));
	2750	fail_unless(!osync_testing_diff("data1", "data3"));
2671	2751
2672	2752	destroy_testbed(testbed);
…	…
2690	2770	fail_unless(engine != NULL, NULL);
2691	2771	fail_unless(error == NULL, NULL);
	2772
	2773	osync_engine_set_schemadir(engine, testbed);
2692	2774	osync_engine_set_plugindir(engine, testbed);
2693	2775	osync_engine_set_formatdir(engine, testbed);
…	…
2721	2803	fail_unless(num_engine_successful == 1, NULL);
2722	2804
2723		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2724		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2805	fail_unless(!osync_testing_diff("data1", "data2"));
	2806	fail_unless(!osync_testing_diff("data1", "data3"));
2725	2807
2726	2808	destroy_testbed(testbed);
…	…
2744	2826	fail_unless(engine != NULL, NULL);
2745	2827	fail_unless(error == NULL, NULL);
	2828
	2829	osync_engine_set_schemadir(engine, testbed);
2746	2830	osync_engine_set_plugindir(engine, testbed);
2747	2831	osync_engine_set_formatdir(engine, testbed);
…	…
2777	2861	fail_unless(num_engine_successful == 1, NULL);
2778	2862
2779		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2780		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2863	fail_unless(!osync_testing_diff("data1", "data2"));
	2864	fail_unless(!osync_testing_diff("data1", "data3"));
2781	2865
2782	2866	destroy_testbed(testbed);
…	…
2800	2884	fail_unless(engine != NULL, NULL);
2801	2885	fail_unless(error == NULL, NULL);
	2886
	2887	osync_engine_set_schemadir(engine, testbed);
2802	2888	osync_engine_set_plugindir(engine, testbed);
2803	2889	osync_engine_set_formatdir(engine, testbed);
…	…
2833	2919	fail_unless(num_engine_successful == 1, NULL);
2834	2920
2835		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2836		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2921	fail_unless(!osync_testing_diff("data1", "data2"));
	2922	fail_unless(!osync_testing_diff("data1", "data3"));
2837	2923
2838	2924	destroy_testbed(testbed);
…	…
2857	2943	fail_unless(engine != NULL, NULL);
2858	2944	fail_unless(error == NULL, NULL);
	2945
	2946	osync_engine_set_schemadir(engine, testbed);
2859	2947	osync_engine_set_plugindir(engine, testbed);
2860	2948	osync_engine_set_formatdir(engine, testbed);
…	…
2890	2978	fail_unless(num_engine_successful == 1, NULL);
2891	2979
2892		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
2893		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	2980	fail_unless(!osync_testing_diff("data1", "data2"));
	2981	fail_unless(!osync_testing_diff("data1", "data3"));
2894	2982
2895	2983	destroy_testbed(testbed);
…	…
2916	3004	fail_unless(engine != NULL, NULL);
2917	3005	fail_unless(error == NULL, NULL);
	3006
	3007	osync_engine_set_schemadir(engine, testbed);
2918	3008	osync_engine_set_plugindir(engine, testbed);
2919	3009	osync_engine_set_formatdir(engine, testbed);

trunk/tests/group-tests/check_lock.c

r3409	r3459
105	105	osync_engine_set_plugindir(engine, testbed);
106	106	osync_engine_set_formatdir(engine, testbed);
	107	osync_engine_set_schemadir(engine, testbed);
107	108
108	109	OSyncEngine *engine2 = osync_engine_new(group2, &error);
…	…
112	113	osync_engine_set_plugindir(engine2, testbed);
113	114	osync_engine_set_formatdir(engine2, testbed);
	115	osync_engine_set_schemadir(engine2, testbed);
114	116
115	117	fail_unless(osync_engine_initialize(engine, &error), osync_error_print(&error));
…	…
136	138	osync_engine_unref(engine2);
137	139
138		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
139		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	140	fail_unless(!osync_testing_diff("data1", "data2"));
	141	fail_unless(!osync_testing_diff("data1", "data3"));
140	142
141	143	osync_group_unref(group);
…	…
160	162	osync_engine_set_plugindir(engine, testbed);
161	163	osync_engine_set_formatdir(engine, testbed);
	164	osync_engine_set_schemadir(engine, testbed);
162	165
163	166	fail_unless(osync_engine_initialize(engine, &error), NULL);
…	…
203	206	osync_engine_set_plugindir(engine, testbed);
204	207	osync_engine_set_formatdir(engine, testbed);
	208	osync_engine_set_schemadir(engine, testbed);
205	209
206	210	num_engine_prev_unclean = 0;
…	…
228	232	osync_engine_set_plugindir(engine, testbed);
229	233	osync_engine_set_formatdir(engine, testbed);
	234	osync_engine_set_schemadir(engine, testbed);
230	235
231	236	for (o = engine->object_engines; o; o = o->next) {
…	…
248	253	fail_unless(num_engine_prev_unclean == 0, NULL);
249	254
250		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data2)\" == \"x\""), NULL~~);
251		fail_unless(!~~system("test \"x$(diff -x \".*\" data1 data3)\" == \"x\""), NULL~~);
	255	fail_unless(!osync_testing_diff("data1", "data2"));
	256	fail_unless(!osync_testing_diff("data1", "data3"));
252	257
253	258	osync_group_unref(group);

trunk/tests/sync-tests/check_filter.c

r3409	r3459
108	108	osync_engine_set_plugindir(engine, testbed);
109	109	osync_engine_set_formatdir(engine, testbed);
	110	osync_engine_set_schemadir(engine, testbed);
110	111
111	112	fail_unless(osync_engine_initialize(engine, &error), osync_error_print(&error));
…	…
153	154	osync_engine_set_plugindir(engine, testbed);
154	155	osync_engine_set_formatdir(engine, testbed);
	156	osync_engine_set_schemadir(engine, testbed);
155	157
156	158	fail_unless(osync_engine_initialize(engine, &error), NULL);
…	…
305	307	osync_engine_set_plugindir(engine, testbed);
306	308	osync_engine_set_formatdir(engine, testbed);
	309	osync_engine_set_schemadir(engine, testbed);
307	310
308	311	fail_unless(osync_engine_initialize(engine, &error), NULL);
…	…
348	351	osync_engine_set_plugindir(engine, testbed);
349	352	osync_engine_set_formatdir(engine, testbed);
	353	osync_engine_set_schemadir(engine, testbed);
350	354
351	355	fail_unless(osync_engine_initialize(engine, &error), NULL);
…	…
394	398	osync_engine_set_plugindir(engine, testbed);
395	399	osync_engine_set_formatdir(engine, testbed);
	400	osync_engine_set_schemadir(engine, testbed);
396	401
397	402	fail_unless(osync_engine_initialize(engine, &error), NULL);

trunk/tests/sync-tests/check_sync.c

r3409	r3459
26	26	fail_unless(error == NULL, NULL);
27	27	osync_group_unref(group);
28
	28
	29	osync_engine_set_schemadir(engine, testbed);
29	30	osync_engine_set_plugindir(engine, testbed);
30	31	osync_engine_set_formatdir(engine, testbed);
…	…
72	73	osync_group_unref(group);
73	74
	75	osync_engine_set_schemadir(engine, testbed);
74	76	osync_engine_set_plugindir(engine, testbed);
75	77	osync_engine_set_formatdir(engine, testbed);
…	…
172	174	fail_unless(error == NULL, NULL);
173	175	osync_group_unref(group);
174
	176
	177	osync_engine_set_schemadir(engine, testbed);
175	178	osync_engine_set_plugindir(engine, testbed);
176	179	osync_engine_set_formatdir(engine, testbed);
…	…
299	302	fail_unless(error == NULL, NULL);
300	303	osync_group_unref(group);
301
	304
	305	osync_engine_set_schemadir(engine, testbed);
302	306	osync_engine_set_plugindir(engine, testbed);
303	307	osync_engine_set_formatdir(engine, testbed);
…	…
403	407	fail_unless(error == NULL, NULL);
404	408	osync_group_unref(group);
405
	409
	410	osync_engine_set_schemadir(engine, testbed);
406	411	osync_engine_set_plugindir(engine, testbed);
407	412	osync_engine_set_formatdir(engine, testbed);
…	…
564	569	fail_unless(error == NULL, NULL);
565	570	osync_group_unref(group);
566
	571
	572	osync_engine_set_schemadir(engine, testbed);
567	573	osync_engine_set_plugindir(engine, testbed);
568	574	osync_engine_set_formatdir(engine, testbed);
…	…
738	744	fail_unless(error == NULL, NULL);
739	745	osync_group_unref(group);
740
	746
	747	osync_engine_set_schemadir(engine, testbed);
741	748	osync_engine_set_plugindir(engine, testbed);
742	749	osync_engine_set_formatdir(engine, testbed);
…	…
992	999	osync_group_unref(group);
993	1000
	1001	osync_engine_set_schemadir(engine, testbed);
994	1002	osync_engine_set_plugindir(engine, testbed);
995	1003	osync_engine_set_formatdir(engine, testbed);
…	…
1172	1180	osync_group_unref(group);
1173	1181
	1182	osync_engine_set_schemadir(engine, testbed);
1174	1183	osync_engine_set_plugindir(engine, testbed);
1175	1184	osync_engine_set_formatdir(engine, testbed);
…	…
1341	1350	fail_unless(error == NULL, NULL);
1342	1351	osync_group_unref(group);
1343
	1352
	1353	osync_engine_set_schemadir(engine, testbed);
1344	1354	osync_engine_set_plugindir(engine, testbed);
1345	1355	osync_engine_set_formatdir(engine, testbed);
…	…
1447	1457	osync_group_unref(group);
1448	1458
	1459	osync_engine_set_schemadir(engine, testbed);
1449	1460	osync_engine_set_plugindir(engine, testbed);
1450	1461	osync_engine_set_formatdir(engine, testbed);
…	…
1617	1628	osync_group_unref(group);
1618	1629
	1630	osync_engine_set_schemadir(engine, testbed);
1619	1631	osync_engine_set_plugindir(engine, testbed);
1620	1632	osync_engine_set_formatdir(engine, testbed);
…	…
1727	1739	fail_unless(error == NULL, NULL);
1728	1740	osync_group_unref(group);
1729
	1741
	1742	osync_engine_set_schemadir(engine, testbed);
1730	1743	osync_engine_set_plugindir(engine, testbed);
1731	1744	osync_engine_set_formatdir(engine, testbed);
…	…
1913	1926	osync_group_unref(group);
1914	1927
	1928	osync_engine_set_schemadir(engine, testbed);
1915	1929	osync_engine_set_plugindir(engine, testbed);
1916	1930	osync_engine_set_formatdir(engine, testbed);
…	…
2292	2306	fail_unless(error == NULL, NULL);
2293	2307	osync_group_unref(group);
2294
	2308
	2309	osync_engine_set_schemadir(engine, testbed);
2295	2310	osync_engine_set_plugindir(engine, testbed);
2296	2311	osync_engine_set_formatdir(engine, testbed);
…	…
2498	2513	fail_unless(error == NULL, NULL);
2499	2514	osync_group_unref(group);
2500
	2515
	2516	osync_engine_set_schemadir(engine, testbed);
2501	2517	osync_engine_set_plugindir(engine, testbed);
2502	2518	osync_engine_set_formatdir(engine, testbed);
…	…
2682	2698	fail_unless(error == NULL, NULL);
2683	2699	osync_group_unref(group);
2684
	2700
	2701	osync_engine_set_schemadir(engine, testbed);
2685	2702	osync_engine_set_plugindir(engine, testbed);
2686	2703	osync_engine_set_formatdir(engine, testbed);
…	…
2779	2796	fail_unless(error == NULL, NULL);
2780	2797	osync_group_unref(group);
2781
	2798
	2799	osync_engine_set_schemadir(engine, testbed);
2782	2800	osync_engine_set_plugindir(engine, testbed);
2783	2801	osync_engine_set_formatdir(engine, testbed);
…	…
2886	2904	fail_unless(error == NULL, NULL);
2887	2905	osync_group_unref(group);
2888
	2906
	2907	osync_engine_set_schemadir(engine, testbed);
2889	2908	osync_engine_set_plugindir(engine, testbed);
2890	2909	osync_engine_set_formatdir(engine, testbed);
…	…
2982	3001	fail_unless(error == NULL, NULL);
2983	3002	osync_group_unref(group);
2984
	3003
	3004	osync_engine_set_schemadir(engine, testbed);
2985	3005	osync_engine_set_plugindir(engine, testbed);
2986	3006	osync_engine_set_formatdir(engine, testbed);

Download in other formats: