Merge branch 'bjorn/asn1/optimize-per-encoding' into maint

OTP-11300
OTP-11262

* bjorn/asn1/optimize-per-encoding: (25 commits)
  asn1ct_constucted_per: Directly call asn1ct_gen_per
  Clean up handling of .asn1db files
  PER, UPER: Fix encoding/decoding of open types greater than 16K
  PER, UPER: Optimize table constraints
  PER, UPER: Optimize encoding using an intermediate format
  Refactor decoding of components of SEQUENCE OF / SET OF
  PER,UPER: Get rid of unused 'telltype' argument in decoding functions
  Optimize the generated encode/2 function
  UPER: Optimize complete/1
  Clean up checking of objects
  Improve tests of deep table constraints
  BER: Handle multiple optional SEQUENCE fields with table constraints
  Test OPTIONAL and DEFAULT for open types
  PER/UPER: Fix encoding of an object set with multiple inlined constructs
  Remove broken support for multiple UNIQUE
  Extend the test for parameterized information objects
  asn1_SUITE: Remove off-topic (and slow) smp/1 test case
  SeqOf: Add more tricky SEQUENCE OF tests
  Clean up handling of extension addition groups
  Refactor encoding of REAL
  ...

14 files changed, 422 insertions, 90 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 15b97df972..a3fa4f2968 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -82,6 +82,7 @@ MODULES= \
 	testInfObjectClass \
 	testInfObj \
 	testParameterizedInfObj \
+	testFragmented \
 	testMergeCompile \
 	testMultipleLevels \
 	testDeepTConstr \
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index f00b23a8b2..9a149a495a 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -150,6 +150,7 @@ groups() ->
        per_open_type,
        testInfObjectClass,
        testParameterizedInfObj,
+       testFragmented,
        testMergeCompile,
        testobj,
        testDeepTConstr,
@@ -186,8 +187,7 @@ groups() ->
      {performance, [],
       [testTimer_ber,
        testTimer_per,
-       testTimer_uper,
-       smp]}].
+       testTimer_uper]}].
 
 parallel(Options) ->
     case erlang:system_info(smp_support) andalso
@@ -360,7 +360,8 @@ testPrimStrings_cases(Rule) ->
     testPrimStrings:universal_string(Rule),
     testPrimStrings:bmp_string(Rule),
     testPrimStrings:times(Rule),
-    testPrimStrings:utf8_string(Rule).
+    testPrimStrings:utf8_string(Rule),
+    testPrimStrings:fragmented(Rule).
 
 testPrimExternal(Config) -> test(Config, fun testPrimExternal/3).
 testPrimExternal(Config, Rule, Opts) ->
