Refactored based on feedback

Author: kieraneglin

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -19,7 +19,7 @@ defmodule ExUnit.CLIFormatter do
       width: get_terminal_width(),
       slowest: opts[:slowest],
       slowest_modules: opts[:slowest_modules],
-      test_counter: %{},
+      test_counter: %{test: 0},
       test_timings: [],
       failure_counter: 0,
       skipped_counter: 0,
@@ -37,7 +37,7 @@ defmodule ExUnit.CLIFormatter do
   def handle_cast({:suite_finished, times_us}, config) do
     test_type_counts = collect_test_type_counts(config)
 
-    if test_type_counts > 0 && config.excluded_counter == test_type_counts do
+    if test_type_counts == 0 && config.excluded_counter > 0 do
       IO.puts(invalid("All tests have been excluded.", config))
     end
 
@@ -256,6 +256,10 @@ defmodule ExUnit.CLIFormatter do
     end
   end
 
+  defp update_test_counter(test_counter, %{state: {:excluded, _reason}}) do
+    test_counter
+  end
+
   defp update_test_counter(test_counter, %{tags: %{test_type: test_type}}) do
     Map.update(test_counter, test_type, 1, &(&1 + 1))
   end
@@ -384,21 +388,16 @@ defmodule ExUnit.CLIFormatter do
     IO.puts(formatted)
   end
 
-  defp format_test_type_counts(config) do
-    config.test_counter
+  defp format_test_type_counts(%{test_counter: test_counter} = _config) do
+    test_counter
     |> Enum.sort()
     |> Enum.map(fn {test_type, count} ->
-      executed_count = calculate_executed_test_count(test_type, count, config.excluded_counter)
-      plural_rule = ExUnit.plural_rule(test_type |> to_string())
-      type_pluralized = pluralize(executed_count, test_type, plural_rule)
+      type_pluralized = pluralize(count, test_type, ExUnit.plural_rule(test_type |> to_string()))
 
-      "#{executed_count} #{type_pluralized}, "
+      "#{count} #{type_pluralized}, "
     end)
   end
 
-  defp calculate_executed_test_count(:test, count, excluded_counter), do: count - excluded_counter
-  defp calculate_executed_test_count(_test_type, count, _excluded_counter), do: count
-
   defp collect_test_type_counts(%{test_counter: test_counter} = _config) do
     Enum.reduce(test_counter, 0, fn {_, count}, acc ->
       acc + count

lib/ex_unit/test/ex_unit_test.exs

@@ -508,6 +508,7 @@ defmodule ExUnitTest do
 
     # Empty because it is already loaded
     {result, output} = run_with_filter([exclude: :module], [])
+
     assert result == %{failures: 0, skipped: 0, excluded: 2, total: 2}
     assert output =~ "\n0 tests, 0 failures, 2 excluded\n"