diff options
author | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-02 11:14:41 +0200 |
---|---|---|
committer | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-02 11:14:41 +0200 |
commit | 86d15dd73f7d6d52223c6c2f9d274c9ebac9791e (patch) | |
tree | 2a502b2fa3bc21e91cd4e81d9393fa94c191c921 /test | |
parent | 0dddf67690ae2fa58003df8d61f56cb717cd0db9 (diff) | |
download | zeitgeist-86d15dd73f7d6d52223c6c2f9d274c9ebac9791e.tar.gz |
Revert "Fix assert_no_wildcard"
This reverts commit 0dddf67690ae2fa58003df8d61f56cb717cd0db9.
Diffstat (limited to 'test')
-rw-r--r-- | test/dbus/engine-test.py | 2 | ||||
-rw-r--r-- | test/direct/query-operators-test.vala | 122 |
2 files changed, 61 insertions, 63 deletions
diff --git a/test/dbus/engine-test.py b/test/dbus/engine-test.py index 545503d0..7217a9ba 100644 --- a/test/dbus/engine-test.py +++ b/test/dbus/engine-test.py @@ -87,8 +87,6 @@ class ZeitgeistEngineTest(testutils.RemoteTestCase): test_event_1[0][0] = ids[0] resulting_event[2] = "" - test_event_1.timestamp = resulting_event.timestamp - self.assertEqual(resulting_event, test_event_1) def testInsertGetWithoutTimestamp(self): diff --git a/test/direct/query-operators-test.vala b/test/direct/query-operators-test.vala index d2d9cf9f..8165f8e3 100644 --- a/test/direct/query-operators-test.vala +++ b/test/direct/query-operators-test.vala @@ -28,7 +28,7 @@ int main (string[] args) // Do not abort on warning()s. GLib.Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL); - // This test will connect to the database, make sure it won't mess up + // This test will connect to the database, make sure it won't mess up // anything. assert (Environment.set_variable( "ZEITGEIST_DATA_PATH", "/tmp/zeitgeist-tests", true)); @@ -40,30 +40,30 @@ int main (string[] args) Test.add_func ("/ParseNoexpand/main", parse_noexpand_test); Test.add_func ("/ParseNoexpand/assert", assert_no_noexpand_test); Test.add_func ("/ParseWildcard/main", parse_wildcard_test); - Test.add_func ("/ParseWildlcard/assert", assert_no_wildcard_test); + Test.add_func ("/ParseWildlcard/assert", assert_no_wildcard_test); return Test.run (); } private class PublicEngine : Zeitgeist.Engine { - public void PUBLIC_assert_no_negation (string field, string val) - throws Zeitgeist.EngineError - { - assert_no_negation (field, val); - } - - public void PUBLIC_assert_no_noexpand (string field, string val) - throws Zeitgeist.EngineError - { - assert_no_noexpand (field, val); - } - - public void PUBLIC_assert_no_wildcard (string field, string val) - throws Zeitgeist.EngineError - { - assert_no_wildcard (field, val); - } + public void PUBLIC_assert_no_negation (string field, string val) + throws Zeitgeist.EngineError + { + assert_no_negation (field, val); + } + + public void PUBLIC_assert_no_noexpand (string field, string val) + throws Zeitgeist.EngineError + { + assert_no_noexpand (field, val); + } + + public void PUBLIC_assert_no_wildcard (string field, string val) + throws Zeitgeist.EngineError + { + assert_no_wildcard (field, val); + } } @@ -89,20 +89,20 @@ public void parse_negation_test () public void assert_no_negation_test () { - PublicEngine engine = new PublicEngine (); - - engine.PUBLIC_assert_no_negation ("field name", "good"); - engine.PUBLIC_assert_no_negation ("field name", "good!"); - engine.PUBLIC_assert_no_negation ("field name", "go!od"); - - try - { - engine.PUBLIC_assert_no_negation ("field name", "!bad"); - assert_not_reached (); - } - catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) - { - } + PublicEngine engine = new PublicEngine (); + + engine.PUBLIC_assert_no_negation ("field name", "good"); + engine.PUBLIC_assert_no_negation ("field name", "good!"); + engine.PUBLIC_assert_no_negation ("field name", "go!od"); + + try + { + engine.PUBLIC_assert_no_negation ("field name", "!bad"); + assert_not_reached (); + } + catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) + { + } } public void parse_noexpand_test () @@ -127,20 +127,20 @@ public void parse_noexpand_test () public void assert_no_noexpand_test () { - PublicEngine engine = new PublicEngine (); - - engine.PUBLIC_assert_no_noexpand ("field name", "good"); - engine.PUBLIC_assert_no_noexpand ("field name", "good+"); - engine.PUBLIC_assert_no_noexpand ("field name", "go+od"); - - try - { - engine.PUBLIC_assert_no_noexpand ("field name", "+bad"); - assert_not_reached (); - } - catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) - { - } + PublicEngine engine = new PublicEngine (); + + engine.PUBLIC_assert_no_noexpand ("field name", "good"); + engine.PUBLIC_assert_no_noexpand ("field name", "good+"); + engine.PUBLIC_assert_no_noexpand ("field name", "go+od"); + + try + { + engine.PUBLIC_assert_no_noexpand ("field name", "+bad"); + assert_not_reached (); + } + catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) + { + } } public void parse_wildcard_test () @@ -166,20 +166,20 @@ public void parse_wildcard_test () public void assert_no_wildcard_test () { - PublicEngine engine = new PublicEngine (); - - engine.PUBLIC_assert_no_wildcard ("field name", "good"); - engine.PUBLIC_assert_no_wildcard ("field name", "*good"); - engine.PUBLIC_assert_no_wildcard ("field name", "go*od"); - - try - { - engine.PUBLIC_assert_no_wildcard ("field name", "bad*"); - assert_not_reached (); - } - catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) - { - } + PublicEngine engine = new PublicEngine (); + + engine.PUBLIC_assert_no_wildcard ("field name", "good"); + engine.PUBLIC_assert_no_wildcard ("field name", "*good"); + engine.PUBLIC_assert_no_wildcard ("field name", "go*od"); + + try + { + engine.PUBLIC_assert_no_wildcard ("field name", "bad*"); + assert_not_reached (); + } + catch (Zeitgeist.EngineError.INVALID_ARGUMENT e) + { + } } // vim:expandtab:ts=4:sw=4 |