@@ -452,7 +453,7 @@ testSeqDefault(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqDefault", Config, [Rule|Opts]),
     testSeqDefault:main(Rule).
 
-testSeqExtension(Config) -> test(Config, fun testSeqExtension/3).
+testSeqExtension(Config) -> test(Config, fun testSeqExtension/3, [ber,uper]).
 testSeqExtension(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External",
 			       "SeqExtension",
@@ -830,6 +831,12 @@ testParameterizedInfObj(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     testParameterizedInfObj:main(Config, Rule).
 
+testFragmented(Config) ->
+    test(Config, fun testFragmented/3).
+testFragmented(Config, Rule, Opts) ->
+    asn1_test_lib:compile("Fragmented", Config, [Rule|Opts]),
+    testFragmented:main(Rule).
+
 testMergeCompile(Config) -> test(Config, fun testMergeCompile/3).
 testMergeCompile(Config, Rule, Opts) ->
     Files = ["MS.set.asn", "RANAPSET.set.asn1", "Mvrasn4.set.asn",
@@ -1230,70 +1237,6 @@ ticket_7407(Config) ->
                           [uper, no_final_padding]),
     asn1_test_lib:ticket_7407_code(false).
 
-smp(suite) -> [];
-smp(Config)  ->
-    case erlang:system_info(smp_support) of
-        true ->
-            NumOfProcs = erlang:system_info(schedulers),
-            io:format("smp starting ~p workers\n",[NumOfProcs]),
-
-            Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-            ok = testNBAPsystem:compile(Config, [per]),
-
-            enc_dec(NumOfProcs,Msg,2),
-
-            N = 10000,
-
-            {Time1,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
-            {Time1S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
-
-            ok = testNBAPsystem:compile(Config, [ber]),
-            {Time3,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
-
-            {Time3S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
-
-            {comment,lists:flatten(
-                       io_lib:format(
-                         "Encode/decode time parallell with ~p cores: ~p [microsecs]~n"
-                         "Encode/decode time sequential: ~p [microsecs]",
-                         [NumOfProcs,Time1+Time3,Time1S+Time3S]))};
-        false ->
-            {skipped,"No smp support"}
-    end.
-
-enc_dec(1, Msg, N) ->
-    worker_loop(N, Msg);
-enc_dec(NumOfProcs,Msg, N) ->
-    pforeach(fun(_) ->
-                     worker_loop(N, Msg)
-             end, [I || I <- lists:seq(1,NumOfProcs)]).
-
-worker_loop(0, _Msg) ->
-    ok;
-worker_loop(N, Msg) ->
-    {ok,B}=asn1_wrapper:encode('NBAP-PDU-Discriptions',
-                                     'NBAP-PDU',
-                                     Msg),
-    {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
-                                        'NBAP-PDU',
-                                        B),
-    worker_loop(N - 1, Msg).
-
-
-pforeach(Fun, List) ->
-    pforeach(Fun, List, []).
-pforeach(Fun, [], [{Pid,Ref}|Pids]) ->
-    receive
-        {'DOWN', Ref, process, Pid, normal} ->
-            pforeach(Fun, [], Pids)
-    end;
-pforeach(Fun, [H|T], Pids) ->
-    Pid = spawn(fun() -> Fun(H) end),
-    Ref = erlang:monitor(process, Pid),
-    pforeach(Fun, T, [{Pid, Ref}|Pids]);
-pforeach(_Fun,[],[]) ->
-    ok.
-
 -record('InitiatingMessage',{procedureCode,criticality,value}).
 -record('Iu-ReleaseCommand',{first,second}).
 
diff --git a/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1 b/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1
new file mode 100644
index 0000000000..bfc939737f
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1
@@ -0,0 +1,24 @@
+Fragmented DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+FUNCTION ::= CLASS {
+  &code INTEGER UNIQUE,
+  &b BOOLEAN,
+  &ArgumentType
+}
+
+SS ::= SEQUENCE OF OCTET STRING
+
+val1 FUNCTION ::= {
+  &code 1, &b FALSE, &ArgumentType SS
+}
+
+ObjSet FUNCTION ::= { val1 }
+
+PDU ::= SEQUENCE {
+  code FUNCTION.&code ({ObjSet}),
+  b FUNCTION.&b ({ObjSet}{@code}),
+  arg FUNCTION.&ArgumentType ({ObjSet}{@code})
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 53e5043cb7..880e81c3b1 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -202,7 +202,11 @@ constructed2 CONSTRUCTED-DEFAULT ::= { &id 2, &ok false }
 ConstructedDefaultSet CONSTRUCTED-DEFAULT ::= {
   constructed1 |
   constructed2 |
-  { &id 3, &Type BOOLEAN }
+  { &id 3, &Type BOOLEAN } |
+  { &id 4, &Type SET { a INTEGER, b BIT STRING } } |
+  { &id 5, &Type CHOICE { i INTEGER, b BIT STRING } } |
+  { &id 6, &Type SEQUENCE OF INTEGER (1..16) } |
+  { &id 7, &Type SET OF INTEGER (1..64) }
 }
 
 ConstructedPdu ::= SEQUENCE {
@@ -210,6 +214,47 @@ ConstructedPdu ::= SEQUENCE {
   content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
 }
 
+ConstructedSet ::= SET {
+  id [0] CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content [1] CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+}
+
+-- Test OPTIONAL and DEFAULT
+
+OptionalInSeq ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id}) OPTIONAL
+}
+
+DefaultInSeq ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+          DEFAULT BOOLEAN:TRUE
+}
+
+-- Test more than one optional typefield table constraint in a SEQUENCE.
+
+MULTIPLE-OPTIONALS ::= CLASS {
+   &id INTEGER UNIQUE,
+   &T1,
+   &T2,
+   &T3
+}
+
+multiple-optionals-1 MULTIPLE-OPTIONALS ::=
+   {&id 1, &T1 INTEGER, &T2 BOOLEAN, &T3 OCTET STRING}
+
+Multiple-Optionals-Set MULTIPLE-OPTIONALS ::= {
+   multiple-optionals-1
+}
+
+Multiple-Optionals ::= SEQUENCE {
+   id MULTIPLE-OPTIONALS.&id ({Multiple-Optionals-Set}),
+   t1 [0] MULTIPLE-OPTIONALS.&T1 ({Multiple-Optionals-Set}{@id}) OPTIONAL,
+   t2 [1] MULTIPLE-OPTIONALS.&T2 ({Multiple-Optionals-Set}{@id}) OPTIONAL,
+   t3 [2] MULTIPLE-OPTIONALS.&T3 ({Multiple-Optionals-Set}{@id}) OPTIONAL
+}
+
 END
 
 
diff --git a/lib/asn1/test/asn1_SUITE_data/Param.asn1 b/lib/asn1/test/asn1_SUITE_data/Param.asn1
index b2987a7885..4eff0da781 100644
--- a/lib/asn1/test/asn1_SUITE_data/Param.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/Param.asn1
@@ -88,6 +88,28 @@ POS2 {CONFIG-DATA:obj} ::= OCTET STRING (SIZE(obj.&minLevel .. obj.&maxLevel))
 
 OS2 ::= POS2 {config-data}
 
+--
+-- Test a CLASS without the user-friendly syntax.
+--
+
+CL ::= CLASS {
+  &code INTEGER UNIQUE,
+  &Data
+}
+
+P{T} ::= CHOICE { a INTEGER, b T }
+
+o1 CL ::= {
+   &code 42,
+   &Data P{BOOLEAN}
+}
+
+SetCL CL ::= { o1 }
+
+Scl ::= SEQUENCE {
+    code CL.&code ({SetCL}),
+    data CL.&Data ({SetCL}{@code})
+}
 
 END
 
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
index 888dbe5dd7..670f827f5e 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
@@ -31,7 +31,43 @@ Seq4 ::= SEQUENCE
   seq43 [43] SEQUENCE OF SeqIn DEFAULT {}
 }
 
+Seq5 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (0..3) OF OCTET STRING (SIZE (0..3)),
+  -- If 's' is empty, 'magic' should not be aligned.
+  magic INTEGER (0..127)
+}
+
+Seq6 ::= SEQUENCE {
+  a SEQUENCE OF INTEGER (0..7),
+  b SEQUENCE (SIZE (0..7)) OF INTEGER (0..7),
+  -- 'magic' should never be aligned.
+  magic INTEGER (0..127)
+}
 
+Seq7 ::= SEQUENCE {
+  a SEQUENCE OF INTEGER (1..512),
+  b SEQUENCE (SIZE (0..255)) OF INTEGER (1..512),
+  i INTEGER
+}
+
+Seq8 ::= SEQUENCE {
+    sof SEQUENCE (SIZE (0..3)) OF OCTET STRING (SIZE (3)),
+    -- Not aligned here if the size of 'sof' is zero.
+    i INTEGER (0..127)
+}
+
+Seq9 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (0..3) OF OCTET STRING (SIZE (0..3)),
+  magic INTEGER (0..127)
+}
+
+Seq10 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (1..3) OF OCTET STRING (SIZE (0..3)),
+  magic INTEGER (0..127)
+}
 
 SeqIn ::= SEQUENCE 
 {
@@ -50,9 +86,6 @@ SeqCho ::= SEQUENCE OF CHOICE {bool BOOLEAN,
 
 SeqOfInt ::= SEQUENCE OF INTEGER
 
-
-
-
 SeqEmp ::= SEQUENCE 
 {
   seq1  SEQUENCE OF Empty DEFAULT {}
diff --git a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1 b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
index e2e0a11dc4..b2b2de2f56 100644
--- a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
@@ -58,6 +58,40 @@ Deeper ::= SEQUENCE {
   b  SEQUENCE {ba INTEGER, bb MYCLASS.&Type ({ObjectSet}{@a.s.ab})}
 }
 
+Seq3 ::= SEQUENCE {
+  a SEQUENCE {
+              aa INTEGER,
+	      ab MYCLASS.&id ({ObjectSet})
+    },
+  -- Multiple references from the same SEQUENCE...
+  b SEQUENCE {
+              ba MYCLASS.&Type ({ObjectSet}{@a.ab}),
+              bb MYCLASS.&Result ({ObjectSet}{@a.ab}),
+	      -- ... and references from multiple SEQUENCEs...
+	      bc SEQUENCE {
+	         bca MYCLASS.&Result ({ObjectSet}{@a.ab}),
+		 bcb MYCLASS.&Type ({ObjectSet}{@a.ab})
+              }
+    }
+}
+
+Seq3-Opt ::= SEQUENCE {
+  a SEQUENCE {
+              aa INTEGER,
+	      ab MYCLASS.&id ({ObjectSet})
+    },
+  -- Multiple references from the same SEQUENCE...
+  b SEQUENCE {
+              ba MYCLASS.&Type ({ObjectSet}{@a.ab}) OPTIONAL,
+              bb MYCLASS.&Result ({ObjectSet}{@a.ab}) OPTIONAL,
+	      -- ... and references from multiple SEQUENCEs...
+	      bc SEQUENCE {
+	         bca MYCLASS.&Result ({ObjectSet}{@a.ab}),
+		 bcb MYCLASS.&Type ({ObjectSet}{@a.ab})
+              } OPTIONAL
+    }
+}
+
 -- following from Peter's definitions
 
 
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
index a94a6d95a0..6451f81c01 100644
--- a/lib/asn1/test/error_SUITE.erl
+++ b/lib/asn1/test/error_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(error_SUITE).
 -export([suite/0,all/0,groups/0,
-	 already_defined/1,enumerated/1]).
+	 already_defined/1,enumerated/1,objects/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -30,7 +30,8 @@ all() ->
 
 groups() ->
     [{p,parallel(),[already_defined,
-		    enumerated]}].
+		    enumerated,
+		    objects]}].
 
 parallel() ->
     case erlang:system_info(schedulers) > 1 of
@@ -95,6 +96,48 @@ enumerated(Config) ->
     } = run(P, Config),
     ok.
 
