From c5a2b7f759cc84b7abfe0a36b10465439ccf2fa5 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 14 Feb 2015 17:03:43 -0500 Subject: [PATCH] Unit Tests - Fixed exected error for on-add-misbehave5. This highlights a potential error in the test suite with the one failing test. --- src/Hooks.cpp | 16 +++++----------- test/hooks.on-add.t | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/Hooks.cpp b/src/Hooks.cpp index 08fd5eeac..e9bf7f2a6 100644 --- a/src/Hooks.cpp +++ b/src/Hooks.cpp @@ -452,33 +452,27 @@ void Hooks::assertValidJSON (const std::vector & input) const if (((json::object*)root)->_data.find ("description") == ((json::object*)root)->_data.end ()) { - context.error ("Hook Error: JSON Object missing 'description' attribute: '{\"description\":\"...\",...}'."); + context.error ("Hook Error: JSON Object missing 'description' attribute."); throw 0; } if (((json::object*)root)->_data.find ("uuid") == ((json::object*)root)->_data.end ()) { - context.error ("Hook Error: JSON Object missing 'uuid' attribute: '{\"uuid\":\"...\",...}'."); + context.error ("Hook Error: JSON Object missing 'uuid' attribute."); throw 0; } } catch (const std::string& e) { - if (_debug >= 1) - context.error ("Hook Error: JSON syntax error in: " + *i); - - if (_debug >= 2) - context.error ("Hook Error: JSON " + e); - + context.error ("Hook Error: JSON syntax error in: " + *i); + context.error ("Hook Error: JSON " + e); throw 0; } catch (...) { - if (_debug >= 1) - context.error ("Hook Error: JSON fails to parse: " + *i); - + context.error ("Hook Error: JSON failed to parse: " + *i); throw 0; } } diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t index 74f14f880..469205d4d 100755 --- a/test/hooks.on-add.t +++ b/test/hooks.on-add.t @@ -121,7 +121,7 @@ class TestHooksOnAdd(TestCase): self.t.hooks.add_default(hookname, log=True) code, out, err = self.t.runError(("add", "foo")) - self.assertIn("ERROR SYNTACTICALLY WRONG JSON", err) + self.assertIn("Hook Error: JSON syntax error in: {\"}", err) self.t.hooks[hookname].assertTriggered() self.t.hooks[hookname].assertTriggeredCount(1) self.t.hooks[hookname].assertExitcode(0) @@ -134,7 +134,7 @@ class TestHooksOnAdd(TestCase): self.t.hooks.add_default(hookname, log=True) code, out, err = self.t.runError(("add", "foo")) - self.assertIn("Hook Error: JSON Object missing 'uuid' attribute:", err) + self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err) self.t.hooks[hookname].assertTriggered() self.t.hooks[hookname].assertTriggeredCount(1) self.t.hooks[hookname].assertExitcode(0)