Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 53 insertions, 88 deletions

diff --git a/lib/asn1/test/testDef.erl b/lib/asn1/test/testDef.erl
index 48f0015008..eae8e6d378 100644
--- a/lib/asn1/test/testDef.erl
+++ b/lib/asn1/test/testDef.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. 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/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% 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.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -21,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Def1',{bool0, 
 		bool1 = asn1_DEFAULT, 
@@ -37,81 +38,45 @@
 		bool33 = asn1_DEFAULT}).
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
-							    bool1 = true,
-							    bool2 = true,
-							    bool3 = true}),
-    ?line {ok,{'Def1',true,true,true,true}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true}),
-    ?line {ok,{'Def1',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
-							    bool2 = false}),
-    ?line {ok,{'Def1',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = false,
-							    bool3 = false}),
-    ?line {ok,{'Def1',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes14)),
-    
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = false,
-							    bool11 = false,
-							    bool12 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = true,
-							    bool13 = false}),
-    ?line {ok,{'Def2',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = true,
-							    bool11 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = false,
-							    bool12 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes24)),
-    
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool30 = false,
-							    bool31 = false,
-							    bool32 = false,
-							    bool33 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('Def','Def3',#'Def3'{}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool30 = true}),
-    ?line {ok,{'Def3',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool32 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool33 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes35)),
-    
-    
-    
+    roundtrip('Def1', #'Def1'{bool0=true,bool1=true,bool2=true,bool3=true}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=true},
+	      #'Def1'{bool0=true,bool1=false,bool2=false,bool3=false}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=true,bool2=false},
+	      #'Def1'{bool0=true,bool1=false,bool2=false,bool3=false}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=false,bool3=false},
+	      #'Def1'{bool0=false,bool1=false,bool2=false,bool3=false}),
+
+    roundtrip('Def2', #'Def2'{bool10=false,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=true,bool13=false},
+	      #'Def2'{bool10=true,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=true,bool11=false,bool13=false},
+	      #'Def2'{bool10=true,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=false,bool12=false,bool13=false},
+	      #'Def2'{bool10=false,bool11=false,bool12=false,bool13=false}),
+
+    roundtrip('Def3', #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool30=true},
+	      #'Def3'{bool30=true,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool32=false},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool33=false},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
     ok.
+
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('Def', Type, Value, ExpectedValue).