+objects(Config) ->
+    M = 'Objects',
+    P = {M,
+	 <<"Objects DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "  obj1 CL ::= { &wrong 42 }\n"
+	   "  obj2 CL ::= { &wrong 1, &Wrong INTEGER }\n"
+	   "  obj3 CL ::= { &Data OCTET STRING }\n"
+	   "  obj4 SMALL ::= { &code 42 }\n"
+	   "  InvalidSet CL ::= { obj1 }\n"
+
+	   "  CL ::= CLASS {\n"
+	   "    &code INTEGER UNIQUE,\n"
+	   "    &enum ENUMERATED { a, b, c},\n"
+	   "    &Data,\n"
+	   "    &object CL,\n"
+	   "    &Set CL,\n"
+	   "    &vartypevalue &Data,\n"
+	   "    &VarTypeValue &Data\n"
+	   "  }\n"
+
+	   "  SMALL ::= CLASS {\n"
+	   "    &code INTEGER UNIQUE,\n"
+           "    &i INTEGER\n"
+           "  }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{M,2},asn1ct_check,
+       {invalid_fields,[wrong],obj1}},
+      {structured_error,{M,3},asn1ct_check,
+       {invalid_fields,['Wrong',wrong],obj2}},
+      {structured_error,{M,4},asn1ct_check,
+       {missing_mandatory_fields,['Set','VarTypeValue',code,
+				  enum,object,vartypevalue],obj3}},
+      {structured_error,{M,5},asn1ct_check,
+       {missing_mandatory_fields,[i],obj4}},
+      {structured_error,{M,6},asn1ct_check,
+       {invalid_fields,[wrong],'InvalidSet'}}
+     ]
+    } = run(P, Config),
+    ok.
+
 
 
 run({Mod,Spec}, Config) ->
diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index f17dedc043..620b5f3356 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -40,8 +40,7 @@ main(_Erule) ->
 	      {any,"DK"},
 	      {final,"NO"}]}},
 
-    {ok,Bytes1} = 'TConstrChoice':encode('FilterItem', Val1),
-    {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
+    Reason = must_fail('TConstrChoice', 'FilterItem', Val1),
     io:format("Reason: ~p~n~n",[Reason]),
     {ok,Bytes2} = 'TConstrChoice':encode('FilterItem', Val2),
     {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes2),
@@ -70,6 +69,21 @@ main(_Erule) ->
 	       {'Deeper_a',12,
 		{'Deeper_a_s',{2,4},42}},
 	       {'Deeper_b',13,{'Type-object1',14,true}}}),
+
+    roundtrip('TConstr', 'Seq3',
+	      {'Seq3',
+	       {'Seq3_a',42,'TConstr':'id-object1'()},
+	       {'Seq3_b',
+		{'Type-object1',-777,true},
+		12345,
+		{'Seq3_b_bc',12345789,{'Type-object1',-999,true}}}}),
+    roundtrip('TConstr', 'Seq3-Opt',
+	      {'Seq3-Opt',
+	       {'Seq3-Opt_a',42,'TConstr':'id-object1'()},
+	       {'Seq3-Opt_b',
+		{'Type-object1',-777,true},
+		12345,
+		{'Seq3-Opt_b_bc',12345789,{'Type-object1',-999,true}}}}),
     ok.
 
 
