From f4f112c673f87ac7c07928f0681c1d5433491ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 25 Feb 2014 15:16:34 +0100
Subject: Clean up reporting of errors in IMPORTS

---
 lib/asn1/test/asn1_SUITE.erl                    |  8 ++++----
 lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1  | 14 +++----------
 lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 |  7 +++++++
 lib/asn1/test/asn1_SUITE_data/ImportsFrom3.asn1 |  4 ++++
 lib/asn1/test/error_SUITE.erl                   | 27 ++++++++++++++++++++++++-
 5 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
 create mode 100644 lib/asn1/test/asn1_SUITE_data/ImportsFrom3.asn1

(limited to 'lib/asn1/test')

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index d438300596..782217ed2d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -813,10 +813,10 @@ testExport(Config) ->
 testImport(Config) ->
     test(Config, fun testImport/3).
 testImport(Config, Rule, Opts) ->
-    {error, _} = asn1ct:compile(filename:join(?config(data_dir, Config),
-                                              "ImportsFrom"),
-                                [Rule, {outdir, ?config(priv_dir, Config)}
-                                 |Opts]).
+    Files = ["ImportsFrom","ImportsFrom2","ImportsFrom3"],
+    asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
+    42 = 'ImportsFrom':i(),
+    ok.
 
 testMegaco(Config) -> test(Config, fun testMegaco/3).
 testMegaco(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
index 896a35d627..32b8f75dde 100644
--- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
@@ -1,16 +1,8 @@
-ImportsFrom DEFINITIONS ::=
-
+ImportsFrom DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
-IMPORTS
-Type1, Type2, Type3
-FROM RemoteFile1 objid
-val1, val2, val3
-FROM RemoteFile2;
-
-objid OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) remote-operations(4) notation(0)}
-
-LocalType ::= INTEGER
+IMPORTS Int FROM ImportsFrom2;
+i Int ::= 42
 
 END
 
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
new file mode 100644
index 0000000000..b0c29d24ae
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
@@ -0,0 +1,7 @@
+ImportsFrom2 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+IMPORTS Int FROM ImportsFrom3;
+
+LocalDef ::= OCTET STRING
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom3.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom3.asn1
new file mode 100644
index 0000000000..ca27b20697
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom3.asn1
@@ -0,0 +1,4 @@
+ImportsFrom3 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+  Int ::= INTEGER (0..63)
+END
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
index 09327f6e12..8a0414708d 100644
--- a/lib/asn1/test/error_SUITE.erl
+++ b/lib/asn1/test/error_SUITE.erl
@@ -20,7 +20,7 @@
 -module(error_SUITE).
 -export([suite/0,all/0,groups/0,
 	 already_defined/1,bitstrings/1,enumerated/1,
-	 instance_of/1,integers/1,objects/1,values/1]).
+	 imports/1,instance_of/1,integers/1,objects/1,values/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -34,6 +34,7 @@ groups() ->
       [already_defined,
        bitstrings,
        enumerated,
+       imports,
        instance_of,
        integers,
        objects,
@@ -119,6 +120,30 @@ enumerated(Config) ->
     } = run(P, Config),
     ok.
 
+imports(Config) ->
+    Ext = 'ExternalModule',
+    ExtP = {Ext,
+	    <<"ExternalModule DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	      "END\n">>},
+    ok = run(ExtP, Config),
+
+    M = 'Imports',
+    P = {M,
+	 <<"Imports DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "IMPORTS NotDefined FROM ExternalModule\n"
+	   "X FROM UndefinedModule objid\n"
+	   "Y, Z FROM UndefinedModule2;\n"
+	   "objid OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) remote-operations(4)\n"
+	   "    notation(0)}\n"
+	   "END\n">>},
+    {error,[{structured_error,{M,2},asn1ct_check,
+	     {undefined_import,'NotDefined','ExternalModule'}},
+	    {structured_error,{M,3},asn1ct_check,{undefined_import,'X','UndefinedModule'}},
+	    {structured_error,{M,4},asn1ct_check,{undefined_import,'Y','UndefinedModule2'}},
+	    {structured_error,{M,4},asn1ct_check,{undefined_import,'Z','UndefinedModule2'}}
+	   ]} = run(P, Config),
+    ok.
+
 instance_of(Config) ->
     M = 'InstanceOf',
     P = {M,
-- 
cgit v1.2.3