aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLev Walkin <vlm@lionet.info>2005-03-29 19:05:37 +0000
committerLev Walkin <vlm@lionet.info>2005-03-29 19:05:37 +0000
commit29a82196bb857d9e07490dea5bb2d1710a6855ad (patch)
treead071d4aeca0dbbf721458a03740c9961939ecfb
parent7ef83a454f6b1e6d7b7f4f85d5968346e93cbc4c (diff)
deeper validation;
-rw-r--r--tests/42-real-life-OK.asn1.-PR11
-rw-r--r--tests/66-ref-simple-OK.asn1.-P2
-rw-r--r--tests/70-xer-test-OK.asn1.-P4
-rw-r--r--tests/73-circular-OK.asn1.-P2
4 files changed, 10 insertions, 9 deletions
diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR
index 304eac2b..af71d814 100644
--- a/tests/42-real-life-OK.asn1.-PR
+++ b/tests/42-real-life-OK.asn1.-PR
@@ -58,8 +58,9 @@ memb_varsets_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
}
if((size >= 1)) {
- /* Constraint check succeeded */
- return 0;
+ /* SEQUENCE validation code is the same as SET */
+ /* Perform validation of the inner elements */
+ return SET_OF_constraint(td, list, app_errlog, app_key);
} else {
_ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)",
@@ -395,8 +396,8 @@ memb_vset_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
}
if((size >= 1)) {
- /* Constraint check succeeded */
- return 0;
+ /* Perform validation of the inner elements */
+ return SET_OF_constraint(td, list, app_errlog, app_key);
} else {
_ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)",
@@ -630,7 +631,7 @@ accept_as_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
- /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
+ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
}
static void
diff --git a/tests/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P
index 0259fc09..d269a7a1 100644
--- a/tests/66-ref-simple-OK.asn1.-P
+++ b/tests/66-ref-simple-OK.asn1.-P
@@ -111,7 +111,7 @@ SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
- /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
+ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
}
void
diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P
index 0b1bbb36..8186e9af 100644
--- a/tests/70-xer-test-OK.asn1.-P
+++ b/tests/70-xer-test-OK.asn1.-P
@@ -432,7 +432,7 @@ enum_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
- /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
+ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
}
static void
@@ -836,7 +836,7 @@ Member_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
- /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
+ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
}
static void
diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P
index 49b3fcfc..0def1eee 100644
--- a/tests/73-circular-OK.asn1.-P
+++ b/tests/73-circular-OK.asn1.-P
@@ -683,7 +683,7 @@ EnumType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
- /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
+ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
}
void