@@ -77,3 +91,13 @@ roundtrip(M, T, V) ->
     {ok,E} = M:encode(T, V),
     {ok,V} = M:decode(T, E),
     ok.
+
+%% Either encoding or decoding must fail.
+must_fail(M, T, V) ->
+    case M:encode(T, V) of
+	{ok,E} ->
+	    {error,Reason} = M:decode(T, E),
+	    Reason;
+	{error,Reason} ->
+	    Reason
+    end.
diff --git a/lib/asn1/test/testFragmented.erl b/lib/asn1/test/testFragmented.erl
new file mode 100644
index 0000000000..c391ba8305
--- /dev/null
+++ b/lib/asn1/test/testFragmented.erl
@@ -0,0 +1,42 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+-module(testFragmented).
+
+-export([main/1]).
+
+main(_Erule) ->
+    roundtrip('PDU', {'PDU',1,false,["abc","def"]}),
+    B256 = lists:seq(0, 255),
+    K1 = lists:duplicate(4, B256),
+    K8 = binary_to_list(iolist_to_binary(lists:duplicate(8, K1))),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8,
+				     K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8,
+				     K8,K8,K8,K8,K8,K8,K8,K8]}),
+    ok.
+
+roundtrip(T, V) ->
+    {ok,E} = 'Fragmented':encode(T, V),
+    {ok,V} = 'Fragmented':decode(T, E),
+    ok.
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index c7b19a0cbb..76f216fdad 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -59,13 +59,73 @@ 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],
-	       [false,true,false]}).
+	       [false,true,false]}),
+
+    roundtrip('InfObj', 'OptionalInSeq', {'OptionalInSeq',3,true}),
+    roundtrip('InfObj', 'OptionalInSeq', {'OptionalInSeq',3,asn1_NOVALUE}),
+
+    roundtrip('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,false}),
+    roundtrip('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,true}),
+    {'DefaultInSeq',3,true} =
+	enc_dec('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,asn1_DEFAULT}),
 
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,true,"abc"}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,asn1_NOVALUE,true,"abc"}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,asn1_NOVALUE,"abc"}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,true,asn1_NOVALUE}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}).
 
 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.
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 1dfa52f401..02847e502b 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -86,8 +86,18 @@ param(Erule) ->
 		asn1_wrapper:encode('Param','OS1',[1,2,3,4])
     end,
 
+    roundtrip('Scl', {'Scl',42,{a,9738654}}),
+    roundtrip('Scl', {'Scl',42,{b,false}}),
+    roundtrip('Scl', {'Scl',42,{b,true}}),
+
+    ok.
+
+roundtrip(T, V) ->
+    {ok,Enc} = 'Param':encode(T, V),
+    {ok,V} = 'Param':decode(T, Enc),
     ok.
 
+
 ranap(_Erule) ->    
     PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
     ?line Val2 = 
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index e2322c92a9..1762e34599 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -28,9 +28,46 @@
 -export([bmp_string/1]).
 -export([times/1]).
 -export([utf8_string/1]).
