From 8bb2c7147979d30a06173fe2e08a456cc4745e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 21 May 2013 16:40:44 +0200
Subject: Improve tests of ENUMERATED

---
 lib/asn1/test/asn1_SUITE_data/EnumExt.asn1 | 63 +++++++++++++++++-------------
 lib/asn1/test/testEnumExt.erl              | 12 +++++-
 2 files changed, 45 insertions(+), 30 deletions(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1 b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
index 9ad1f6299e..3a727e46bb 100644
--- a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
@@ -1,28 +1,35 @@
-EnumExt DEFINITIONS AUTOMATIC TAGS ::=
-BEGIN
-
-Ext ::= ENUMERATED {
-	blue(0),
-	red(1),
-	green(2),
-	...
-}
-
-Ext1 ::= ENUMERATED {
-	blue(0),
-	red(1),
-	green(2),
-	...,
-	orange(7)
-}
-
-Noext ::= ENUMERATED {
-	blue(0),
-	red(1),
-	green(2)
-}
-
-Globalstate ::= ENUMERATED {def(1),com(2),preop(3),oper(4),noop(5),fail(6)}
-
-END
-
+EnumExt DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+Ext ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...
+}
+
+Ext1 ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...,
+	orange(7),
+        black(8),
+	magenta(9)
+}
+
+Noext ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2)
+}
+
+Globalstate ::= ENUMERATED {def(1),com(2),preop(3),oper(4),noop(5),fail(6)}
+
+Seq ::= SEQUENCE {
+   e Ext1,
+   i INTEGER
+}
+
+END
+
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index 0811f20571..8840ed6d2f 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -38,8 +38,7 @@ main(Rule) when Rule =:= per; Rule =:= uper ->
     %% ENUMERATED no extensionmark 
     B64 = <<64>>,
     B64 = roundtrip('Noext', red),
-    ok;
-
+    common();
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
@@ -57,6 +56,15 @@ main(ber) ->
     roundtrip('Globalstate', preop),
     roundtrip('Globalstate', com),
 
+    common().
+
+common() ->
+    roundtrip('Seq', {'Seq',blue,42}),
+    roundtrip('Seq', {'Seq',red,42}),
+    roundtrip('Seq', {'Seq',green,42}),
+    roundtrip('Seq', {'Seq',orange,47}),
+    roundtrip('Seq', {'Seq',black,4711}),
+    roundtrip('Seq', {'Seq',magenta,4712}),
     ok.
 
 roundtrip(Type, Value) ->
-- 
cgit v1.2.3