diff --git a/.gitignore b/.gitignore index 9a909f74..f1280e1a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /doc/rtf _unsused CMakeLists.txt.user* -/include \ No newline at end of file +/include +/release diff --git a/tests/piobject/connect.cpp b/tests/piobject/connect.cpp index 1147597a..a5602cd8 100644 --- a/tests/piobject/connect.cpp +++ b/tests/piobject/connect.cpp @@ -31,23 +31,23 @@ private: TEST(PiobjectConnections, CONNECT0) { Object a; Object b; - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); CONNECT0(void, &a, event_test, &b, handler_test); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); // piCout << "================"; } @@ -57,105 +57,105 @@ TEST(PiobjectConnections, CONNECT0_DISCONNECT) { Object b; a.setName("A"); b.setName("B"); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); CONNECT0(void, &a, event_test, &b, handler_test); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); PIObject::piDisconnect(&a, "event_test"); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); // piCout << "================"; } TEST(PiobjectConnections, CONNECTU) { Object a; Object b; - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); CONNECTU(&a, event_test, &b, handler_test); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); // piCout << "================"; } TEST(PiobjectConnections, CONNECTU_DISCONNECT) { Object a; Object b; - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); CONNECTU(&a, event_test, &b, handler_test); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 0); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 0); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); PIObject::piDisconnect(&a, "event_test"); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); a.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); b.test(); - ASSERT_EQ(a.getX(), 0); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 0); + EXPECT_EQ(b.getX(), 1); a.handler_val(99); - ASSERT_EQ(a.getX(), 99); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 99); + EXPECT_EQ(b.getX(), 1); CONNECTU(&a, event_val, &b, handler_val); - ASSERT_EQ(a.getX(), 99); - ASSERT_EQ(b.getX(), 1); + EXPECT_EQ(a.getX(), 99); + EXPECT_EQ(b.getX(), 1); a.test_val(); - ASSERT_EQ(a.getX(), 99); - ASSERT_EQ(b.getX(), 99); + EXPECT_EQ(a.getX(), 99); + EXPECT_EQ(b.getX(), 99); a.handler_val(-1); - ASSERT_EQ(a.getX(), -1); - ASSERT_EQ(b.getX(), 99); + EXPECT_EQ(a.getX(), -1); + EXPECT_EQ(b.getX(), 99); PIObject::piDisconnect(&a, "event_val", &b); - ASSERT_EQ(a.getX(), -1); - ASSERT_EQ(b.getX(), 99); + EXPECT_EQ(a.getX(), -1); + EXPECT_EQ(b.getX(), 99); a.test_val(); - ASSERT_EQ(a.getX(), -1); - ASSERT_EQ(b.getX(), 99); + EXPECT_EQ(a.getX(), -1); + EXPECT_EQ(b.getX(), 99); // piCout << "================"; }