From ad114f6137ed989e2994ed89cd82e13202fba117 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Jul 2023 01:13:25 +0200 Subject: [PATCH] Fixed unit tests (error messages now have the message class attached) --- src/pya/unit_tests/pyaTests.cc | 4 ++-- src/rba/unit_tests/rbaTests.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pya/unit_tests/pyaTests.cc b/src/pya/unit_tests/pyaTests.cc index c10a6d817..4e907c18f 100644 --- a/src/pya/unit_tests/pyaTests.cc +++ b/src/pya/unit_tests/pyaTests.cc @@ -45,7 +45,7 @@ TEST (basic) try { pya::PythonInterpreter::instance ()->eval_string ("raise Exception(\"an error\")"); } catch (tl::ScriptError &ex) { - EXPECT_EQ (ex.basic_msg (), std::string ("an error")); + EXPECT_EQ (ex.basic_msg (), std::string ("Exception: an error")); EXPECT_EQ (ex.cls () == std::string ("exceptions.Exception") || ex.cls () == std::string ("Exception"), true); err = true; } @@ -56,7 +56,7 @@ TEST (basic) try { pya::PythonInterpreter::instance ()->eval_string ("Quatsch"); } catch (tl::ScriptError &ex) { - EXPECT_EQ (ex.basic_msg (), std::string ("name 'Quatsch' is not defined")); + EXPECT_EQ (ex.basic_msg (), std::string ("NameError: name 'Quatsch' is not defined")); EXPECT_EQ (ex.cls () == std::string ("exceptions.NameError") || ex.cls () == std::string ("NameError"), true); err = true; } diff --git a/src/rba/unit_tests/rbaTests.cc b/src/rba/unit_tests/rbaTests.cc index 3051abe23..7bea46066 100644 --- a/src/rba/unit_tests/rbaTests.cc +++ b/src/rba/unit_tests/rbaTests.cc @@ -45,7 +45,7 @@ TEST (basic) try { rba::RubyInterpreter::instance ()->eval_string ("raise \"an error\""); } catch (tl::Exception &ex) { - EXPECT_EQ (std::string (ex.msg (), 0, 8), std::string ("an error")); + EXPECT_EQ (std::string (ex.msg (), 0, 22), std::string ("RuntimeError: an error")); err = true; } @@ -56,8 +56,8 @@ TEST (basic) try { rba::RubyInterpreter::instance ()->eval_string ("Quatsch"); } catch (tl::Exception &ex) { - EXPECT_EQ (std::string (ex.msg (), 0, 30) == std::string ("uninitialized constant Quatsch") || - std::string (ex.msg (), 0, 38) == std::string ("uninitialized constant Object::Quatsch"), + EXPECT_EQ (std::string (ex.msg (), 0, 41) == std::string ("NameError: uninitialized constant Quatsch") || + std::string (ex.msg (), 0, 49) == std::string ("NameError: uninitialized constant Object::Quatsch"), true); err = true; }