From 1aad483e439410aeee17c966991754f65f6852a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 25 Feb 2013 09:24:41 +0100
Subject: UPER: Fix bug in encoding/decoding of default types

The wrong backend was used.
---
 lib/asn1/test/asn1_SUITE_data/InfObj.asn | 55 +++++++++++++++++++++++---------
 lib/asn1/test/testInfObj.erl             |  7 +++-
 2 files changed, 46 insertions(+), 16 deletions(-)

(limited to 'lib/asn1/test')

diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 0a437e12df..abd49e64f3 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -39,21 +39,6 @@ RANAP-PDU ::= CHOICE {
 
 CLASS2 ::= RANAP-ELEMENTARY-PROCEDURE
 
-MY-CLASS ::= CLASS {
-    &integerValue      INTEGER UNIQUE,
-    &booleanValue      BOOLEAN,
-    &stringValue       PrintableString
-    }
-
-myobject MY-CLASS ::= {
-    &integerValue      12,
-    &booleanValue      TRUE,
-    &stringValue       "hejsan"
-    }
-MyObjectSet MY-CLASS ::= {
-    myobject
-    }
-
 InitiatingMessage  ::= SEQUENCE {
     procedureCode  RANAP-ELEMENTARY-PROCEDURE.&procedureCode	({RANAP-ELEMENTARY-PROCEDURES}),
     criticality	RANAP-ELEMENTARY-PROCEDURE.&criticality		({RANAP-ELEMENTARY-PROCEDURES}{@procedureCode}),
@@ -148,6 +133,46 @@ id-Iu-Release3				INTEGER ::= 3
 id-Iu-Release4				INTEGER ::= 4
 id-Iu-Release5				INTEGER ::= 5
 
+--
+-- MY-CLASS
+--
+
+Seq ::= SEQUENCE {
+    int INTEGER,
+    str OCTET STRING
+}
+
+MY-CLASS ::= CLASS {
+    &Count             DEFAULT INTEGER,
+    &integerValue      INTEGER UNIQUE,
+    &booleanValue      BOOLEAN,
+    &stringValue       PrintableString
+}
+
+myobject MY-CLASS ::= {
+    &integerValue      12,
+    &booleanValue      TRUE,
+    &stringValue       "hejsan"
+}
+
+myotherobject MY-CLASS ::= {
+    &Count             Seq,
+    &integerValue      42,
+    &booleanValue      FALSE,
+    &stringValue       "hoppsan"
+}
+
+MyObjectSet MY-CLASS ::= {
+    myobject | myotherobject
+}
+
+MyPdu ::= SEQUENCE {
+    count MY-CLASS.&Count ({MyObjectSet}{@int}),
+    int   MY-CLASS.&integerValue ({MyObjectSet}),
+    bool  MY-CLASS.&booleanValue ({MyObjectSet}{@int}),
+    str   MY-CLASS.&stringValue ({MyObjectSet}{@int})
+}
+
 END
 
 
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index 6318bf44b5..97e6a9aaa9 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -46,7 +46,12 @@ main(_Erule) ->
 				   first=13,
 				   second=true}},
 
-    roundtrip('RANAPextract1', 'InitiatingMessage2', Val3).
+    roundtrip('RANAPextract1', 'InitiatingMessage2', Val3),
+
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',42,12,false,"string"}),
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',{'Seq',1023,"hello"},
+				  42,true,"longer string"}).
+
 
 roundtrip(M, T, V) ->
     {ok,Enc} = M:encode(T, V),
-- 
cgit v1.2.3