base: Use TEST() macro when possible.

base/vlog_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/vlog.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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"));
   EXPECT_EQ(0, VlogInfo("blah", "", &min_log_level).GetVlogLevel("test3"));
   EXPECT_EQ(0, VlogInfo("0blah1", "", &min_log_level).GetVlogLevel("test4"));
   EXPECT_EQ(1, VlogInfo("1", "", &min_log_level).GetVlogLevel("test5"));
   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("", "****"));
   EXPECT_FALSE(MatchVlogPattern("", "x"));
   EXPECT_FALSE(MatchVlogPattern("x", ""));
 
   // Basic.
   EXPECT_TRUE(MatchVlogPattern("blah", "blah"));
 
   // ? should match exactly one character.
@@ skipping 27 matching lines @@
   EXPECT_TRUE(MatchVlogPattern("bl\\ah", "bl\\?h"));
   EXPECT_FALSE(MatchVlogPattern("bl?h", "bl\\?h"));
   EXPECT_TRUE(MatchVlogPattern("bl\\aaaah", "bl\\*h"));
   EXPECT_FALSE(MatchVlogPattern("bl*h", "bl\\*h"));
 
   // Any slash matches any slash.
   EXPECT_TRUE(MatchVlogPattern("/b\\lah", "/b\\lah"));
   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";
   int min_log_level = 0;
   VlogInfo vlog_info(kVSwitch, kVModuleSwitch, &min_log_level);
   EXPECT_EQ(-1, vlog_info.GetVlogLevel("/path/to/grault.cc"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("/path/to/foo.cc"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("D:\\Path\\To\\bar-inl.mm"));
   EXPECT_EQ(-1, vlog_info.GetVlogLevel("D:\\path\\to what/bar_unittest.m"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("baz.h"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("/another/path/to/qux.h"));
   EXPECT_EQ(1, vlog_info.GetVlogLevel("/path/to/quux"));
   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;
   VlogInfo vlog_info("", kVModuleSwitch, &min_log_level);
   EXPECT_EQ(0, vlog_info.GetVlogLevel("/foo/bar.cc"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("bar.cc"));
   EXPECT_EQ(1, vlog_info.GetVlogLevel("foo/bar.cc"));
 
   EXPECT_EQ(0, vlog_info.GetVlogLevel("baz/grault/qux.h"));
   EXPECT_EQ(0, vlog_info.GetVlogLevel("/baz/grault/qux.cc"));
   EXPECT_EQ(2, vlog_info.GetVlogLevel("baz/grault/qux.cc"));
   EXPECT_EQ(2, vlog_info.GetVlogLevel("baz/grault/blah/qux.cc"));
   EXPECT_EQ(2, vlog_info.GetVlogLevel("baz\\grault\\qux.cc"));
   EXPECT_EQ(2, vlog_info.GetVlogLevel("baz\\grault//blah\\qux.cc"));
 
   EXPECT_EQ(0, vlog_info.GetVlogLevel("/foo/bar/baz/quux.cc"));
   EXPECT_EQ(3, vlog_info.GetVlogLevel("/foo/bar/baz/quux/grault.cc"));
   EXPECT_EQ(3, vlog_info.GetVlogLevel("/foo\\bar/baz\\quux/grault.cc"));
 
   EXPECT_EQ(0, vlog_info.GetVlogLevel("foo/bar/test-inl.cc"));
   EXPECT_EQ(4, vlog_info.GetVlogLevel("foo/bar/test-inl.h"));
   EXPECT_EQ(4, vlog_info.GetVlogLevel("foo/bar/baz/blah-inl.h"));
 }
 
 }  // namespace
 
 }  // namespace logging