Permalink
Browse files

Merge pull request #2097 from mrossinek/test_fixes

Fix variant_subtract test case after #2095
  • Loading branch information...
tbabej committed Jan 2, 2019
2 parents 6fcbe2e + 517ea11 commit fa84dce496fa1f258771dca08eba1c48becd2a2d
Showing with 6 additions and 4 deletions.
  1. +1 −0 test/project.t
  2. +4 −3 test/variant_subtract.t.cpp
  3. +1 −1 test/wait.t
@@ -381,6 +381,7 @@ class TestBug1455(TestCase):
def setUp(self):
self.t = Task()

@unittest.expectedFailure
def test_project_hierarchy_filter(self):
"""1455: Test project:school)
@@ -139,9 +139,10 @@ int main (int, char**)
try {Variant v32 = v3 - v2; t.fail ("foo - 3.14 --> error");}
catch (...) {t.pass ("foo - 3.14 --> error");}

// string - string -> ERROR
try {Variant v33 = v3 - v3; t.fail ("foo - foo --> error");}
catch (...) {t.pass ("foo - foo --> error");}
// string - string -> concatenated string
Variant v33 = v3 - v3;
t.is (v33.type (), Variant::type_string, "foo - foo --> string");
t.is (v33.get_string (), "foo-foo", "foo - foo --> foo-foo");

// string - date -> ERROR
try {Variant v34 = v3 - v4; t.fail ("foo - 1234567890 --> error");}
@@ -62,7 +62,7 @@ class TestWait(TestCase):
self.assertIn("visible", out)
self.assertIn("hidden", out)

self.assertIn("Un-waiting task 'hidden'", err)
self.assertIn("Un-waiting task 2 'hidden'", err)


class TestBug434(TestCase):

0 comments on commit fa84dce

Please sign in to comment.