Modified: xerces/c/trunk/tests/src/XSValueTest/XSValueTest.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSValueTest/XSValueTest.cpp?rev=407876&r1=407875&r2=407876&view=diff ============================================================================== --- xerces/c/trunk/tests/src/XSValueTest/XSValueTest.cpp (original) +++ xerces/c/trunk/tests/src/XSValueTest/XSValueTest.cpp Fri May 19 11:25:12 2006 @@ -38,6 +38,8 @@ #include <xercesc/framework/psvi/XSValue.hpp> #include <xercesc/util/PlatformUtils.hpp> +static const char* null_string=0; + static const bool EXP_RET_VALID_TRUE = true; static const bool EXP_RET_VALUE_TRUE = true; static const bool EXP_RET_CANREP_TRUE = true; @@ -274,7 +276,7 @@ case XSValue::dt_long: if (actValue.fValue.f_long == expValue.fValue.f_long) return true; - printf("ACTVALUE_TEST Unexpected %s XSValue, got %d expected %d\n", StrX(getDataTypeString(datatype)).localForm(), + printf("ACTVALUE_TEST Unexpected %s XSValue, got %ld expected %ld\n", StrX(getDataTypeString(datatype)).localForm(), actValue.fValue.f_long, expValue.fValue.f_long); return false; @@ -301,7 +303,7 @@ case XSValue::dt_positiveInteger: if (actValue.fValue.f_ulong == expValue.fValue.f_ulong) return true; - printf("ACTVALUE_TEST Unexpected %s XSValue, got %d expected %d\n", StrX(getDataTypeString(datatype)).localForm(), + printf("ACTVALUE_TEST Unexpected %s XSValue, got %lu expected %lu\n", StrX(getDataTypeString(datatype)).localForm(), actValue.fValue.f_ulong, expValue.fValue.f_ulong); return false; case XSValue::dt_unsignedInt: @@ -755,8 +757,8 @@ const char lex_v_ran32_v_1[]="4294967295.999"; const char lex_v_ran32_v_2[]="999.4294967295"; - const char lex_v_ran32_iv_1[]="4294967296.999"; - const char lex_v_ran32_iv_2[]="999.4294967296"; +// const char lex_v_ran32_iv_1[]="4294967296.999"; +// const char lex_v_ran32_iv_2[]="999.4294967296"; const char lex_iv_1[]="12b34.456"; const char lex_iv_2[]="1234.56.789"; @@ -909,8 +911,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_1, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -1099,8 +1101,8 @@ CANREP_TEST(data_rawstr_5, dt, toValidate, EXP_RET_CANREP_TRUE, data_canrep_5, DONT_CARE); // lexical invalid - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); // lexical valid, range invalid (however XML4C ignores that) CANREP_TEST(lex_v_ran_iv_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -1295,8 +1297,8 @@ CANREP_TEST(data_rawstr_5, dt, toValidate, EXP_RET_CANREP_TRUE, data_canrep_5, DONT_CARE); // lexical invalid - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); // lexical valid, range invalid (XML4C doesn't treat as invalid) CANREP_TEST(lex_v_ran_iv_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -1463,8 +1465,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -1609,8 +1611,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -1751,8 +1753,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -1909,14 +1911,14 @@ CANREP_TEST(lex_v_ran64_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran64_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran64_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran64_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran64_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran64_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_1_canrep, DONT_CARE); @@ -2059,14 +2061,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -2213,14 +2215,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -2367,14 +2369,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -2520,8 +2522,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -2680,14 +2682,14 @@ CANREP_TEST(lex_v_ran64_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran64_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran64_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran64_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran64_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran64_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_1_canrep, DONT_CARE); @@ -2830,14 +2832,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -2980,14 +2982,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -3130,14 +3132,14 @@ CANREP_TEST(lex_v_ran_v_1, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_1_canrep, DONT_CARE); CANREP_TEST(lex_v_ran_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran_v_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } //validation on - CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_1, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_v_ran_iv_2, dt, true, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); //validation off CANREP_TEST(lex_v_ran_iv_1, dt, false, EXP_RET_CANREP_TRUE, lex_v_ran_iv_1_canrep, DONT_CARE); @@ -3282,8 +3284,8 @@ CANREP_TEST(lex_v_ran64_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_v_2_canrep, DONT_CARE); CANREP_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_ran64_iv_2_canrep, DONT_CARE); - CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2 , dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -3402,7 +3404,7 @@ CANREP_TEST(lex_v_4, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_4_canrep, DONT_CARE); // lexical invalid - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } } @@ -3519,8 +3521,8 @@ CANREP_TEST(lex_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_2_canrep, DONT_CARE); // lexical invalid - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } } @@ -3645,8 +3647,8 @@ CANREP_TEST(lex_v_2, dt, toValidate, EXP_RET_CANREP_TRUE, lex_v_2_canrep, DONT_CARE); // lexical invalid - CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(lex_iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } } @@ -3770,16 +3772,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -3958,9 +3960,9 @@ CANREP_TEST(c_c, dt, toValidate, EXP_RET_CANREP_TRUE, r_c, DONT_CARE); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); } @@ -4086,16 +4088,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -4223,16 +4225,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -4359,16 +4361,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -4496,16 +4498,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -4633,16 +4635,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -4805,11 +4807,11 @@ CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_TRUE, v_3_canrep, DONT_CARE); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_4, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FODT0003); - CANREP_TEST(iv_5, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FODT0003); + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_4, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FODT0003); + CANREP_TEST(iv_5, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FODT0003); } @@ -4963,11 +4965,11 @@ CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_TRUE, v_3_canrep, DONT_CARE); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FOCA0002); - CANREP_TEST(iv_4, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FODT0003); - CANREP_TEST(iv_5, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_FODT0003); + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FOCA0002); + CANREP_TEST(iv_4, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FODT0003); + CANREP_TEST(iv_5, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_FODT0003); } } @@ -5050,7 +5052,7 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid @@ -5159,16 +5161,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -5275,16 +5277,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate? XSValue::st_FOCA0002: XSValue::st_NoCanRep)); } @@ -5373,7 +5375,7 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid @@ -5478,14 +5480,14 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -5593,16 +5595,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -5709,16 +5711,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -5825,16 +5827,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -5942,16 +5944,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -6059,16 +6061,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -6174,16 +6176,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); } @@ -6289,16 +6291,16 @@ toValidate = ( 0 == j) ? true : false; // valid - CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); - CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, XSValue::st_NoCanRep); + CANREP_TEST(v_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); + CANREP_TEST(v_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, XSValue::st_NoCanRep); // invalid - CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_1, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_2, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); - CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, 0, + CANREP_TEST(iv_3, dt, toValidate, EXP_RET_CANREP_FALSE, null_string, (toValidate ? XSValue::st_FOCA0002 : XSValue::st_NoCanRep)); }
Modified: xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.cpp?rev=407876&r1=407875&r2=407876&view=diff ============================================================================== --- xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.cpp (original) +++ xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.cpp Fri May 19 11:25:12 2006 @@ -32,9 +32,9 @@ // --------------------------------------------------------------------------- XSerializerHandlers::XSerializerHandlers() : - fElementCount(0) - , fAttrCount(0) + fAttrCount(0) , fCharacterCount(0) + , fElementCount(0) , fSpaceCount(0) , fSawErrors(false) { @@ -47,23 +47,23 @@ // --------------------------------------------------------------------------- // XSerializerHandlers: Implementation of the SAX DocumentHandler interface // --------------------------------------------------------------------------- -void XSerializerHandlers::startElement(const XMLCh* const uri - , const XMLCh* const localname - , const XMLCh* const qname +void XSerializerHandlers::startElement(const XMLCh* const /*uri*/ + , const XMLCh* const /*localname*/ + , const XMLCh* const /*qname*/ , const Attributes& attrs) { fElementCount++; fAttrCount += attrs.getLength(); } -void XSerializerHandlers::characters( const XMLCh* const chars - , const unsigned int length) +void XSerializerHandlers::characters( const XMLCh* const /*chars*/ + , const unsigned int length) { fCharacterCount += length; } -void XSerializerHandlers::ignorableWhitespace( const XMLCh* const chars - , const unsigned int length) +void XSerializerHandlers::ignorableWhitespace( const XMLCh* const /*chars*/ + , const unsigned int length) { fSpaceCount += length; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
