You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2012/08/23 18:45:28 UTC
svn commit: r1376586 -
/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
Author: fitzner
Date: Thu Aug 23 16:45:28 2012
New Revision: 1376586
URL: http://svn.apache.org/viewvc?rev=1376586&view=rev
Log:
ETCH-243 EtchRuntimeTest Warning Fix
- warning fix EQ(false, foo())
- Assert to Expect
Change-Id: I5163338cc51b404427118ed3f709a3f9948ed19d
Modified:
incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp?rev=1376586&r1=1376585&r2=1376586&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp Thu Aug 23 16:45:28 2012
@@ -32,9 +32,9 @@ TEST(EtchRuntime, getId) {
TEST(EtchRuntime, isClosed) {
EtchRuntime* runtime = new EtchRuntime();
- ASSERT_EQ(false, runtime->isClosed());
+ EXPECT_FALSE(runtime->isClosed());
runtime->shutdown();
- ASSERT_EQ(true, runtime->isClosed());
+ EXPECT_TRUE(runtime->isClosed());
delete runtime;
}
@@ -43,7 +43,7 @@ public:
/**
* Constructor
*/
- EtchRuntimeTestListener()
+ EtchRuntimeTestListener()
: mId(0) {
}
@@ -61,22 +61,22 @@ public:
TEST(EtchRuntime, registerListener) {
status_t status;
EtchRuntime* runtime = new EtchRuntime();
-
+
status = runtime->registerListener(NULL);
- ASSERT_EQ(ETCH_EINVAL, status);
+ EXPECT_EQ(ETCH_EINVAL, status);
EtchRuntimeTestListener listener;
status = runtime->registerListener(&listener);
- ASSERT_EQ(ETCH_OK, status);
+ EXPECT_EQ(ETCH_OK, status);
// a shutdown leads to a runtime change
runtime->shutdown();
status = runtime->unregisterListener(&listener);
- ASSERT_EQ(ETCH_OK, status);
+ EXPECT_EQ(ETCH_OK, status);
// check if callback was fired
- ASSERT_EQ(1, listener.mId);
+ EXPECT_EQ(1, listener.mId);
delete runtime;
}