Allow expectation as parameter of custom message.

Simplifies the code, because custom and default message use the same code.
Merge pull request #750 from stefanbirkner/expected-exception

Allow expectation as parameter of custom message.