diff options
| author | Björn Gustavsson <[email protected]> | 2014-11-12 14:42:00 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-12 11:40:27 +0100 |
| commit | ad5b931714295640ff117d23aeb8f691e9cc8a55 (patch) | |
| tree | 3cbf05b6b3871d6f8c7e2f62afdd4aaadcbc7ae4 /lib/asn1/test/asn1_SUITE_data | |
| parent | 1ba5c4caefe9d44266e8675e6a991280dddffde6 (diff) | |
| download | otp-ad5b931714295640ff117d23aeb8f691e9cc8a55.tar.gz otp-ad5b931714295640ff117d23aeb8f691e9cc8a55.tar.bz2 otp-ad5b931714295640ff117d23aeb8f691e9cc8a55.zip | |
Clean up checking of object sets
Diffstat (limited to 'lib/asn1/test/asn1_SUITE_data')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/InfObj.asn | 10 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/InfObjExtract.asn1 | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn index 2bf1dc0921..aef20451cb 100644 --- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn +++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn @@ -290,20 +290,26 @@ OstSeq1234 ::= ObjectSetTest{ {Ost1234} } OstSeq45 ::= ObjectSetTest{ {Ost45} } OstSeq12345 ::= ObjectSetTest{ {Ost12345} } +OstSeq12Except ::= ObjectSetTest{ {Ost123 EXCEPT ost3} } +OstSeq123Except ::= ObjectSetTest{ {Ost12345 EXCEPT Ost45} } + ExOst1 OBJECT-SET-TEST ::= { ost1, ... } ExOst12 OBJECT-SET-TEST ::= { ost1, ..., ost2 } ExOst123 OBJECT-SET-TEST ::= { ost3, ..., ExOst12 } ---ExOst1234 OBJECT-SET-TEST ::= { ExOst123, ..., ost4 } +ExOst1234 OBJECT-SET-TEST ::= { ExOst123, ..., ost4 } ExOst45 OBJECT-SET-TEST ::= { ost4, ..., ost5 } ExOst12345 OBJECT-SET-TEST ::= { ExOst123, ..., ExOst45 } ExOstSeq1 ::= ObjectSetTest{ {ExOst1} } ExOstSeq12 ::= ObjectSetTest{ {ExOst12} } ExOstSeq123 ::= ObjectSetTest{ {ExOst123} } ---ExOstSeq1234 ::= ObjectSetTest{ {ExOst1234} } +ExOstSeq1234 ::= ObjectSetTest{ {ExOst1234} } ExOstSeq45 ::= ObjectSetTest{ {ExOst45} } ExOstSeq12345 ::= ObjectSetTest{ {ExOst12345} } +ExOstSeq12Except ::= ObjectSetTest{ {ExOst123 EXCEPT ost3} } +ExOstSeq123Except ::= ObjectSetTest{ {ExOst12345 EXCEPT ExOst45} } + ExInlOst1 OBJECT-SET-TEST ::= { { 1 IS BIT STRING }, ... diff --git a/lib/asn1/test/asn1_SUITE_data/InfObjExtract.asn1 b/lib/asn1/test/asn1_SUITE_data/InfObjExtract.asn1 index c70303831e..13981b546d 100644 --- a/lib/asn1/test/asn1_SUITE_data/InfObjExtract.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/InfObjExtract.asn1 @@ -27,6 +27,10 @@ OBJ-SET DATA-CLASS ::= { ... } +SingleElementSet DATA-CLASS ::= { + holder-object-1.&obj +} + holder-object-1 HOLDER-CLASS ::= { OBJ data-object-1 } @@ -83,6 +87,9 @@ DataSeq-4 ::= TestSeq{ {holder-object-5.&ObjSet} } DataSeq-5 ::= TestSeq{ {holder-object-6.&ObjSet} } DataSeq-6 ::= TestSeq{ {holder-object-7.&ObjSet} } +DataSeqSingleSet-1 ::= TestSeq{ {SingleElementSet} } +DataSeqSingleSet-2 ::= TestSeq{ {holder-object-1.&obj} } + -- -- Test ObjectSetFromObjects. -- |