generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9_thread_test: quiet some msvc int->bool warnings

Browse Source 
Change-Id: I2ed1cb537831c8b595c74ec641296d13d38ef622
This commit is contained in:
James Zern 2013-10-25 22:29:51 +02:00
parent 9f528ce057
commit 00053aa6c4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/vp9_thread_test.cc
View File

@ -39,10 +39,10 @@ int ThreadHook(void* data, void* return_value) {
} }
TEST_P(VP9WorkerThreadTest, HookSuccess) { TEST_P(VP9WorkerThreadTest, HookSuccess) {
EXPECT_TRUE(vp9_worker_sync(&worker_)); // should be a no-op. EXPECT_NE(vp9_worker_sync(&worker_), 0); // should be a no-op.
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
EXPECT_TRUE(vp9_worker_reset(&worker_)); EXPECT_NE(vp9_worker_reset(&worker_), 0);
int hook_data = 0; int hook_data = 0;
int return_value = 1; // return successfully from the hook int return_value = 1; // return successfully from the hook
@ -56,16 +56,16 @@ TEST_P(VP9WorkerThreadTest, HookSuccess) {
} else { } else {
vp9_worker_launch(&worker_); vp9_worker_launch(&worker_);
} }
EXPECT_TRUE(vp9_worker_sync(&worker_)); EXPECT_NE(vp9_worker_sync(&worker_), 0);
EXPECT_FALSE(worker_.had_error); EXPECT_FALSE(worker_.had_error);
EXPECT_EQ(5, hook_data); EXPECT_EQ(5, hook_data);
EXPECT_TRUE(vp9_worker_sync(&worker_)); // should be a no-op. EXPECT_NE(vp9_worker_sync(&worker_), 0); // should be a no-op.
} }
} }
TEST_P(VP9WorkerThreadTest, HookFailure) { TEST_P(VP9WorkerThreadTest, HookFailure) {
EXPECT_TRUE(vp9_worker_reset(&worker_)); EXPECT_NE(vp9_worker_reset(&worker_), 0);
int hook_data = 0; int hook_data = 0;
int return_value = 0; // return failure from the hook int return_value = 0; // return failure from the hook
@ -80,14 +80,14 @@ TEST_P(VP9WorkerThreadTest, HookFailure) {
vp9_worker_launch(&worker_); vp9_worker_launch(&worker_);
} }
EXPECT_FALSE(vp9_worker_sync(&worker_)); EXPECT_FALSE(vp9_worker_sync(&worker_));
EXPECT_TRUE(worker_.had_error); EXPECT_EQ(1, worker_.had_error);
// Ensure _reset() clears the error and _launch() can be called again. // Ensure _reset() clears the error and _launch() can be called again.
return_value = 1; return_value = 1;
EXPECT_TRUE(vp9_worker_reset(&worker_)); EXPECT_NE(vp9_worker_reset(&worker_), 0);
EXPECT_FALSE(worker_.had_error); EXPECT_FALSE(worker_.had_error);
vp9_worker_launch(&worker_); vp9_worker_launch(&worker_);
EXPECT_TRUE(vp9_worker_sync(&worker_)); EXPECT_NE(vp9_worker_sync(&worker_), 0);
EXPECT_FALSE(worker_.had_error); EXPECT_FALSE(worker_.had_error);
} }