Simplify running of asn1 app tests

Instead of initiating running of the app tests for asn1 from
asn1_SUITE, put the tests in asn1_app_SUITE and let it take care
of itself.

While we are it, eliminate 'export_all' in the new module and
use lists:keyfind/3 instead of lists:keysearch/3.

4 files changed, 31 insertions, 96 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 40575e8a2f..278c80852b 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -114,8 +114,7 @@ MODULES= \
 	testImporting \
 	testExtensibilityImplied \
 	asn1_test_lib \
-	asn1_app_test \
-	asn1_appup_test \
+	asn1_app_SUITE \
 	asn1_SUITE \
 	error_SUITE \
 	syntax_SUITE
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 92e637617e..00e9871aca 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -41,8 +41,6 @@ suite() ->
 all() ->
     [{group, compile},
      {group, parallel},
-     {group, app_test},
-     {group, appup_test},
 
      % TODO: Investigate parallel running of these:
      testComment,
@@ -64,10 +62,6 @@ groups() ->
        ber_optional,
        tagdefault_automatic]},
 
-     {app_test, [], [{asn1_app_test, all}]},
-
-     {appup_test, [], [{asn1_appup_test, all}]},
-
      {parallel, Parallel,
       [cover,
        xref,
@@ -1280,7 +1274,7 @@ xref(_Config) ->
     xref:set_default(s, [{verbose,false},{warnings,false},{builtins,true}]),
     Test = filename:dirname(code:which(?MODULE)),
     {ok,_PMs} = xref:add_directory(s, Test),
-    UnusedExports = "X - XU - asn1_appup_test - asn1_app_test - \".*_SUITE\" : Mod",
+    UnusedExports = "X - XU - \".*_SUITE\" : Mod",
     case xref:q(s, UnusedExports) of
 	{ok,[]} ->
 	    ok;
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_SUITE.erl
index 028322f555..c089a7267c 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_SUITE.erl
@@ -21,23 +21,24 @@
 %%----------------------------------------------------------------------
 %% Purpose: Verify the application specifics of the asn1 application
 %%----------------------------------------------------------------------
--module(asn1_app_test).
-
--compile(export_all).
+-module(asn1_app_SUITE).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
+         init_per_suite/1,end_per_suite/1,
+         appup/1,fields/1,modules/1,export_all/1,app_depend/1]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all() -> 
-    [fields, modules, exportall, app_depend].
+all() ->
+    [appup, fields, modules, export_all, app_depend].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,12 +66,15 @@ is_app(App) ->
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+appup(Config) when is_list(Config) ->
+    ok = test_server:appup_test(asn1).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 fields(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
+    AppFile = key1find(app_file, Config),
     Fields = [vsn, description, modules, registered, applications],
     case check_fields(Fields, AppFile, []) of
 	[] ->
@@ -96,10 +100,9 @@ check_field(Name, AppFile, Missing) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 modules(Config) when is_list(Config) ->
-    AppFile  = key1search(app_file, Config),
-    Mods     = key1search(modules, AppFile),
+    AppFile  = key1find(app_file, Config),
+    Mods     = key1find(modules, AppFile),
     EbinList = get_ebin_mods(asn1),
     case missing_modules(Mods, EbinList, []) of
 	[] ->
@@ -112,10 +115,9 @@ modules(Config) when is_list(Config) ->
 	    ok;
 	Extra ->
 	    check_asn1ct_modules(Extra)
-%	    throw({error, {extra_modules, Extra}})
     end,
     {ok, Mods}.
-	    
+
 get_ebin_mods(App) ->
     LibDir  = code:lib_dir(App),
     EbinDir = filename:join([LibDir,"ebin"]),
@@ -166,10 +168,9 @@ extra_modules(Mods, [Mod|Ebins], Extra) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%% .
-exportall(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
-    Mods    = key1search(modules, AppFile),
+export_all(Config) when is_list(Config) ->
+    AppFile = key1find(app_file, Config),
+    Mods    = key1find(modules, AppFile),
     check_export_all(Mods).
 
 
@@ -180,10 +181,10 @@ check_export_all([Mod|Mods]) ->
 	{'EXIT', {undef, _}} ->
 	    check_export_all(Mods);
 	O ->
-            case lists:keysearch(options, 1, O) of
+            case lists:keyfind(options, 1, O) of
                 false ->
                     check_export_all(Mods);
-                {value, {options, List}} ->
+                {options, List} ->
                     case lists:member(export_all, List) of
                         true ->
 			    throw({error, {export_all, Mod}});
@@ -193,13 +194,12 @@ check_export_all([Mod|Mods]) ->
             end
     end.
 
-	    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 app_depend(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
-    Apps    = key1search(applications, AppFile),
+    AppFile = key1find(app_file, Config),
+    Apps    = key1find(applications, AppFile),
     check_apps(Apps).
 
 
@@ -220,10 +220,10 @@ check_apps([App|Apps]) ->
 fail(Reason) ->
     exit({suite_failed, Reason}).
 
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
+key1find(Key, L) ->
+    case lists:keyfind(Key, 1, L) of
+	false ->
 	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
+	{Key, Value} ->
 	    Value
     end.
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
deleted file mode 100644
index 54540e53cc..0000000000
--- a/lib/asn1/test/asn1_appup_test.erl
+++ /dev/null
@@ -1,58 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the application specifics of the asn1 application
-%%----------------------------------------------------------------------
--module(asn1_appup_test).
--compile(export_all).
--include_lib("common_test/include/ct.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() -> 
-    [appup].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-    
-
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-appup() ->
-    [{doc, "perform a simple check of the asn1 appup file"}].
-appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(asn1).