aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/test/testINSTANCE_OF.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-10-04 13:07:28 +0200
committerErlang/OTP <[email protected]>2010-10-04 13:07:28 +0200
commitc8122ff35f5e0cc4af7f8ea7fd63af126f245ffd (patch)
tree23b95141897fc637234487c0926a83b230b58263 /lib/asn1/test/testINSTANCE_OF.erl
parent5ddf44bb91540fd88e604f077d71482c40185cd8 (diff)
parentc6f303fba85322f74a4e8165046924ebf2fd1eed (diff)
downloadotp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.tar.gz
otp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.tar.bz2
otp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.zip
Merge branch 'kenneth/asn1/enc_extaddgrp/OTP-8866' into maint-r13
* kenneth/asn1/enc_extaddgrp/OTP-8866: Add additional test to cover this correction correct the encoding of ExtensionAdditionGroup temp Add support for ExtensionAdditionGroup notation in nested types as well
Diffstat (limited to 'lib/asn1/test/testINSTANCE_OF.erl')
-rw-r--r--lib/asn1/test/testINSTANCE_OF.erl22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index 2a3a5c333b..7f5b634e06 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
%%
%%
@@ -73,17 +73,17 @@ test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4},
test_encdec(Erule,Res) ->
{error,{Erule,Res}}.
-wrap(ber,Int) when list(Int) ->
+wrap(ber,Int) when is_list(Int) ->
binary_to_list(list_to_binary(Int));
-wrap(per,Int) when list(Int) ->
+wrap(per,Int) when is_list(Int) ->
binary_to_list(list_to_binary(Int));
-wrap(ber_bin,Int) when list(Int) ->
+wrap(ber_bin,Int) when is_list(Int) ->
list_to_binary(Int);
-wrap(ber_bin_v2,Int) when list(Int) ->
+wrap(ber_bin_v2,Int) when is_list(Int) ->
list_to_binary(Int);
-wrap(per_bin,Int) when list(Int) ->
+wrap(per_bin,Int) when is_list(Int) ->
list_to_binary(Int);
-wrap(uper_bin,Int) when list(Int) ->
+wrap(uper_bin,Int) when is_list(Int) ->
list_to_binary(Int);
wrap(_,Int) ->
Int.