Merge pull request #2951 from ferd/bump-eunit-formatters

Bump eunit_formatters to 0.6.0

Author: ferd

apps/rebar/rebar.config

@@ -12,7 +12,7 @@
         {relx,             "4.10.0"},
         {cf,               "0.3.1"},
         {cth_readable,     "1.6.1"},
-        {eunit_formatters, "0.5.0"}]}.
+        {eunit_formatters, "0.6.0"}]}.
 
 {post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)",
                escriptize,

vendor/eunit_formatters/hex_metadata.config

@@ -1,15 +1,13 @@
-{<<"name">>,<<"eunit_formatters">>}.
-{<<"version">>,<<"0.5.0">>}.
-{<<"requirements">>,#{}}.
 {<<"app">>,<<"eunit_formatters">>}.
-{<<"maintainers">>,[<<"Sean Cribbs">>,<<"Tristan Sloughter">>]}.
-{<<"precompiled">>,false}.
+{<<"build_tools">>,[<<"rebar3">>]}.
 {<<"description">>,<<"Better output for eunit suites">>}.
 {<<"files">>,
- [<<"src/eunit_formatters.app.src">>,<<"LICENSE">>,<<"README.md">>,
-  <<"rebar.config">>,<<"rebar.lock">>,<<"src/binomial_heap.erl">>,
+ [<<"LICENSE">>,<<"README.md">>,<<"rebar.config">>,<<"rebar.lock">>,<<"src">>,
+  <<"src/binomial_heap.erl">>,<<"src/eunit_formatters.app.src">>,
   <<"src/eunit_progress.erl">>]}.
 {<<"licenses">>,[<<"Apache2">>]}.
 {<<"links">>,
  [{<<"Github">>,<<"https://github.com/seancribbs/eunit_formatters">>}]}.
-{<<"build_tools">>,[<<"rebar3">>]}.
+{<<"name">>,<<"eunit_formatters">>}.
+{<<"requirements">>,[]}.
+{<<"version">>,<<"0.6.0">>}.

vendor/eunit_formatters/rebar.config

@@ -1,3 +1,2 @@
 %% Dogfooding
-{erl_opts, [{platform_define, "^[0-9]+", namespaced_dicts}]}.
 {eunit_opts, [no_tty, {report, {eunit_progress, [colored, profile]}}]}.

vendor/eunit_formatters/src/binomial_heap.erl

@@ -15,6 +15,8 @@
 %% @doc Binomial heap based on Okasaki 6.2.2
 -module(binomial_heap).
 -export([new/0, insert/2, insert/3, merge/2, delete/1, to_list/1, take/2, size/1]).
+-compile({no_auto_import,[link/2]}).
+
 -record(node,{
           rank = 0    :: non_neg_integer(),
           key         :: term(),

vendor/eunit_formatters/src/eunit_formatters.app.src

@@ -1,6 +1,6 @@
 {application,eunit_formatters,
              [{description,"Better output for eunit suites"},
-              {vsn,"0.5.0"},
+              {vsn,"0.6.0"},
               {applications,[kernel,stdlib,eunit]},
               {env,[]},
               {maintainers,["Sean Cribbs","Tristan Sloughter"]},

vendor/eunit_formatters/src/eunit_progress.erl

@@ -42,14 +42,8 @@
          start/1
         ]).
 
--ifdef(namespaced_dicts).
--type euf_dict() :: dict:dict().
--else.
--type euf_dict() :: dict().
--endif.
-
 -record(state, {
-          status = dict:new() :: euf_dict(),
+          status = #{} :: map(),
           failures = [] :: [[pos_integer()]],
           skips = [] :: [[pos_integer()]],
           timings = binomial_heap:new() :: binomial_heap:binomial_heap(),
@@ -73,12 +67,12 @@ init(Options) ->
 
 handle_begin(group, Data, St) ->
     GID = proplists:get_value(id, Data),
-    Dict = St#state.status,
-    St#state{status=dict:store(GID, orddict:from_list([{type, group}|Data]), Dict)};
+    Status = St#state.status,
+    St#state{status=Status#{ GID => orddict:from_list([{type, group}|Data])}};
 handle_begin(test, Data, St) ->
     TID = proplists:get_value(id, Data),
-    Dict = St#state.status,
-    St#state{status=dict:store(TID, orddict:from_list([{type, test}|Data]), Dict)}.
+    Status = St#state.status,
+    St#state{status=Status#{ TID => orddict:from_list([{type, test}|Data])}}.
 
 handle_end(group, Data, St) ->
     St#state{status=merge_on_end(Data, St#state.status)};
@@ -151,12 +145,10 @@ print_progress_skipped(St) ->
 print_progress_failed(_Exc, St) ->
     print_colored("F", ?RED, St).
 
-merge_on_end(Data, Dict) ->
+merge_on_end(Data, Status) ->
     ID = proplists:get_value(id, Data),
-    dict:update(ID,
-                fun(Old) ->
-                        orddict:merge(fun merge_data/3, Old, orddict:from_list(Data))
-                end, Dict).
+    #{ ID := Old } = Status,
+    Status#{ ID := orddict:merge(fun merge_data/3, Old, orddict:from_list(Data)) }.
 
 merge_data(_K, undefined, X) -> X;
 merge_data(_K, X, undefined) -> X;
@@ -175,7 +167,7 @@ print_failures(#state{failures=Fails}=State) ->
 
 print_failure_fun(#state{status=Status}=State) ->
     fun(Key, Count) ->
-            TestData = dict:fetch(Key, Status),
+            #{ Key := TestData } = Status,
             TestId = format_test_identifier(TestData),
             io:fwrite("  ~p) ~ts~n", [Count, TestId]),
             print_failure_reason(proplists:get_value(status, TestData),
@@ -197,13 +189,14 @@ print_failure_reason({error, Reason}, Output, State) ->
     print_failure_output(5, Output, State).
 
 print_failure_output(_, <<>>, _) -> ok;
+print_failure_output(_, [<<>>], _) -> ok;
 print_failure_output(_, undefined, _) -> ok;
 print_failure_output(Indent, Output, State) ->
     print_colored(indent(Indent, "Output: ~ts", [Output]), ?CYAN, State).
 
 print_assertion_failure({Type, Props}, Stack, Output, State) ->
     FailureDesc = format_assertion_failure(Type, Props, 5),
-    {M,F,A,Loc} = lists:last(Stack),
+    {M,F,A,Loc} = lists:last(prune_trace(Stack)),
     LocationText = io_lib:format("     %% ~ts:~p:in `~ts`", [proplists:get_value(file, Loc),
                                                            proplists:get_value(line, Loc),
                                                            format_function_name(M,F,A)]),
@@ -214,13 +207,19 @@ print_assertion_failure({Type, Props}, Stack, Output, State) ->
     print_failure_output(5, Output, State),
     io:nl().
 
+%% This is a simplified version of eunit_test:prune_trace/2
+prune_trace([Entry | _]) when element(1, Entry) =:= eunit_test ->
+    [Entry];
+prune_trace(Stack) ->
+    lists:takewhile(fun(Entry) -> element(1, Entry) =/= eunit_test end, Stack).
+
 print_pending(#state{skips=[]}) ->
     ok;
 print_pending(#state{status=Status, skips=Skips}=State) ->
     io:nl(),
     io:fwrite("Pending:~n", []),
     lists:foreach(fun(ID) ->
-                          Info = dict:fetch(ID, Status),
+                          #{ ID := Info } = Status,
                           case proplists:get_value(reason, Info) of
                               undefined ->
                                   ok;
@@ -244,7 +243,7 @@ print_pending_reason(Reason0, Data, State) ->
 print_profile(#state{timings=T, status=Status, profile=true}=State) ->
     TopN = binomial_heap:take(10, T),
     TopNTime = abs(lists:sum([ Time || {Time, _} <- TopN ])),
-    TLG = dict:fetch([], Status),
+    #{ [] := TLG } = Status,
     TotalTime = proplists:get_value(time, TLG),
     if TotalTime =/= undefined andalso TotalTime > 0 andalso TopN =/= [] ->
             TopNPct = (TopNTime / TotalTime) * 100,
@@ -258,7 +257,7 @@ print_profile(#state{profile=false}) ->
     ok.
 
 print_timing(#state{status=Status}) ->
-    TLG = dict:fetch([], Status),
+    #{ [] := TLG } = Status,
     Time = proplists:get_value(time, TLG),
     io:nl(),
     io:fwrite("Finished in ~ts~n", [format_time(Time)]),
@@ -288,7 +287,7 @@ print_results(Color, Total, Fail, Skip, Cancel, State) ->
 
 print_timing_fun(#state{status=Status}=State) ->
     fun({Time, Key}) ->
-            TestData = dict:fetch(Key, Status),
+            #{ Key := TestData } = Status,
             TestId = format_test_identifier(TestData),
             io:nl(),
             io:fwrite("  ~ts~n", [TestId]),
@@ -350,11 +349,16 @@ format_assertion_failure(Type, Props, I) when Type =:= assertion_failed
     HasHamcrestProps = ([expected, actual, matcher] -- Keys) =:= [],
     if
         HasEUnitProps ->
-            [indent(I, "Failure/Error: ?assert(~ts)~n", [proplists:get_value(expression, Props)]),
-             indent(I, "  expected: true~n", []),
+            Expected = proplists:get_value(expected, Props),
+            AssertMacro = case Expected of
+                              true -> assert;
+                              false -> assertNot
+                          end,
+            [indent(I, "Failure/Error: ?~p(~ts)~n", [AssertMacro, proplists:get_value(expression, Props)]),
+             indent(I, "  expected: ~p~n", [Expected]),
              case proplists:get_value(value, Props) of
-                 false ->
-                     indent(I, "       got: false", []);
+                 Bool when is_boolean(Bool) ->
+                     indent(I, "       got: ~p", [Bool]);
                  {not_a_boolean, V} ->
                      indent(I, "       got: ~p", [V])
              end];