+-export([fragmented/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+fragmented(Rules) ->
+    Lens = fragmented_lengths(),
+    fragmented_octet_string(Rules, Lens),
+    case Rules of
+	per ->
+	    %% NYI.
+	    ok;
+	_ ->
+	    fragmented_strings(Lens)
+    end.
+
+fragmented_strings(Lens) ->
+    Types = ['Ns','Ps','Ps11','Vis','IA5'],
+    [fragmented_strings(Len, Types) || Len <- Lens],
+    ok.
+
+fragmented_strings(Len, Types) ->
+    Str = make_ns_value(Len),
+    [roundtrip(Type, Str) || Type <- Types],
+    ok.
+
+make_ns_value(0) -> [];
+make_ns_value(N) -> [($0 - 1) + random:uniform(10)|make_ns_value(N-1)].
+
+fragmented_lengths() ->
+    K16 = 1 bsl 14,
+    K32 = K16 + K16,
+    K48 = K32 + K16,
+    K64 = K48 + K16,
+    [0,1,14,15,16,17,127,128,
+     K16-1,K16,K16+1,K16+(1 bsl 7)-1,K16+(1 bsl 7),K16+(1 bsl 7)+1,
+     K32-1,K32,K32+1,K32+(1 bsl 7)-1,K32+(1 bsl 7),K32+(1 bsl 7)+1,
+     K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
+     K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
+     K64+K16-1,K64+K16,K64+K16+1].
+
 bit_string(Rules) ->
     
     %%==========================================================
@@ -311,8 +348,6 @@ octet_string(Rules) ->
 	    ok
     end,
 
-    fragmented_octet_string(Rules),
-
     S255 = lists:seq(1, 255),
     Strings = {type,true,"","1","12","345",true,
 	       S255,[$a|S255],[$a,$b|S255],397},
@@ -324,17 +359,7 @@ octet_string(Rules) ->
     p_roundtrip('OsVarStringsExt', ShortenedStrings),
     ok.
 
-fragmented_octet_string(Erules) ->
-    K16 = 1 bsl 14,
-    K32 = K16 + K16,
-    K48 = K32 + K16,
-    K64 = K48 + K16,
-    Lens = [0,1,14,15,16,17,127,128,
-	    K16-1,K16,K16+1,K16+(1 bsl 7)-1,K16+(1 bsl 7),K16+(1 bsl 7)+1,
-	    K32-1,K32,K32+1,K32+(1 bsl 7)-1,K32+(1 bsl 7),K32+(1 bsl 7)+1,
-	    K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
-	    K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
-	    K64+K16-1,K64+K16,K64+K16+1],
+fragmented_octet_string(Erules, Lens) ->
     Types = ['Os','OsFrag','OsFragExt'],
     [fragmented_octet_string(Erules, Types, L) || L <- Lens],
     fragmented_octet_string(Erules, ['FixedOs65536'], 65536),
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index db537b1478..c50cc27f6f 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -83,6 +83,32 @@ main(_Rules) ->
     roundtrip('Seq4', #'Seq4'{seq43=SeqIn3},
 	      #'Seq4'{seq41=[],seq42=[],
 		      seq43=SeqIn3}),
+
+    roundtrip('Seq5', {'Seq5',true,[],77}),
+    roundtrip('Seq5', {'Seq5',true,[""],77}),
+    roundtrip('Seq5', {'Seq5',true,["a"],77}),
+    roundtrip('Seq5', {'Seq5',true,["ab"],77}),
+    roundtrip('Seq5', {'Seq5',true,["abc"],77}),
+
+    roundtrip('Seq6', {'Seq6',[],[],101}),
+    roundtrip('Seq6', {'Seq6',[],[7],101}),
+    roundtrip('Seq6', {'Seq6',[],[1,7],101}),
+    roundtrip('Seq6', {'Seq6',[1],[],101}),
+    roundtrip('Seq6', {'Seq6',[2],[7],101}),
+    roundtrip('Seq6', {'Seq6',[3],[1,7],101}),
+
+    roundtrip('Seq8', {'Seq8',[],37}),
+
+    roundtrip('Seq9', {'Seq9',true,[],97}),
+    roundtrip('Seq9', {'Seq9',true,[""],97}),
+    roundtrip('Seq9', {'Seq9',true,["x"],97}),
+    roundtrip('Seq9', {'Seq9',true,["xy"],97}),
+    roundtrip('Seq9', {'Seq9',true,["xyz"],97}),
+
+    roundtrip('Seq10', {'Seq10',true,[""],97}),
+    roundtrip('Seq10', {'Seq10',true,["a"],97}),
+    roundtrip('Seq10', {'Seq10',true,["a","b"],97}),
+    roundtrip('Seq10', {'Seq10',true,["a","b","c"],97}),
     
     roundtrip('SeqEmp', #'SeqEmp'{seq1=[#'Empty'{}]}),