summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_util_unittest.cc
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 10:36:28 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 10:36:28 +0000
commit515f2492fbc0a023eb089e91e349106da325de5e (patch)
treed606fd354fe6c4695fe2f635e62774fe582e8232 /media/audio/audio_util_unittest.cc
parenta834a1abc0a318a563d9a0eb3adec0df2947a982 (diff)
downloadchromium_src-515f2492fbc0a023eb089e91e349106da325de5e.zip
chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.gz
chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.bz2
Clang: enable -Wbool-conversions and -Wunused-variables on Linux.
-Wbool-conversion warns about EXPECT_EQ(false, blah), so replace that with EXPECT_FALSE(blah). Do the same with EXPECT_EQ(true, blah) for good measure (even though that doesn't generate warnings). Also remove the one instance of an unused variable. BUG=69421 TEST=buildbots all compile and all tests pass Review URL: http://codereview.chromium.org/6300001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_util_unittest.cc')
-rw-r--r--media/audio/audio_util_unittest.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/media/audio/audio_util_unittest.cc b/media/audio/audio_util_unittest.cc
index fde2127..11e10a9 100644
--- a/media/audio/audio_util_unittest.cc
+++ b/media/audio/audio_util_unittest.cc
@@ -22,7 +22,7 @@ TEST(AudioUtilTest, AdjustVolume_u8) {
1, // channels.
sizeof(samples_u8[0]),
0.5f);
- EXPECT_EQ(true, result_u8);
+ EXPECT_TRUE(result_u8);
int expected_test = memcmp(samples_u8, expected_u8, sizeof(expected_u8));
EXPECT_EQ(0, expected_test);
}
@@ -35,7 +35,7 @@ TEST(AudioUtilTest, AdjustVolume_s16) {
2, // channels.
sizeof(samples_s16[0]),
0.25f);
- EXPECT_EQ(true, result_s16);
+ EXPECT_TRUE(result_s16);
int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
EXPECT_EQ(0, expected_test);
}
@@ -48,7 +48,7 @@ TEST(AudioUtilTest, AdjustVolume_s16_zero) {
2, // channels.
sizeof(samples_s16[0]),
0.0f);
- EXPECT_EQ(true, result_s16);
+ EXPECT_TRUE(result_s16);
int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
EXPECT_EQ(0, expected_test);
}
@@ -61,7 +61,7 @@ TEST(AudioUtilTest, AdjustVolume_s16_one) {
2, // channels.
sizeof(samples_s16[0]),
1.0f);
- EXPECT_EQ(true, result_s16);
+ EXPECT_TRUE(result_s16);
int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
EXPECT_EQ(0, expected_test);
}
@@ -74,7 +74,7 @@ TEST(AudioUtilTest, AdjustVolume_s32) {
4, // channels.
sizeof(samples_s32[0]),
0.25f);
- EXPECT_EQ(true, result_s32);
+ EXPECT_TRUE(result_s32);
int expected_test = memcmp(samples_s32, expected_s32, sizeof(expected_s32));
EXPECT_EQ(0, expected_test);
}
@@ -90,7 +90,7 @@ TEST(AudioUtilTest, FoldChannels_u8) {
6, // channels.
sizeof(samples_u8[0]),
1.0f);
- EXPECT_EQ(true, result_u8);
+ EXPECT_TRUE(result_u8);
int expected_test = memcmp(samples_u8, expected_u8, sizeof(expected_u8));
EXPECT_EQ(0, expected_test);
}
@@ -104,7 +104,7 @@ TEST(AudioUtilTest, FoldChannels_s16) {
6, // channels.
sizeof(samples_s16[0]),
1.00f);
- EXPECT_EQ(true, result_s16);
+ EXPECT_TRUE(result_s16);
int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
EXPECT_EQ(0, expected_test);
}
@@ -118,7 +118,7 @@ TEST(AudioUtilTest, FoldChannels_s32) {
6, // channels.
sizeof(samples_s32[0]),
1.00f);
- EXPECT_EQ(true, result_s32);
+ EXPECT_TRUE(result_s32);
int expected_test = memcmp(samples_s32, expected_s32, sizeof(expected_s32));
EXPECT_EQ(0, expected_test);
}
@@ -133,7 +133,7 @@ TEST(AudioUtilTest, FoldChannels71_s16) {
8, // channels.
sizeof(samples_s16[0]),
1.00f);
- EXPECT_EQ(true, result_s16);
+ EXPECT_TRUE(result_s16);
int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
EXPECT_EQ(0, expected_test);
}