Skip to content

Commit a7cd364

Browse files
committed
Port custom exceptions to ArgumentError
Those exceptions are not meant to be rescued, so there is no benefit into providing a custom module for them.
1 parent 1b7a734 commit a7cd364

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

lib/ex_unit/lib/ex_unit/callbacks.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ defmodule ExUnit.Callbacks do
757757
raise ArgumentError, "describe name must be a string, got: #{inspect(message)}"
758758

759759
is_map_key(used_describes, message) ->
760-
raise ExUnit.DuplicateDescribeError,
760+
raise ArgumentError,
761761
"describe #{inspect(message)} is already defined in #{inspect(module)}"
762762

763763
true ->

lib/ex_unit/lib/ex_unit/case.ex

+1-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
defmodule ExUnit.DuplicateTestError do
2-
@moduledoc """
3-
Exception raised to indicate two or more tests with the same name.
4-
"""
5-
6-
@typedoc since: "1.16.0"
7-
@type t :: %__MODULE__{message: String.t()}
8-
9-
defexception [:message]
10-
end
11-
12-
defmodule ExUnit.DuplicateDescribeError do
13-
@moduledoc """
14-
Exception raised to indicate two or more `describe` blocks with
15-
the same name.
16-
"""
17-
18-
@typedoc since: "1.16.0"
19-
@type t :: %__MODULE__{message: String.t()}
20-
21-
defexception [:message]
22-
end
23-
241
defmodule ExUnit.Case do
252
@moduledoc """
263
Helpers for defining test cases.
@@ -614,7 +591,7 @@ defmodule ExUnit.Case do
614591
end
615592

616593
if Module.defines?(mod, {name, 1}) do
617-
raise ExUnit.DuplicateTestError, ~s("#{name}" is already defined in #{inspect(mod)})
594+
raise ArgumentError, ~s("#{name}" is already defined in #{inspect(mod)})
618595
end
619596

620597
tags =

lib/ex_unit/test/ex_unit/describe_test.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ defmodule ExUnit.DescribeTest do
8686
message =
8787
~s(describe "some tests" is already defined in ExUnit.DescribeTest.DescribeWithSameNames)
8888

89-
assert_raise ExUnit.DuplicateDescribeError, message, fn ->
89+
assert_raise ArgumentError, message, fn ->
9090
defmodule DescribeWithSameNames do
9191
use ExUnit.Case
9292

lib/ex_unit/test/ex_unit_test.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ defmodule ExUnitTest do
431431
test "raises friendly error for duplicate test names" do
432432
message = ~S("test duplicate" is already defined in ExUnitTest.TestWithSameNames)
433433

434-
assert_raise ExUnit.DuplicateTestError, message, fn ->
434+
assert_raise ArgumentError, message, fn ->
435435
defmodule TestWithSameNames do
436436
use ExUnit.Case
437437

0 commit comments

Comments
 (0)