From 739ad067cf8775558fade616353f44d49a13a487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 28 Apr 2014 12:25:22 +0200
Subject: Correct OCTET STRING default when legacy_erlang_types is active

The default value for an OCTET STRING when legacy_erlang_types was
active would be a binary instead of a list.
---
 lib/asn1/test/testSeqSetDefaultVal.erl | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'lib/asn1/test')

diff --git a/lib/asn1/test/testSeqSetDefaultVal.erl b/lib/asn1/test/testSeqSetDefaultVal.erl
index b54391d63f..4b106e72e3 100644
--- a/lib/asn1/test/testSeqSetDefaultVal.erl
+++ b/lib/asn1/test/testSeqSetDefaultVal.erl
@@ -107,7 +107,7 @@ main(Rule, Opts) ->
 	{ber,[der]} ->
 	    der(),
 	    case 'Default':legacy_erlang_types() of
-		false -> ok;
+		false -> der_new_types();
 		true -> der_legacy()
 	    end;
 	{_,_} ->
@@ -242,13 +242,6 @@ der() ->
 	      #'SetInts'{a=1,b=-1,c=three,d=1},
 	      #'SetInts'{a=1,b=-1,c=3,d=1}),
 
-
-    roundtrip(<<48,0>>, 'SeqOS',
-	      #'SeqOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
-
-    roundtrip(<<49,0>>, 'SetOS',
-	      #'SetOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
-
     roundtrip(<<48,0>>,
 	      'SeqOI',
 	      #'SeqOI'{a={1,2,14,15},
@@ -397,9 +390,24 @@ der() ->
 		       c=[second], d = <<>>}),
     ok.
 
+der_new_types() ->
+    io:put_chars("Performing DER-specific tests with new types..."),
+
+    roundtrip(<<48,0>>, 'SeqOS',
+	      #'SeqOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
+
+    roundtrip(<<49,0>>, 'SetOS',
+	      #'SetOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
+    ok.
+
 der_legacy() ->
     io:put_chars("Performing DER-specific tests with legacy types..."),
 
+    roundtrip(<<48,0>>, 'SeqOS',
+	      #'SeqOS'{a=[172],b=[16#A8,16#A0],c='NULL'}),
+    roundtrip(<<49,0>>, 'SetOS',
+	      #'SetOS'{a=[172],b=[16#A8,16#A0],c='NULL'}),
+
     roundtrip(<<48,0>>,
 	      'SeqBS',
 	      #'SeqBS'{a=2#0110101,
-- 
cgit v1.2.3