Index: test/error_test.cc
===================================================================
--- test/error_test.cc	(revision 108)
+++ test/error_test.cc	(revision 118)
@@ -40,14 +40,6 @@
 }
 
-void no_assertion_exception_disable() {
-  LEMON_ASSERT(true, Exception());
-}
-
 void assertion_text_disable() {
   LEMON_ASSERT(false, "This is a fault message");
-}
-
-void assertion_exception_disable() {
-  LEMON_ASSERT(false, Exception());
 }
 
@@ -58,144 +50,8 @@
 void check_assertion_disable() {
   no_assertion_text_disable();
-  no_assertion_exception_disable();
-  assertion_exception_disable();
   assertion_text_disable();
   fixme_disable();
 }
 #undef LEMON_DISABLE_ASSERTS
-
-
-#define LEMON_ASSERT_ERROR
-#include <lemon/assert.h>
-
-void no_assertion_text_error() {
-  LEMON_ASSERT(true, "This is a fault message");
-}
-
-void no_assertion_exception_error() {
-  LEMON_ASSERT(true, Exception());
-}
-
-void assertion_text_error() {
-  LEMON_ASSERT(false, "This is a fault message");
-}
-
-void assertion_exception_error() {
-  LEMON_ASSERT(false, Exception());
-}
-
-void fixme_error() {
-  LEMON_FIXME("fixme_error() is fixme!");
-}
-
-void check_assertion_error() {
-  no_assertion_text_error();
-  no_assertion_exception_error();
-  try {
-    assertion_exception_error();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-
-  try {
-    assertion_text_error();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-
-  try {
-    fixme_error();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-}
-#undef LEMON_ASSERT_ERROR
-
-#define LEMON_ASSERT_EXCEPTION
-#include <lemon/assert.h>
-
-void no_assertion_text_exception() {
-  LEMON_ASSERT(true, "This is a fault message");
-}
-
-void no_assertion_exception_exception() {
-  LEMON_ASSERT(true, Exception());
-}
-
-void assertion_text_exception() {
-  LEMON_ASSERT(false, "This is a fault message");
-}
-
-void assertion_exception_exception() {
-  LEMON_ASSERT(false, Exception());
-}
-
-void fixme_exception() {
-  LEMON_FIXME("fixme_exception() is fixme!");
-}
-
-void check_assertion_exception() {
-  no_assertion_text_exception();
-  no_assertion_exception_exception();
-  try {
-    assertion_exception_exception();
-    check(false, "Assertion error");
-  } catch (const Exception& e) {
-  }
-
-  try {
-    assertion_text_exception();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-
-  try {
-    assertion_text_exception();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-
-  try {
-    fixme_exception();
-    check(false, "Assertion error");
-  } catch (const AssertionFailedError& e) {
-  }
-}
-#undef LEMON_ASSERT_EXCEPTION
-
-#define LEMON_ASSERT_LOG
-
-#include <lemon/assert.h>
-
-void no_assertion_text_log() {
-  LEMON_ASSERT(true, "This is a fault message");
-}
-
-void no_assertion_exception_log() {
-  LEMON_ASSERT(true, Exception());
-}
-
-void assertion_text_log() {
-  LEMON_ASSERT(false, "This is a fault message");
-}
-
-void assertion_exception_log() {
-  LEMON_ASSERT(false, Exception());
-}
-
-void fixme_log() {
-  LEMON_FIXME("fixme_log() is fixme!");
-}
-
-void check_assertion_log() {
-  no_assertion_text_log();
-  no_assertion_exception_log();
-  std::cerr << "The next 3 failure messages are expected: " << std::endl;
-  assertion_exception_log();
-  assertion_text_log();
-  fixme_log();
-  std::cerr << "End of expected error messages" << std::endl;
-}
-#undef LEMON_ASSERT_LOG
 
 #define LEMON_ASSERT_CUSTOM
@@ -207,15 +63,4 @@
 }
 
-void my_assert_handler(const char*, int, const char*, 
-		       const std::exception&, const char*) {
-  ++cnt;
-}
-
-void my_assert_handler(const char*, int, const char*, 
-		       const std::string&, const char*) {
-  ++cnt;
-}
-
-
 #define LEMON_CUSTOM_ASSERT_HANDLER my_assert_handler
 #include <lemon/assert.h>
@@ -225,14 +70,6 @@
 }
 
-void no_assertion_exception_custom() {
-  LEMON_ASSERT(true, Exception());
-}
-
 void assertion_text_custom() {
   LEMON_ASSERT(false, "This is a fault message");
-}
-
-void assertion_exception_custom() {
-  LEMON_ASSERT(false, Exception());
 }
 
@@ -243,9 +80,7 @@
 void check_assertion_custom() {
   no_assertion_text_custom();
-  no_assertion_exception_custom();
-  assertion_exception_custom();
   assertion_text_custom();
   fixme_custom();
-  check(cnt == 3, "The custom assert handler does not work");
+  check(cnt == 2, "The custom assert handler does not work");
 }
 
@@ -255,7 +90,4 @@
 int main() {
   check_assertion_disable();
-  check_assertion_error();
-  check_assertion_exception();
-  check_assertion_log();
   check_assertion_custom();