summaryrefslogtreecommitdiffstats
path: root/base/vlog_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 17:04:28 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 17:04:28 +0000
commit35dabb168a48a717d9ba0ecabff33295abf9f073 (patch)
tree36a182c2ff5868c6c0d07c9c8b73ce0a73b72b5e /base/vlog_unittest.cc
parent8be50f06b56d45e148a0f84118ba0f8c2aa61db0 (diff)
downloadchromium_src-35dabb168a48a717d9ba0ecabff33295abf9f073.zip
chromium_src-35dabb168a48a717d9ba0ecabff33295abf9f073.tar.gz
chromium_src-35dabb168a48a717d9ba0ecabff33295abf9f073.tar.bz2
base: Use TEST() macro when possible.
There is no need to inherit from testing::Test and then have to use TEST_F(), if you aren't overridding SetUp() or TearDow(). So if you don't need to customize it, you can use TEST() macro directly and it does that for us automagically. Fix all the cases found with the following command line: $ git grep -n1 "public testing::Test" base/ | grep "};" TEST=base_unittests R=willchan@chromium.org Review URL: https://codereview.chromium.org/11308261 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/vlog_unittest.cc')
-rw-r--r--base/vlog_unittest.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/base/vlog_unittest.cc b/base/vlog_unittest.cc
index f583f44..ef7247f 100644
--- a/base/vlog_unittest.cc
+++ b/base/vlog_unittest.cc
@@ -14,10 +14,7 @@ namespace logging {
namespace {
-class VlogTest : public testing::Test {
-};
-
-TEST_F(VlogTest, NoVmodule) {
+TEST(VlogTest, NoVmodule) {
int min_log_level = 0;
EXPECT_EQ(0, VlogInfo("", "", &min_log_level).GetVlogLevel("test1"));
EXPECT_EQ(0, VlogInfo("0", "", &min_log_level).GetVlogLevel("test2"));
@@ -27,7 +24,7 @@ TEST_F(VlogTest, NoVmodule) {
EXPECT_EQ(5, VlogInfo("5", "", &min_log_level).GetVlogLevel("test6"));
}
-TEST_F(VlogTest, MatchVlogPattern) {
+TEST(VlogTest, MatchVlogPattern) {
// Degenerate cases.
EXPECT_TRUE(MatchVlogPattern("", ""));
EXPECT_TRUE(MatchVlogPattern("", "****"));
@@ -75,7 +72,7 @@ TEST_F(VlogTest, MatchVlogPattern) {
EXPECT_TRUE(MatchVlogPattern("\\b/lah", "/b\\lah"));
}
-TEST_F(VlogTest, VmoduleBasic) {
+TEST(VlogTest, VmoduleBasic) {
const char kVSwitch[] = "-1";
const char kVModuleSwitch[] =
"foo=,bar=0,baz=blah,,qux=0blah1,quux=1,corge.ext=5";
@@ -91,7 +88,7 @@ TEST_F(VlogTest, VmoduleBasic) {
EXPECT_EQ(5, vlog_info.GetVlogLevel("c:\\path/to/corge.ext.h"));
}
-TEST_F(VlogTest, VmoduleDirs) {
+TEST(VlogTest, VmoduleDirs) {
const char kVModuleSwitch[] =
"foo/bar.cc=1,baz\\*\\qux.cc=2,*quux/*=3,*/*-inl.h=4";
int min_log_level = 0;