From d88c22ef39bba3670c12b0396da00d79a8e959e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 12 Jul 2017 17:32:23 +0200 Subject: GLibSignal: change the methods signatures to return values (bzr r4245.2.1) --- tests/test_glib_signals.cpp | 117 ++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 58 deletions(-) (limited to 'tests') diff --git a/tests/test_glib_signals.cpp b/tests/test_glib_signals.cpp index 1c0b20bf7..82855d99f 100644 --- a/tests/test_glib_signals.cpp +++ b/tests/test_glib_signals.cpp @@ -136,8 +136,8 @@ TEST_F(TestGLibSignals, TestConstructions) TEST_F(TestGLibSignals, TestSignal0) { Signal signal; - signal.Connect(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); g_signal_emit_by_name(test_signals_, "signal0"); @@ -148,8 +148,8 @@ TEST_F(TestGLibSignals, TestSignal0) TEST_F(TestGLibSignals, TestSignal1) { Signal signal; - signal.Connect(test_signals_, "signal1", - sigc::mem_fun(this, &TestGLibSignals::Signal1Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal1", + sigc::mem_fun(this, &TestGLibSignals::Signal1Callback))); g_signal_emit_by_name(test_signals_, "signal1", "test"); @@ -161,8 +161,8 @@ TEST_F(TestGLibSignals, TestSignal1) TEST_F(TestGLibSignals, TestSignal2) { Signal signal; - signal.Connect(test_signals_, "signal2", - sigc::mem_fun(this, &TestGLibSignals::Signal2Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal2", + sigc::mem_fun(this, &TestGLibSignals::Signal2Callback))); g_signal_emit_by_name(test_signals_, "signal2", "test", 100); @@ -175,8 +175,8 @@ TEST_F(TestGLibSignals, TestSignal2) TEST_F(TestGLibSignals, TestSignal3) { Signal signal; - signal.Connect(test_signals_, "signal3", - sigc::mem_fun(this, &TestGLibSignals::Signal3Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal3", + sigc::mem_fun(this, &TestGLibSignals::Signal3Callback))); g_signal_emit_by_name(test_signals_, "signal3", "test", 100, 200.0f); @@ -191,8 +191,8 @@ TEST_F(TestGLibSignals, TestSignal3) TEST_F(TestGLibSignals, TestSignal4) { Signal signal; - signal.Connect(test_signals_, "signal4", - sigc::mem_fun(this, &TestGLibSignals::Signal4Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal4", + sigc::mem_fun(this, &TestGLibSignals::Signal4Callback))); g_signal_emit_by_name(test_signals_, "signal4", "test", 100, 200.0f, 300.00); @@ -207,8 +207,8 @@ TEST_F(TestGLibSignals, TestSignal4) TEST_F(TestGLibSignals, TestSignal5) { Signal signal; - signal.Connect(test_signals_, "signal5", - sigc::mem_fun(this, &TestGLibSignals::Signal5Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal5", + sigc::mem_fun(this, &TestGLibSignals::Signal5Callback))); g_signal_emit_by_name(test_signals_, "signal5", "test", 100, 200.0f, 300.00, TRUE); @@ -226,8 +226,8 @@ TEST_F(TestGLibSignals, TestSignal5) TEST_F(TestGLibSignals, TestSignal6) { Signal signal; - signal.Connect(test_signals_, "signal6", - sigc::mem_fun(this, &TestGLibSignals::Signal6Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal6", + sigc::mem_fun(this, &TestGLibSignals::Signal6Callback))); gboolean ret = FALSE; g_signal_emit_by_name(test_signals_, "signal6", "test", 100, 200.0f, 300.00, @@ -246,9 +246,9 @@ TEST_F(TestGLibSignals, TestSignal6) TEST_F(TestGLibSignals, TestDisconnection) { Signal signal; - signal.Connect(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); - signal.Disconnect(); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); + EXPECT_TRUE(signal.Disconnect()); g_signal_emit_by_name(test_signals_, "signal0"); @@ -259,8 +259,8 @@ TEST_F(TestGLibSignals, TestAutoDisconnection) { { Signal signal; - signal.Connect(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); } g_signal_emit_by_name(test_signals_, "signal0"); @@ -271,8 +271,8 @@ TEST_F(TestGLibSignals, TestAutoDisconnection) TEST_F(TestGLibSignals, TestCleanDestruction) { Signal signal; - signal.Connect(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); g_clear_object(&test_signals_); EXPECT_EQ(signal.object(), nullptr); } @@ -280,11 +280,11 @@ TEST_F(TestGLibSignals, TestCleanDestruction) TEST_F(TestGLibSignals, TestConnectReplacePreviousConnection) { Signal signal; - signal.Connect(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); unsigned signal0_num_cb = 0; - signal.Connect(test_signals_, "signal0", [&] (TestSignals*) {++signal0_num_cb;}); + ASSERT_TRUE(signal.Connect(test_signals_, "signal0", [&] (TestSignals*) {++signal0_num_cb;})); g_signal_emit_by_name(test_signals_, "signal0"); @@ -302,27 +302,27 @@ TEST_F(TestGLibSignals, TestManagerAddition) { MockSignalManager manager; - manager.Add(new Signal(test_signals_, - "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback))); - manager.Add(new Signal(test_signals_, - "signal1", - sigc::mem_fun(this, &TestGLibSignals::Signal1Callback))); - manager.Add(new Signal(test_signals_, - "signal2", - sigc::mem_fun(this, &TestGLibSignals::Signal2Callback))); - manager.Add(new Signal(test_signals_, - "signal3", - sigc::mem_fun(this, &TestGLibSignals::Signal3Callback))); - manager.Add(new Signal(test_signals_, - "signal4", - sigc::mem_fun(this, &TestGLibSignals::Signal4Callback))); - manager.Add(new Signal(test_signals_, - "signal5", - sigc::mem_fun(this, &TestGLibSignals::Signal5Callback))); - manager.Add(new Signal(test_signals_, - "signal6", - sigc::mem_fun(this, &TestGLibSignals::Signal6Callback))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal1", + sigc::mem_fun(this, &TestGLibSignals::Signal1Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal2", + sigc::mem_fun(this, &TestGLibSignals::Signal2Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal3", + sigc::mem_fun(this, &TestGLibSignals::Signal3Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal4", + sigc::mem_fun(this, &TestGLibSignals::Signal4Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal5", + sigc::mem_fun(this, &TestGLibSignals::Signal5Callback)))); + EXPECT_NE(nullptr, manager.Add(new Signal(test_signals_, + "signal6", + sigc::mem_fun(this, &TestGLibSignals::Signal6Callback)))); EXPECT_EQ(manager.GetConnections().size(), 7u); } @@ -331,19 +331,20 @@ TEST_F(TestGLibSignals, TestManagerAdditionTemplate) { MockSignalManager manager; - manager.Add(test_signals_, "signal0", - sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)); - manager.Add(test_signals_, "signal1", - sigc::mem_fun(this, &TestGLibSignals::Signal1Callback)); - manager.Add(test_signals_, "signal2", - sigc::mem_fun(this, &TestGLibSignals::Signal2Callback)); - manager.Add(test_signals_, "signal3", - sigc::mem_fun(this, &TestGLibSignals::Signal3Callback)); - manager.Add(test_signals_, "signal4", - sigc::mem_fun(this, &TestGLibSignals::Signal4Callback)); - manager.Add(test_signals_, "signal5", - sigc::mem_fun(this, &TestGLibSignals::Signal5Callback)); - manager.Add(test_signals_, "signal6", sigc::mem_fun(this, &TestGLibSignals::Signal6Callback)); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal0", + sigc::mem_fun(this, &TestGLibSignals::Signal0Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal1", + sigc::mem_fun(this, &TestGLibSignals::Signal1Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal2", + sigc::mem_fun(this, &TestGLibSignals::Signal2Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal3", + sigc::mem_fun(this, &TestGLibSignals::Signal3Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal4", + sigc::mem_fun(this, &TestGLibSignals::Signal4Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal5", + sigc::mem_fun(this, &TestGLibSignals::Signal5Callback)))); + EXPECT_NE(nullptr, (manager.Add(test_signals_, "signal6", + sigc::mem_fun(this, &TestGLibSignals::Signal6Callback)))); EXPECT_EQ(manager.GetConnections().size(), 7u); } -- cgit v1.2.3