1 files changed, 26 insertions, 50 deletions
diff --git a/lib/asn1/test/testSetDefault.erl b/lib/asn1/test/testSetDefault.erl
index 8aa205e0f0..055dc6cecf 100644
--- a/lib/asn1/test/testSetDefault.erl
+++ b/lib/asn1/test/testSetDefault.erl
@@ -26,58 +26,34 @@
 -record('SetDef1',{bool1 = asn1_DEFAULT, int1, set1 = asn1_DEFAULT}).
 -record('SetDef2',{set2 = asn1_DEFAULT, bool2, int2}).
 -record('SetDef3',{bool3 = asn1_DEFAULT, set3 = asn1_DEFAULT, int3 = asn1_DEFAULT}).
--record('SetIn',{boolIn, intIn}).
+-record('SetIn', {boolIn = asn1_NOVALUE, intIn = 12}).
 
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetDefault','SetDef1',#'SetDef1'{bool1 = true,
-							int1 = 15,
-							set1 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef1',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetDefault','SetDef1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('SetDefault','SetDef1',#'SetDef1'{int1 = 15}), 
-    ?line {ok,{'SetDef1',true,15,{'SetIn',asn1_NOVALUE,12}}} = 
-	asn1_wrapper:decode('SetDefault','SetDef1',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetDefault','SetDef2',#'SetDef2'{bool2 = true,
-							int2 = 15,
-							set2 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef2',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('SetDefault','SetDef2',#'SetDef2'{bool2 = true,
-									 int2 = 15}), 
-    ?line {ok,{'SetDef2',{'SetIn',asn1_NOVALUE,12},true,15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetDefault','SetDef3',#'SetDef3'{bool3 = true,
-							int3 = 15,
-							set3 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef3',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('SetDefault','SetDef3',#'SetDef3'{int3 = 15}), 
-    ?line {ok,{'SetDef3',true,{'SetIn',asn1_NOVALUE,12},15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef3',lists:flatten(Bytes32)),
-    
-    
-    
-    
+    roundtrip('SetDef1',
+	      #'SetDef1'{bool1=true,int1=15,
+			 set1=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetDef1',
+	      #'SetDef1'{bool1=asn1_DEFAULT,int1=15,set1=asn1_DEFAULT},
+	      #'SetDef1'{bool1=true,int1=15,set1=#'SetIn'{}}),
 
-    
-    
+    roundtrip('SetDef2',
+	      #'SetDef2'{set2=#'SetIn'{boolIn=true,intIn=66},
+			 bool2=true,int2=15}),
+    roundtrip('SetDef2',
+	      #'SetDef2'{set2=asn1_DEFAULT,bool2=true,int2=15},
+	      #'SetDef2'{set2=#'SetIn'{},bool2=true,int2=15}),
+
+    roundtrip('SetDef3',
+	      #'SetDef3'{bool3=true,set3=#'SetIn'{boolIn=true,intIn=66},
+			 int3=15}),
+    roundtrip('SetDef3',
+	      #'SetDef3'{bool3=asn1_DEFAULT,set3=asn1_DEFAULT,int3=15},
+	      #'SetDef3'{bool3=true,set3=#'SetIn'{},int3=15}),
     ok.
+
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetDefault', Type, Value, ExpectedValue).