Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases

They use the same ASN.1 spec.

4 files changed, 25 insertions, 66 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 4f653c4aea..b1b08aa9f9 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -49,12 +49,12 @@ MODULES= \
 	testSeqOptional \
 	testSeq2738 \
 	testSeqPrim \
+	testSeqSetIndefinite \
 	testSeqTag \
 	testSeqTypeRefCho \
 	testSeqTypeRefPrim \
 	testSeqTypeRefSeq \
 	testSeqTypeRefSet \
-	testSeqIndefinite \
 	testSeqOf \
 	testSeqOfIndefinite \
 	testSeqOfCho \
@@ -70,7 +70,6 @@ MODULES= \
 	testSetTypeRefPrim \
 	testSetTypeRefSeq \
 	testSetTypeRefSet \
-	testSetIndefinite \
 	testChoiceIndefinite \
 	testSetOf \
 	testSetOfCho \
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index adeede5253..8a17620531 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -130,9 +130,7 @@ groups() ->
        % Uses 'Constructed'
        {group, [], [constructed,
                     ber_decode_error]},
-       % Uses 'SeqSetIndefinite'
-       {group, [], [testSeqIndefinite,
-                    testSetIndefinite]},
+       testSeqSetIndefinite,
        testChoiceIndefinite,
        per_open_type,
        testInfObjectClass,
@@ -721,21 +719,11 @@ testConstraints(Config, Rule, Opts) ->
 	_ -> testConstraints:refed_NNL_name(Rule)
     end.
 
-testSeqIndefinite(Config) ->
-    test(Config, fun testSeqIndefinite/3, [ber]).
-
-testSeqIndefinite(Config, Rule, Opts) ->
-    asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
-    testSeqIndefinite:main(Rule).
-
-
-testSetIndefinite(Config) ->
-    test(Config, fun testSetIndefinite/3, [ber]).
-
-testSetIndefinite(Config, Rule, Opts) ->
+testSeqSetIndefinite(Config) ->
+    test(Config, fun testSeqSetIndefinite/3, [ber]).
+testSeqSetIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
-    testSetIndefinite:main(Rule).
-
+    testSeqSetIndefinite:main().
 
 testChoiceIndefinite(Config) ->
     test(Config, fun testChoiceIndefinite/3, [ber]).
diff --git a/lib/asn1/test/testSeqIndefinite.erl b/lib/asn1/test/testSeqSetIndefinite.erl
index 9a9150a9a8..6becf84e77 100644
--- a/lib/asn1/test/testSeqIndefinite.erl
+++ b/lib/asn1/test/testSeqSetIndefinite.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% 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
@@ -17,15 +17,16 @@
 %% %CopyrightEnd%
 %%
 %%
--module(testSeqIndefinite).
-
--export([main/1]).
+-module(testSeqSetIndefinite).
+-export([main/0]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(per) -> ok;
-main(ber) ->
-    
+main() ->
+    seq_indefinite(),
+    set_indefinite().
+
+seq_indefinite() ->
     %% normal encoding
     B = <<48,20,1,1,255,48,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161>>,
     %% indefinite length encoding
@@ -34,7 +35,18 @@ main(ber) ->
     V = {'SeqS3',true,{'SeqS3_seqS3',true,-81531198},-80221023},
     {ok,V} = 'SeqSetIndefinite':decode('SeqS3', B),
     {ok,V} = 'SeqSetIndefinite':decode('SeqS3', Bi),
+
     ok.
 
+set_indefinite() ->
+    %% normal encoding
+    B = <<49,20,1,1,255,49,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161>>,
+    %% indefinite length encoding
+    Bi = <<49,22,1,1,255,49,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161>>,
 
+    %% the value which is encoded
+    V = {'SetS3',true,{'SetS3_setS3',true,-81531198},-80221023},
+    {ok,V} = 'SeqSetIndefinite':decode('SetS3', B),
+    {ok,V} = 'SeqSetIndefinite':decode('SetS3', Bi),
 
+    ok.
diff --git a/lib/asn1/test/testSetIndefinite.erl b/lib/asn1/test/testSetIndefinite.erl
deleted file mode 100644
index cbcebd333d..0000000000
--- a/lib/asn1/test/testSetIndefinite.erl
+++ /dev/null
@@ -1,40 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2012. 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(testSetIndefinite).
-
--export([main/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-
-main(per) -> ok;
-main(ber) ->
-    
-    %% normal encoding
-    B = <<49,20,1,1,255,49,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161>>,
-    %% indefinite length encoding
-    Bi = <<49,22,1,1,255,49,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161>>,
-
-    %% the value which is encoded
-    V = {'SetS3',true,{'SetS3_setS3',true,-81531198},-80221023},
-    {ok,V} = 'SeqSetIndefinite':decode('SetS3', B),
-    {ok,V} = 'SeqSetIndefinite':decode('SetS3', Bi),
-
-    ok.