Commit bf6437ab authored by Kristof Szabados's avatar Kristof Szabados
Browse files

these 2 tests can now be enabled.

parent 06f0d3ba
......@@ -142,17 +142,15 @@ JsonBasicEncDecTest_os # 35 pass
JsonBasicTest_ucharstring # 10 pass
## JsonComplexTest folder ##
JsonTestcases.control #74 pass, 4 commented out
JsonTestcases.control #75 pass, 3 commented out
#TODO:failing tests, commented out in the control part:
#JsonTestcases.tc_charstring_ascii_basic_escapes #fail
#JsonTestcases.tc_ucharstring_ascii_extended1_xer #error
#JsonTestcases.tc_ucharstring_higherplanes #fail
#JsonTestcases.tc_asn_open_type_and_null #open type issue
AttributeTestcases.control #26 pass, 4 commented out
AttributeTestcases.control #27 pass, 3 commented out
#TODO:failing tests, commented out in the control part:
#AttributeTestcases.tc_attribute_as_value_asn #open type issue
#AttributeTestcases.tc_attribute_chosen # fail
#AttributeTestcases.tc_attribute_chosen_negtest # fail
#AttributeTestcases.tc_attribute_chosen_default # error
......
......@@ -200,13 +200,12 @@ testcase tc_attribute_default() runs on CT {
// Encoding a few values of ASN.1 types with the coding instruction "as value"
// Results are the same as with the TTCN-3 types
// TODO: bugfix this test (reported)
//testcase tc_attribute_as_value_asn() runs on CT {
// var AsnStuff stuff := { { nval := NULL }, { ival := -10 }, { anyval := 'DCBA'O }, { vsval := "something" }, { pardval := { id := 0, priority := low, val := { iNTEGER := -10 } } } };
// var octetstring os := char2oct("[null,-10,\"DCBA\",\"something\",{\"id\":0,\"priority\":\"low\",\"val\":{\"iNTEGER\":-10}}]");
// f_check_encoding(encoded := f_enc_asn_stuff(stuff), expected := os);
// f_bool2verdict( match(f_dec_asn_stuff(f_enc_asn_stuff(stuff)), stuff) );
//}
testcase tc_attribute_as_value_asn() runs on CT {
var AsnStuff stuff := { { nval := NULL }, { ival := -10 }, { anyval := 'DCBA'O }, { vsval := "something" }, { pardval := { id := 0, priority := low, val := { iNTEGER := -10 } } } };
var octetstring os := char2oct("[null,-10,\"DCBA\",\"something\",{\"id\":0,\"priority\":\"low\",\"val\":{\"iNTEGER\":-10}}]");
f_check_encoding(encoded := f_enc_asn_stuff(stuff), expected := os);
f_bool2verdict( match(f_dec_asn_stuff(f_enc_asn_stuff(stuff)), stuff) );
}
// Encoding a record with 2 optional union fields encoded as JSON values (attribute 'as value')
// and as the 'null' value when omitted (attribute 'omit as null').
......@@ -751,7 +750,7 @@ control {
execute(tc_attribute_union());
execute(tc_attribute_as_value());
execute(tc_attribute_default());
// execute(tc_attribute_as_value_asn()); //TODO: comp error. open type issue
execute(tc_attribute_as_value_asn());
execute(tc_attribute_optional_as_value());
execute(tc_attribute_metainfo_for_unbound());
execute(tc_attribute_metainfo_for_unbound_negtest());
......
......@@ -567,21 +567,20 @@ testcase tc_asn_complex() runs on MTC {
// ====== Special ASN.1 types ======
// record containing an open type and a possible NULL value
//TODO: java: wrong open type handling
//testcase tc_asn_open_type_and_null() runs on MTC {
// var HasPardType x := {
// pard := {
// id := 0,
// priority := low,
// val := { iNTEGER := 19 }
// },
// buul := true,
// price := { invaluable := NULL }
// };
// var octetstring os := char2oct("{\"pard\":{\"id\":0,\"priority\":\"low\",\"val\":{\"iNTEGER\":19}},\"buul\":true,\"price\":{\"invaluable\":null}}");
// f_check_encoding(encoded := f_enc_hpt(x), expected := os);
// f_bool2verdict(match(f_dec_hpt(os), x));
//}
testcase tc_asn_open_type_and_null() runs on MTC {
var HasPardType x := {
pard := {
id := 0,
priority := low,
val := { iNTEGER := 19 }
},
buul := true,
price := { invaluable := NULL }
};
var octetstring os := char2oct("{\"pard\":{\"id\":0,\"priority\":\"low\",\"val\":{\"iNTEGER\":19}},\"buul\":true,\"price\":{\"invaluable\":null}}");
f_check_encoding(encoded := f_enc_hpt(x), expected := os);
f_bool2verdict(match(f_dec_hpt(os), x));
}
// SEQUENCE containing an object identifier and an ANY type
testcase tc_asn_objid_and_any() runs on MTC {
......@@ -907,7 +906,7 @@ control {
execute(tc_asn_choice());
execute(tc_asn_strings());
execute(tc_asn_complex());
// execute(tc_asn_open_type_and_null()); //Java comp error. open type issue
execute(tc_asn_open_type_and_null());
execute(tc_asn_objid_and_any());
execute(tc_asn_optional_null());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment