Update from Upstream

1 files changed, 116 insertions, 2 deletions

diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index 841e29f..8d6429d 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -7,12 +7,17 @@
          all/0,
          flag_coverdata_written/1,
          config_coverdata_written/1,
+         config_coverdata_overridden_name_written/1,
          basic_extra_src_dirs/1,
          release_extra_src_dirs/1,
          root_extra_src_dirs/1,
          index_written/1,
          flag_verbose/1,
-         config_verbose/1]).
+         config_verbose/1,
+         excl_mods_and_apps/1,
+         coverdata_is_reset_on_write/1,
+         flag_min_coverage/1,
+         config_min_coverage/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -32,10 +37,13 @@ init_per_testcase(_, Config) ->
 
 all() ->
     [flag_coverdata_written, config_coverdata_written,
+     config_coverdata_overridden_name_written,
      basic_extra_src_dirs, release_extra_src_dirs,
      root_extra_src_dirs,
      index_written,
-     flag_verbose, config_verbose].
+     flag_verbose, config_verbose,
+     excl_mods_and_apps, coverdata_is_reset_on_write,
+     flag_min_coverage, config_min_coverage].
 
 flag_coverdata_written(Config) ->
     AppDir = ?config(apps, Config),
@@ -67,6 +75,21 @@ config_coverdata_written(Config) ->
 
     true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "eunit.coverdata"])).
 
+config_coverdata_overridden_name_written(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("cover_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {cover_enabled, true}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit", "--cover_export_name=test_name"],
+                                   {ok, [{app, Name}]}),
+
+    true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "test_name.coverdata"])).
+
 basic_extra_src_dirs(Config) ->
     AppDir = ?config(apps, Config),
 
@@ -206,3 +229,94 @@ config_verbose(Config) ->
                                    {ok, [{app, Name}]}),
 
     true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "index.html"])).
+
+excl_mods_and_apps(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    Name3 = rebar_test_utils:create_random_name("excludeme_"),
+    Vsn3 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name3]), Name3, Vsn3, [kernel, stdlib]),
+
+    Mod1 = list_to_atom(Name1),
+    Mod2 = list_to_atom(Name2),
+    Mod3 = list_to_atom(Name3),
+    RebarConfig = [{erl_opts, [{d, some_define}]},
+                   {cover_excl_mods, [Mod2]},
+                   {cover_excl_apps, [Name3]}],
+
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit", "--cover"],
+                                   {ok, [{app, Name1}, {app, Name2}, {app, Name3}]}),
+
+    {file, _} = cover:is_compiled(Mod1),
+    false = cover:is_compiled(Mod2),
+    false = cover:is_compiled(Mod3).
+
+coverdata_is_reset_on_write(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("coverdata_is_reset_on_write_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {cover_enabled, true}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit"],
+                                   {ok, [{app, Name}]}),
+
+    Res = lists:map(fun(M) -> cover:analyse(M) end, cover:modules()),
+    Ok = lists:foldl(fun({ok, R}, Acc) -> R ++ Acc end, [], Res),
+    [] = lists:filter(fun({_, {0,_}}) -> false; (_) -> true end, Ok).
+
+flag_min_coverage(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("min_cover_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}],
+    ?assertMatch({ok, _},
+                 rebar_test_utils:run_and_check(
+                   Config, RebarConfig,
+                   ["do", "eunit", "--cover", ",", "cover", "--min_coverage=5"],
+                   return)),
+
+    ?assertMatch({error,{rebar_prv_cover,{min_coverage_failed,{65,_}}}},
+                 rebar_test_utils:run_and_check(
+                   Config, RebarConfig,
+                   ["do", "eunit", "--cover", ",", "cover", "--min_coverage=65"],
+                   return)),
+    ok.
+
+config_min_coverage(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("cover_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    RebarConfig1 = [{erl_opts, [{d, some_define}]}, {cover_opts, [{min_coverage,5}]}],
+    ?assertMatch({ok, _},
+                 rebar_test_utils:run_and_check(
+                   Config, RebarConfig1,
+                   ["do", "eunit", "--cover", ",", "cover"],
+                   return)),
+
+    RebarConfig2 = [{erl_opts, [{d, some_define}]}, {cover_opts, [{min_coverage,65}]}],
+    ?assertMatch({error,{rebar_prv_cover,{min_coverage_failed,{65,_}}}},
+                 rebar_test_utils:run_and_check(
+                   Config, RebarConfig2,
+                   ["do", "eunit", "--cover", ",", "cover"],
+                   return)),
+    ok.