From 63ac33729f3df5b7cb1789f78365777d0a6034ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 26 Jan 2017 07:40:30 +0100
Subject: Add additional tests of Extension Addition Groups

---
 lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1 | 11 +++++++
 lib/asn1/test/testSeqExtension.erl              | 38 +++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
index 5fda19303a..e866ef2f4f 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
@@ -48,6 +48,17 @@ SeqExt6 ::= SEQUENCE
   [[ i6 [106] INTEGER, i7 [107] INTEGER ]]
 }
 
+SeqExt7 ::= SEQUENCE
+{
+  -- The spaces between the ellipsis and the comma will prevent them
+  -- from being removed.
+  ...     ,
+  [[ a INTEGER (0..65535) OPTIONAL,
+     b OCTET STRING OPTIONAL,
+     c BOOLEAN
+  ]]
+}
+
 SeqExt1X ::= XSeqExt1 
 SeqExt2X ::= XSeqExt2 
 
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index f7885cb002..be1d1c2490 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -31,6 +31,7 @@
 -record('SeqExt4',{bool, int}).
 -record('SeqExt5',{name, shoesize}).
 -record('SeqExt6',{i1,i2,i3,i4,i5,i6,i7}).
+-record('SeqExt7',{a=asn1_NOVALUE,b=asn1_NOVALUE,c}).
 -record('SuperSeq',{s1,s2,s3,s4,s5,s6,i}).
 
 main(Erule, DataDir, Opts) ->
@@ -45,8 +46,35 @@ main(Erule, DataDir, Opts) ->
     roundtrip('SeqExt4', #'SeqExt4'{bool=true,int=12345}),
     roundtrip('SeqExt4', #'SeqExt4'{bool=false,int=123456}),
 
+    case Erule of
+        ber ->
+            %% BER currently does not handle Extension Addition Groups
+            %% correctly.
+            ok;
+        _ ->
+            v_roundtrip3('SeqExt5', #'SeqExt5'{name=asn1_NOVALUE,
+                                               shoesize=asn1_NOVALUE},
+                         Erule, #{per=>"00",
+                                  uper=>"00"}),
+            v_roundtrip3('SeqExt7', #'SeqExt7'{c=asn1_NOVALUE},
+                         Erule, #{per=>"00",
+                                  uper=>"00"})
+    end,
     roundtrip('SeqExt5', #'SeqExt5'{name = <<"Arne">>,shoesize=47}),
 
+    v_roundtrip3('SeqExt7', #'SeqExt7'{c=false},
+                 Erule, #{per=>"80800100",
+                          uper=>"80808000"}),
+    v_roundtrip3('SeqExt7', #'SeqExt7'{c=true},
+                 Erule, #{per=>"80800120",
+                          uper=>"80809000"}),
+    v_roundtrip3('SeqExt7', #'SeqExt7'{a=777,b = <<16#AA>>,c=false},
+                 Erule, #{per=>"808006C0 030901AA 00",
+                          uper=>"8082E061 20354000"}),
+    v_roundtrip3('SeqExt7', #'SeqExt7'{a=8888,c=false},
+                 Erule, #{per=>"80800480 22B800",
+                          uper=>"8081C457 0000"}),
+
     %% Encode a value with this version of the specification.
     BigInt = 128638468966,
     SuperSeq = #'SuperSeq'{s1=#'SeqExt1'{},
@@ -106,6 +134,7 @@ main(Erule, DataDir, Opts) ->
     v_roundtrip2(Erule, 'SeqExt130',
 		 list_to_tuple(['SeqExt130'|
 				lists:duplicate(129, asn1_NOVALUE)++[199]])),
+
     ok.
 
 roundtrip(Type, Value) ->
@@ -118,6 +147,15 @@ v_roundtrip2(Erule, Type, Value) ->
 roundtrip2(Type, Value) ->
     asn1_test_lib:roundtrip_enc('SeqExtension2', Type, Value).
 
+v_roundtrip3(Type, Value, Erule, Map) ->
+    case maps:find(Erule, Map) of
+        {ok,Hex} ->
+            Encoded = asn1_test_lib:hex_to_bin(Hex),
+            Encoded = asn1_test_lib:roundtrip_enc('SeqExtension', Type, Value);
+        error ->
+            asn1_test_lib:roundtrip('SeqExtension', Type, Value)
+    end.
+
 v(ber, 'SeqExt66') ->  "30049F41 017D";
 v(per, 'SeqExt66') ->  "C0420000 00000000 00004001 FA";
 v(uper, 'SeqExt66') -> "D0800000 00000000 00101FA0";
-- 
cgit v1.2.3