From 280c6a1d35f39eb285d4d9e41ffa3e7ae298e41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 2 Jul 2013 07:41:03 +0200
Subject: PER/UPER: Fix encoding of an object set with multiple inlined
 constructs

Also extend the test suite with more tests of inlined constructs
in object sets.
---
 lib/asn1/test/testInfObj.erl | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'lib/asn1/test/testInfObj.erl')

diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index c7b19a0cbb..2b751f7fb7 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -59,6 +59,43 @@ main(_Erule) ->
 	      {'ConstructedPdu',2,{'CONSTRUCTED-DEFAULT_Type',999,false}}),
     roundtrip('InfObj', 'ConstructedPdu',
 	      {'ConstructedPdu',3,true}),
+    {'ConstructedPdu',4,{_,42,<<13:7>>}} =
+	enc_dec('InfObj', 'ConstructedPdu',
+		{'ConstructedPdu',4,{'',42,<<13:7>>}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',5,{i,-250138}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',5,{b,<<13456:15>>}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',6,[]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',6,[10,7,16,1,5,13,12]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',7,[]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',7,[64,1,19,17,35]}),
+
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',1,{'CONSTRUCTED-DEFAULT_Type',-2001,true}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',2,{'CONSTRUCTED-DEFAULT_Type',999,false}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',3,true}),
+    {'ConstructedSet',4,{_,42,<<13:7>>}} =
+	enc_dec('InfObj', 'ConstructedSet',
+		{'ConstructedSet',4,{'',42,<<13:7>>}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',5,{i,-250138}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',5,{b,<<13456:15>>}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',6,[]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',6,[10,7,16,1,5,13,12]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',7,[]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',7,[64,1,19,17,35]}),
 
     roundtrip('InfObj', 'Seq2',
 	      {'Seq2',42,[true,false,false,true],
@@ -69,3 +106,8 @@ roundtrip(M, T, V) ->
     {ok,Enc} = M:encode(T, V),
     {ok,V} = M:decode(T, Enc),
     ok.
+
+enc_dec(M, T, V0) ->
+    {ok,Enc} = M:encode(T, V0),
+    {ok,V} = M:decode(T, Enc),
+    V.
-- 
cgit v1.2.3