Changeset 3377

Show
Ignore:
Timestamp:
06/19/08 09:35:00 (4 months ago)
Author:
JimLi
Message:

Use file helper functions to replace ugly system() call.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/sync-tests/check_filter.c

    r3201 r3377  
    119119        osync_engine_finalize(engine, &error); 
    120120 
    121         fail_unless(!system("test \"x$(ls data1)\" = \"xtestdata\""), NULL); 
    122         fail_unless(!system("test \"x$(ls data2)\" = \"xtestdata2\""), NULL); 
     121        fail_unless(osync_testing_file_exists("data1/testdata"), NULL); 
     122        fail_unless(osync_testing_file_exists("data2/testdata2"), NULL); 
    123123 
    124124        destroy_testbed(testbed); 
    …… 
    163163        osync_engine_finalize(engine, &error); 
    164164 
    165         fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL); 
     165        fail_unless(!osync_testing_diff("data1", "data2"), NULL); 
    166166 
    167167        destroy_testbed(testbed); 
    …… 
    315315        osync_engine_unref(engine); 
    316316 
    317         fail_unless(!system("test \"x$(ls data1/testdata)\" = \"xdata1/testdata\""), NULL); 
    318         fail_unless(!system("test \"x$(ls data1/testdata2)\" = \"xdata1/testdata2\""), NULL); 
    319         fail_unless(!system("test \"x$(ls data1/testdata3)\" = \"xdata1/testdata3\""), NULL); 
    320         fail_unless(!system("test \"x$(ls data1/vcard.vcf)\" = \"xdata1/vcard.vcf\""), NULL); 
    321          
    322         fail_unless(!system("test \"x$(ls data2/testdata3)\" = \"xdata2/testdata3\""), NULL); 
    323         fail_unless(!system("test \"x$(ls data2/vcard.vcf)\" = \"xdata2/vcard.vcf\""), NULL); 
     317        fail_unless(osync_testing_file_exists("data1/testdata"), NULL); 
     318        fail_unless(osync_testing_file_exists("data1/testdata2"), NULL); 
     319        fail_unless(osync_testing_file_exists("data1/testdata3"), NULL); 
     320        fail_unless(osync_testing_file_exists("data1/vcard.vcf"), NULL); 
     321 
     322        fail_unless(osync_testing_file_exists("data2/testdata3"), NULL); 
     323        fail_unless(osync_testing_file_exists("data2/vcard.vcf"), NULL); 
    324324 
    325325        destroy_testbed(testbed); 
    …… 
    358358        /* Synchronize once, delete a file, and synchronize again */ 
    359359 
    360         fail_unless(!system("rm data1/file"), NULL); 
     360        fail_unless(!osync_testing_file_remove("data1/file"), NULL); 
    361361 
    362362        synchronize_once(engine, NULL); 
    …… 
    404404        fail_unless(num_read == 1); 
    405405 
    406         fail_unless(!system("test \"x$(ls data1/testdata)\" = \"xdata1/testdata\""), NULL); 
    407         fail_unless(!system("test \"x$(ls data1/testdata2)\" = \"xdata1/testdata2\""), NULL); 
    408         fail_unless(!system("test \"x$(ls data2/testdata2)\" = \"xdata2/testdata2\""), NULL); 
     406        fail_unless(osync_testing_file_exists("data1/testdata"), NULL); 
     407        fail_unless(osync_testing_file_exists("data1/testdata2"), NULL); 
     408        fail_unless(osync_testing_file_exists("data2/testdata2"), NULL); 
    409409 
    410410        destroy_testbed(testbed);