diff options
| author | Dan Gudmundsson <[email protected]> | 2014-11-27 13:41:00 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-12 11:40:28 +0100 |
| commit | a008779a0d8b602a56c63d333f692f51e0b64994 (patch) | |
| tree | aff89e6295d2f5199f90a78e2677e50c995bbbba /lib/asn1/test | |
| parent | 411f2d2c42ab86872186c0ea015f2e76a84c30ab (diff) | |
| download | otp-a008779a0d8b602a56c63d333f692f51e0b64994.tar.gz otp-a008779a0d8b602a56c63d333f692f51e0b64994.tar.bz2 otp-a008779a0d8b602a56c63d333f692f51e0b64994.zip | |
asn1: Rewrite error handling for EXPORT to new style
Diffstat (limited to 'lib/asn1/test')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/IllegalExport.asn1 | 7 | ||||
| -rw-r--r-- | lib/asn1/test/error_SUITE.erl | 21 |
3 files changed, 14 insertions, 21 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index 79925f9ddf..3b6e18c46d 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -142,7 +142,6 @@ groups() -> testMergeCompile, testobj, testDeepTConstr, - testExport, testImport, testDER, testDEFAULT, @@ -827,12 +826,6 @@ testDeepTConstr(Config, Rule, Opts) -> [Rule|Opts]), testDeepTConstr:main(Rule). -testExport(Config) -> - {error, _} = - asn1ct:compile(filename:join(?config(data_dir, Config), - "IllegalExport"), - [{outdir, ?config(case_dir, Config)}]). - testImport(Config) -> test(Config, fun testImport/3). testImport(Config, Rule, Opts) -> diff --git a/lib/asn1/test/asn1_SUITE_data/IllegalExport.asn1 b/lib/asn1/test/asn1_SUITE_data/IllegalExport.asn1 deleted file mode 100644 index 1b5e42ad3c..0000000000 --- a/lib/asn1/test/asn1_SUITE_data/IllegalExport.asn1 +++ /dev/null @@ -1,7 +0,0 @@ -IllegalExport DEFINITIONS ::= -BEGIN -EXPORTS T, KalleAnka; - -T ::= INTEGER - -END diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl index db997d569d..c386fd6d31 100644 --- a/lib/asn1/test/error_SUITE.erl +++ b/lib/asn1/test/error_SUITE.erl @@ -21,7 +21,7 @@ -export([suite/0,all/0,groups/0, already_defined/1,bitstrings/1, classes/1,constraints/1,enumerated/1, - imports/1,instance_of/1,integers/1,objects/1, + imports_exports/1,instance_of/1,integers/1,objects/1, object_field_extraction/1,oids/1,rel_oids/1, object_sets/1,parameterization/1, syntax/1,table_constraints/1,values/1]). @@ -40,7 +40,7 @@ groups() -> classes, constraints, enumerated, - imports, + imports_exports, instance_of, integers, objects, @@ -170,7 +170,7 @@ enumerated(Config) -> } = run(P, Config), ok. -imports(Config) -> +imports_exports(Config) -> Ext = 'ExternalModule', ExtP = {Ext, <<"ExternalModule DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n" @@ -189,23 +189,30 @@ imports(Config) -> M = 'Imports', P = {M, <<"Imports DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n" + "EXPORTS\n" + " T, UndefinedType;\n" + "IMPORTS\n" " NotDefined, Existing, Int, NonExistingImport\n" " 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" + "T ::= INTEGER\n" "END\n">>}, {error,[{structured_error,{M,3},asn1ct_check, + {undefined_export, 'UndefinedType'}}, + {structured_error,{M,5},asn1ct_check, {undefined_import,'NonExistingImport',Ext}}, - {structured_error,{M,3},asn1ct_check, - {undefined_import,'NotDefined',Ext}}, {structured_error,{M,5},asn1ct_check, + {undefined_import,'NotDefined',Ext}}, + {structured_error,{M,7},asn1ct_check, {undefined_import,'X','UndefinedModule'}}, - {structured_error,{M,6},asn1ct_check, + {structured_error,{M,8},asn1ct_check, {undefined_import,'Y','UndefinedModule2'}}, - {structured_error,{M,6},asn1ct_check, + {structured_error,{M,8},asn1ct_check, {undefined_import,'Z','UndefinedModule2'}} ]} = run(P, Config), ok. |