From d2989f33c435e1ec2b788772c5e4a77835ec5e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 12 Nov 2012 09:54:47 +0100
Subject: Remove tests for the obsolete {TypeName,Value} notation

As a preparation for removing obsolete back-ends, remove tests
for the {TypeName,Value} notation to avoid having those test cases
fail.
---
 lib/asn1/test/testSeqOf.erl             |  9 ---------
 lib/asn1/test/testTypeValueNotation.erl | 31 +++----------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index 0c0bbc3e66..89c9375c62 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -198,15 +198,6 @@ main(Rules) ->
     
     ?line {ok,Bytes51} = asn1_wrapper:encode('SeqOf','SeqEmp',#'SeqEmp'{seq1 = [#'Empty'{}]}),
     ?line {ok,{'SeqEmp',[{'Empty'}]}} = asn1_wrapper:decode('SeqOf','SeqEmp',lists:flatten(Bytes51)),
-    
-    case Rules of
-	ber ->
-	    ?line {ok,Bytes52} = asn1_wrapper:encode('SeqOfEnum','SeqOfEnum',
-					     {'SeqOfEnum',[{'Enum',a},{'Enum',b}]}),
-	    ?line {ok,[a,b]} = asn1_wrapper:decode('SeqOfEnum','SeqOfEnum',
-					   lists:flatten(Bytes52));
-	_ -> ok
-    end,
 
     %% tests of OTP-4590
     case Rules of
diff --git a/lib/asn1/test/testTypeValueNotation.erl b/lib/asn1/test/testTypeValueNotation.erl
index cd5223ef23..59f7385f08 100644
--- a/lib/asn1/test/testTypeValueNotation.erl
+++ b/lib/asn1/test/testTypeValueNotation.erl
@@ -21,11 +21,9 @@
 
 -export([main/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
 -record('Seq', {octstr, int, bool, enum, bitstr, null, oid, vstr}).
 
-main(Rule, Option) ->
+main(_Rule, _Option) ->
     Value1 = #'Seq'{octstr = [1, 2, 3, 4],
                     int = 12,
                     bool = true,
@@ -34,28 +32,5 @@ main(Rule, Option) ->
                     null = 'NULL',
                     oid = {1, 2, 55},
                     vstr = "Hello World"},
-    Value2 = #'Seq'{octstr = {'OctStr', [1, 2, 3, 4]},
-                    int = {'Int', 12},
-                    bool = {'Bool', true},
-                    enum = {'Enum', a},
-                    bitstr = {'BitStr', [1, 0, 1, 0]},
-                    null = {'Null', 'NULL'},
-                    oid = {'OId', {1, 2, 55}},
-                    vstr = {'VStr', "Hello World"}},
-    main(Rule, Option, Value1, Value2).
-
-%% Value2 will fail for ber_bin_v2, per_bin with nifs (optimize) and uper_bin
-main(ber_bin_v2, _,          Value1, Value2) -> encode_fail(Value1, Value2);
-main(per_bin,    [optimize], Value1, Value2) -> encode_fail(Value1, Value2);
-main(uper_bin,   [],         Value1, Value2) -> encode_fail(Value1, Value2);
-main(_,          _,          Value1, Value2) -> encode_normal(Value1, Value2).
-
-encode_normal(Value1, Value2) ->
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value2),
-    {ok, Value1}     = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
-
-encode_fail(Value1, Value2) ->
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
-    {error, _Reason} = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value2),
-    {ok, Value1}     = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
+    {ok, Bytes} = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
+    {ok, Value1} = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
-- 
cgit v1.2.3