From 2c59448f7e3726c241719b5952c1685cf6a6313a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 5 Sep 2013 06:31:20 +0200
Subject: asn_SUITE: Fold per_GeneralString/1 into h323test

The per_GeneralString/1 test case compiles MULTIMEDIA-SYSTEM-CONTROL
and then does a single decoding. Save some compilation time by folding
the test into the h323test/1 test case.
---
 lib/asn1/test/asn1_SUITE.erl | 11 +----------
 lib/asn1/test/h323test.erl   |  6 ++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 3ae3ba3c7e..3a591cdc56 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -86,8 +86,7 @@ groups() ->
                     per,
                     ber_other,
 		    der,
-                    h323test,
-                    per_GeneralString]},
+                    h323test]},
        testChoPrim,
        testChoExtension,
        testChoOptional,
@@ -760,14 +759,6 @@ h323test(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     h323test:run(Rule).
 
-per_GeneralString(Config) ->
-    test(Config, fun per_GeneralString/3, [per]).
-per_GeneralString(Config, Rule, Opts) ->
-    asn1_test_lib:compile("MULTIMEDIA-SYSTEM-CONTROL", Config, [Rule|Opts]),
-    UI = [109, 64, 1, 57],
-    {ok, _V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
-                                   'MultimediaSystemControlMessage', UI).
-
 per_open_type(Config) -> test(Config, fun per_open_type/3, [per]).
 per_open_type(Config, Rule, Opts) ->
     asn1_test_lib:compile("OpenType", Config, [Rule|Opts]),
diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index 426ae16994..dfc1173d68 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -28,6 +28,7 @@ run(_Rules)  -> ok.
 run() ->
     alerting(),
     connect(),
+    general_string(),
     ok.
 
 dec_alerting() ->
@@ -59,6 +60,11 @@ connect() ->
     ByteList = lists:flatten(B),
     {ok,V} = asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
 
+general_string() ->
+    Type = 'MultimediaSystemControlMessage',
+    UI = <<109,64,1,57>>,
+    {ok, _V} = 'MULTIMEDIA-SYSTEM-CONTROL':decode(Type, UI).
+
 hexstr2bytes([D1,D2|T]) ->
     [dig2num(D1)*16+dig2num(D2)|hexstr2bytes(T)];
 hexstr2bytes([]) ->
-- 
cgit v1.2.3