1 files changed, 16 insertions, 18 deletions
diff --git a/lib/asn1/test/testDER.erl b/lib/asn1/test/testDER.erl
index 395116bd34..3f74a16797 100644
--- a/lib/asn1/test/testDER.erl
+++ b/lib/asn1/test/testDER.erl
@@ -25,26 +25,24 @@
 
 test() ->
     Val = {'Set',12,{version,214},true},
-    ?line {ok,Bin}=asn1_wrapper:encode('DERSpec','Set',Val),          
-    ?line ok = match_value('Set',Bin),
-    ?line {ok,{'Set',12,{version,214},true}} =
-	asn1_wrapper:decode('DERSpec','Set',Bin),
+    roundtrip_enc('Set', Val, <<49,12,1,1,255,2,2,0,214,161,3,2,1,12>>),
     
-    ValSof = [{version,12},{message,"PrintableString"},{message,"Print"},{version,11}],
-    ?line {ok,BSof} = asn1_wrapper:encode('DERSpec','SetOf',ValSof),
-    ?line ok = match_value('SetOf',BSof),
-    ?line {ok,[{version,11},{version,12},{message,"Print"},{message,"PrintableString"}]} = asn1_wrapper:decode('DERSpec','SetOf',BSof),
+    ValSof = [{version,12},{message,"PrintableString"},
+	      {message,"Print"},{version,11}],
+    ValSofSorted = [{version,11},{version,12},
+		    {message,"Print"},{message,"PrintableString"}],
+    roundtrip_enc('SetOf', ValSof, ValSofSorted,
+		  <<49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,
+		    114,105,110,116,97,98,108,101,83,116,114,105,110,103>>),
 
     ValSO = [{'Seq2',1,true},{'Seq2',120000,false},{'Seq2',3,true}],
-    ?line {ok,SOB} =  asn1_wrapper:encode('DERSpec','SO',ValSO),
-    ?line {ok,ValSO} = asn1_wrapper:decode('DERSpec','SO',SOB).
+    roundtrip('SO', ValSO).
 
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('DERSpec', T, V).
 
-match_value('Set',<<49,12,1,1,255,2,2,0,214,161,3,2,1,12>>) ->
-    ok;
-match_value('Set',[49,12,1,1,255,2,2,0,214,161,3,2,1,12]) ->
-    ok;
-match_value('SetOf',<<49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,114,105,110,116,97,98,108,101,83,116,114,105,110,103>>) -> ok;
-match_value('SetOf',[49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,114,105,110,116,97,98,108,101,83,116,114,105,110,103]) -> ok;
-match_value(_,B) ->
-    {error,B}.
+roundtrip_enc(T, V, Enc) ->
+    Enc = asn1_test_lib:roundtrip_enc('DERSpec', T, V).
+
+roundtrip_enc(T, V, Expected, Enc) ->
+    Enc = asn1_test_lib:roundtrip_enc('DERSpec', T, V, Expected).