@@ -3046,10 +3046,9 @@ int test_report(const char *description, bool result){
30463046
30473047int main (int argc , const char * argv []) {
30483048 sqlite3 * db = NULL ;
3049- bool result = false ;
3049+ int result = 0 ;
30503050 bool print_result = false;
30513051 bool cleanup_databases = true;
3052- int fail = 0 ;
30533052
30543053 // test in an in-memory database
30553054 int rc = sqlite3_open (":memory:" , & db );
@@ -3061,14 +3060,14 @@ int main(int argc, const char * argv[]) {
30613060 printf ("Testing CloudSync version %s\n" , CLOUDSYNC_VERSION );
30623061 printf ("===============================\n" );
30633062
3064- fail += test_report ("PK Test:" , do_test_pk (db , 10000 , print_result ));
3065- fail += test_report ("UUID Test:" , do_test_uuid (db , 1000 , print_result ));
3066- fail += test_report ("Comparison Test:" , do_test_compare (db , print_result ));
3067- fail += test_report ("RowID Test:" , do_test_rowid (50000 , print_result ));
3068- fail += test_report ("Algo Names Test:" , do_test_algo_names ());
3069- fail += test_report ("DBUtils Test:" , do_test_dbutils ());
3070- fail += test_report ("Minor Test:" , do_test_others (db ));
3071- fail += test_report ("Test Error Cases:" , do_test_error_cases (db ));
3063+ result += test_report ("PK Test:" , do_test_pk (db , 10000 , print_result ));
3064+ result += test_report ("UUID Test:" , do_test_uuid (db , 1000 , print_result ));
3065+ result += test_report ("Comparison Test:" , do_test_compare (db , print_result ));
3066+ result += test_report ("RowID Test:" , do_test_rowid (50000 , print_result ));
3067+ result += test_report ("Algo Names Test:" , do_test_algo_names ());
3068+ result += test_report ("DBUtils Test:" , do_test_dbutils ());
3069+ result += test_report ("Minor Test:" , do_test_others (db ));
3070+ result += test_report ("Test Error Cases:" , do_test_error_cases (db ));
30723071
30733072 int test_mask = TEST_INSERT | TEST_UPDATE | TEST_DELETE ;
30743073 int table_mask = TEST_PRIKEYS | TEST_NOCOLS ;
@@ -3077,38 +3076,38 @@ int main(int argc, const char * argv[]) {
30773076 #endif
30783077
30793078 // test local changes
3080- fail += test_report ("Local Test:" , do_test_local (test_mask , table_mask , db , print_result ));
3081- fail += test_report ("VTab Test: " , do_test_vtab (db ));
3082- fail += test_report ("Functions Test:" , do_test_functions (db , print_result ));
3083- fail += test_report ("Functions Test (Int):" , do_test_internal_functions ());
3079+ result += test_report ("Local Test:" , do_test_local (test_mask , table_mask , db , print_result ));
3080+ result += test_report ("VTab Test: " , do_test_vtab (db ));
3081+ result += test_report ("Functions Test:" , do_test_functions (db , print_result ));
3082+ result += test_report ("Functions Test (Int):" , do_test_internal_functions ());
30843083
30853084 // close local database
30863085 db = close_db (db );
30873086
30883087 // simulate remote merge
3089- fail += test_report ("Merge Test:" , do_test_merge (3 , print_result , cleanup_databases ));
3090- fail += test_report ("Merge Test 2:" , do_test_merge_2 (3 , TEST_PRIKEYS , print_result , cleanup_databases ));
3091- fail += test_report ("Merge Test 3:" , do_test_merge_2 (3 , TEST_NOCOLS , print_result , cleanup_databases ));
3092- fail += test_report ("Merge Test 4:" , do_test_merge_4 (2 , print_result , cleanup_databases ));
3093- fail += test_report ("Merge Test 5:" , do_test_merge_5 (2 , print_result , cleanup_databases , false));
3094- fail += test_report ("Merge Alter Schema 1:" , do_test_merge_alter_schema_1 (2 , print_result , cleanup_databases , false));
3095- fail += test_report ("Merge Alter Schema 2:" , do_test_merge_alter_schema_2 (2 , print_result , cleanup_databases , false));
3096- fail += test_report ("PriKey NULL Test:" , do_test_prikey (2 , print_result , cleanup_databases ));
3097- fail += test_report ("Test Double Init:" , do_test_double_init (2 , cleanup_databases ));
3088+ result += test_report ("Merge Test:" , do_test_merge (3 , print_result , cleanup_databases ));
3089+ result += test_report ("Merge Test 2:" , do_test_merge_2 (3 , TEST_PRIKEYS , print_result , cleanup_databases ));
3090+ result += test_report ("Merge Test 3:" , do_test_merge_2 (3 , TEST_NOCOLS , print_result , cleanup_databases ));
3091+ result += test_report ("Merge Test 4:" , do_test_merge_4 (2 , print_result , cleanup_databases ));
3092+ result += test_report ("Merge Test 5:" , do_test_merge_5 (2 , print_result , cleanup_databases , false));
3093+ result += test_report ("Merge Alter Schema 1:" , do_test_merge_alter_schema_1 (2 , print_result , cleanup_databases , false));
3094+ result += test_report ("Merge Alter Schema 2:" , do_test_merge_alter_schema_2 (2 , print_result , cleanup_databases , false));
3095+ result += test_report ("PriKey NULL Test:" , do_test_prikey (2 , print_result , cleanup_databases ));
3096+ result += test_report ("Test Double Init:" , do_test_double_init (2 , cleanup_databases ));
30983097
30993098 // test grow-only set
3100- fail += test_report ("Test GrowOnlySet:" , do_test_gos (6 , print_result , cleanup_databases ));
3101- fail += test_report ("Test Network Enc/Dec:" , do_test_network_encode_decode (2 , print_result , cleanup_databases , false));
3102- fail += test_report ("Test Network Enc/Dec 2:" , do_test_network_encode_decode (2 , print_result , cleanup_databases , true));
3103- fail += test_report ("Test Fill Initial Data:" , do_test_fill_initial_data (3 , print_result , cleanup_databases ));
3104- fail += test_report ("Test Alter Table 1:" , do_test_alter (3 , 1 , print_result , cleanup_databases ));
3105- fail += test_report ("Test Alter Table 2:" , do_test_alter (3 , 2 , print_result , cleanup_databases ));
3106- fail += test_report ("Test Alter Table 3:" , do_test_alter (3 , 3 , print_result , cleanup_databases ));
3099+ result += test_report ("Test GrowOnlySet:" , do_test_gos (6 , print_result , cleanup_databases ));
3100+ result += test_report ("Test Network Enc/Dec:" , do_test_network_encode_decode (2 , print_result , cleanup_databases , false));
3101+ result += test_report ("Test Network Enc/Dec 2:" , do_test_network_encode_decode (2 , print_result , cleanup_databases , true));
3102+ result += test_report ("Test Fill Initial Data:" , do_test_fill_initial_data (3 , print_result , cleanup_databases ));
3103+ result += test_report ("Test Alter Table 1:" , do_test_alter (3 , 1 , print_result , cleanup_databases ));
3104+ result += test_report ("Test Alter Table 2:" , do_test_alter (3 , 2 , print_result , cleanup_databases ));
3105+ result += test_report ("Test Alter Table 3:" , do_test_alter (3 , 3 , print_result , cleanup_databases ));
31073106
31083107finalize :
31093108 printf ("\n" );
31103109 if (rc != SQLITE_OK ) printf ("%s (%d)\n" , (db ) ? sqlite3_errmsg (db ) : "N/A" , rc );
31113110 db = close_db (db );
31123111
3113- return fail ;
3112+ return result ;
31143113}
0 commit comments