From d11615cf24964b45e7fc488acaa03b54cbe16af3 Mon Sep 17 00:00:00 2001 From: Zandra Hird Date: Thu, 28 May 2015 10:04:00 +0200 Subject: Revert "Add ?assertReceive(Guard, Timeout) macro to eunit" This reverts commit e56cf8d9846e51ae88fa72c8b0992d81da6fd7d5. --- lib/eunit/doc/overview.edoc | 15 --------------- lib/eunit/include/eunit.hrl | 20 -------------------- 2 files changed, 35 deletions(-) diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc index eb60f673ef..df716cdeea 100644 --- a/lib/eunit/doc/overview.edoc +++ b/lib/eunit/doc/overview.edoc @@ -572,21 +572,6 @@ Examples:
`assertNotMatch(GuardedPattern, Expr)'
The inverse case of assertMatch, for convenience.
-
`assertReceive(GuardedPattern, Timeout)'
-
Waits for up to the `Timeout' milliseconds for a message to arrive -in the mailbox of the current process that matches against the -`GuardedPattern' if testing is enabled. -If no message matching the `GuardedPattern' is received in the specified -`Timeout' interval, the assertion fails and an informative exception will -be generated; see the `assert' macro for further details. `GuardedPattern' -can be anything that you can write on the left hand side of the `->' -symbol in a case-clause, except that it cannot contain comma-separated -guard tests. - -Examples: -```?assertReceive(done, 1000)''' -```?assertReceive(Bin when byte_size(Bin) > 10, 1000)''' -
`assertEqual(Expect, Expr)'
Evaluates the expressions `Expect' and `Expr' and compares the results for equality, if testing is enabled. If the values are not diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl index 8a829396ec..53d291430d 100644 --- a/lib/eunit/include/eunit.hrl +++ b/lib/eunit/include/eunit.hrl @@ -163,26 +163,6 @@ -define(_assertNot(BoolExpr), ?_assert(not (BoolExpr))). -%% This is mostly a convenience which gives more detailed reports. -%% Note: Guard is a guarded pattern, and can not be used for value. --ifdef(NOASSERT). --define(assertReceive(Guard, Timeout), ok). --else. --define(assertReceive(Guard, Timeout), - begin - ((fun () -> - receive (Guard) -> ok - after Timeout -> erlang:error({assertReceive_timedout, - [{module, ?MODULE}, - {line, ?LINE}, - {pattern, (??Guard)}, - {timeout, __V}]}) - end - end)()) - end). --endif. --define(_assertReceive(Guard, Timeout), ?_test(?assertReceive(Guard, Timeout))). - %% This is mostly a convenience which gives more detailed reports. %% Note: Guard is a guarded pattern, and can not be used for value. -ifdef(NOASSERT). -- cgit v1.2.3