Merge branch 'bjorn/asn1/clean-up-tests' into maint

* bjorn/asn1/clean-up-tests: (24 commits)
  No longer compile the X420 specs for plain BER
  Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases
  Remove asn1_wrapper
  Eliminate the use of asn1_wrapper
  Simplify tests of CHOICE with OPTIONAL
  asn1_test_lib: Add roundtrip functions and use them everywhere
  Makefile: Release Emakefile to ensure warnings are treated as errors
  Don't allow unused exported functions in test case helpers
  Move out specific tests from asn1_test_lib
  testMegaco: Remove unused exported function msg11/0
  ASN.1 tests: Don't export functions that are only locally called
  Remove unused pem_performance.erl file
  asn1_SUITE: Reinstate test of sub-constraint
  ASN.1 tests: Remove unused choice_extension.erl
  Remove unused compile() functions
  asn1_test_lib: Remove unnecessary loading of a compiled ASN.1 spec
  Slightly clean up testX420
  asn1_SUITE: Combine most tests that use External.asn1
  asn1ct_gen: Clean up process dictionary after generating
  asn1ct_parser2: Clean the process dictionary after parsing
  ...

1 files changed, 10 insertions, 33 deletions

diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index ce411beb92..c855ca3c06 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -18,46 +18,23 @@
 %%
 %%
 -module(testINSTANCE_OF).
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(Erule) ->
+main(_Erule) ->
+    Int = roundtrip('Int', 3),
 
-    ?line {ok,Integer} = asn1_wrapper:encode('INSTANCEOF','Int',3),
-    Int = list_to_binary(Integer),
     ValotherName = {otherName,{'INSTANCE OF',{2,4},Int}},
+    _ = roundtrip('GeneralName', ValotherName),
+
     VallastName1 = {lastName,{'GeneralName_lastName',{2,4},12}},
+    _ = roundtrip('GeneralName', VallastName1),
+
     VallastName2 = {lastName,{'GeneralName_lastName',{2,3,4},
 			      {'Seq',12,true}}},
-    ?line {ok,BytesoN}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',ValotherName),
-    ?line {ok,Res1={otherName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',BytesoN),
-    ?line ok = test_encdec(Erule,Int,Res1),
-
-    ?line {ok,ByteslN1}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',VallastName1),
-    ?line {ok,Res2={lastName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',ByteslN1),
-    ?line test_encdec(Erule,Res2),
-
-    ?line {ok,ByteslN2}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',VallastName2),
-    ?line {ok,Res3={lastName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',ByteslN2),
-    ?line test_encdec(Erule,Res3).
-
-test_encdec(_Erule,Int,{otherName,{'INSTANCE OF',{2,4},Int}}) ->
-    ok;
-test_encdec(Erule,Int,R={otherName,{'INSTANCE OF',{2,4},_Int2}}) ->
-    {error,{Erule,Int,R}}.
+    _ = roundtrip('GeneralName', VallastName2),
+    ok.
 
-test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,4},12}}) ->
-    ok;
-test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4},
-			     {'Seq',12,true}}}) ->
-    ok;
-test_encdec(Erule,Res) ->
-    {error,{Erule,Res}}.
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip_enc('INSTANCEOF', T, V).