gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Unit Tests

Browse Source 
- Fixed exected error for on-add-misbehave5. This highlights a potential
  error in the test suite with the one failing test.
This commit is contained in:
Paul Beckingham
2015-02-14 17:03:43 -05:00
parent 4213afd408
commit c5a2b7f759
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Hooks.cpp
View File

@@ -452,33 +452,27 @@ void Hooks::assertValidJSON (const std::vector <std::string>& input) const
if (((json::object*)root)->_data.find ("description") == ((json::object*)root)->_data.end ()) 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; throw 0;
} }
if (((json::object*)root)->_data.find ("uuid") == ((json::object*)root)->_data.end ()) 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; throw 0;
} }
} }
catch (const std::string& e) catch (const std::string& e)
{ {
if (_debug >= 1) context.error ("Hook Error: JSON syntax error in: " + *i);
context.error ("Hook Error: JSON syntax error in: " + *i); context.error ("Hook Error: JSON " + e);
if (_debug >= 2)
context.error ("Hook Error: JSON " + e);
throw 0; throw 0;
} }
catch (...) catch (...)
{ {
if (_debug >= 1) context.error ("Hook Error: JSON failed to parse: " + *i);
context.error ("Hook Error: JSON fails to parse: " + *i);
throw 0; throw 0;
} }
} }

4
test/hooks.on-add.t
View File

@@ -121,7 +121,7 @@ class TestHooksOnAdd(TestCase):
self.t.hooks.add_default(hookname, log=True) self.t.hooks.add_default(hookname, log=True)
code, out, err = self.t.runError(("add", "foo")) 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].assertTriggered()
self.t.hooks[hookname].assertTriggeredCount(1) self.t.hooks[hookname].assertTriggeredCount(1)
self.t.hooks[hookname].assertExitcode(0) self.t.hooks[hookname].assertExitcode(0)
@@ -134,7 +134,7 @@ class TestHooksOnAdd(TestCase):
self.t.hooks.add_default(hookname, log=True) self.t.hooks.add_default(hookname, log=True)
code, out, err = self.t.runError(("add", "foo")) 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].assertTriggered()
self.t.hooks[hookname].assertTriggeredCount(1) self.t.hooks[hookname].assertTriggeredCount(1)
self.t.hooks[hookname].assertExitcode(0) self.t.hooks[hookname].assertExitcode(0)