Issue #1234 - Add unit tests for TrimString

test/UtilTest.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <gtest/gtest.h>
 #include "../src/shared/Utils.h"
 
-//----------------------------------
-// Trim
-//----------------------------------
 namespace
 {
-  void TrimTest(std::wstring input, std::wstring expected)
+  void TrimTestBody(std::wstring input, std::wstring expected)
   {
     std::wstring trimmed = TrimString(input);
     ASSERT_EQ(expected, trimmed);
   }
 }
 
-TEST(Trim, trim_00)

[sergei, 2015/01/05 16:51:03]

We also usually add "Test" to the test case, thus call it like `TEST(TrimTest,
trim_00)`.

[Eric, 2015/01/05 17:18:25]

We have, and it's entirely redundant to do so. It's in a file named ...Test.cpp.
It's in a declaration TEST. When you see the names in test output, it's
completely clear that they're tests.

Personally, I'd rather ditch the suffix for test case identifiers in the other
tests, although that's low priority.

If you can identify a downside of getting rid of the suffix, please let me know.

[sergei, 2015/01/05 21:13:53]

Consistency

[Oleksandr, 2015/01/09 00:16:59]

I agree with Sergei. Also, TEST(TrimTest, Trim00) would be more in line with our
previous tests and our style guide.

+TEST(TrimTest, Trim00)
 {
-  TrimTest(L"", L"");
+  TrimTestBody(L"", L"");
 }
 
-TEST(Trim, trim_01)
+TEST(TrimTest, Trim01)
 {
-  TrimTest(L" ", L"");
+  TrimTestBody(L" ", L"");
 }
 
-TEST(Trim, trim_02)
+TEST(TrimTest, Trim02)
 {
-  TrimTest(L"\n", L"");
+  TrimTestBody(L"\n", L"");
 }
 
-TEST(Trim, trim_03)
+TEST(TrimTest, Trim03)
 {
-  TrimTest(L"\r", L"");
+  TrimTestBody(L"\r", L"");
 }
 
-TEST(Trim, trim_04)
+TEST(TrimTest, Trim04)
 {
-  TrimTest(L"\t", L"");
+  TrimTestBody(L"\t", L"");
 }
 
-TEST(Trim, trim_05)
+TEST(TrimTest, Trim05)
 {
-  TrimTest(L"foo", L"foo");
+  TrimTestBody(L"foo", L"foo");
 }
 
-TEST(Trim, trim_06)
+TEST(TrimTest, Trim06)
 {
-  TrimTest(L" foo", L"foo");
+  TrimTestBody(L" foo", L"foo");
 }
 
-TEST(Trim, trim_07)
+TEST(TrimTest, Trim07)
 {
-  TrimTest(L"\r\nfoo", L"foo");
+  TrimTestBody(L"\r\nfoo", L"foo");
 }
 
-TEST(Trim, trim_08)
+TEST(TrimTest, Trim08)
 {
-  TrimTest(L"\tfoo", L"foo");
+  TrimTestBody(L"\tfoo", L"foo");
 }
 
-TEST(Trim, trim_09)
+TEST(TrimTest, Trim09)
 {
-  TrimTest(L"foo  ", L"foo");
+  TrimTestBody(L"foo  ", L"foo");
 }
 
-TEST(Trim, trim_10)
+TEST(TrimTest, Trim10)
 {
-  TrimTest(L"foo\r\n", L"foo");
+  TrimTestBody(L"foo\r\n", L"foo");
 }
 
-TEST(Trim, trim_11)
+TEST(TrimTest, Trim11)
 {
-  TrimTest(L"foo\t", L"foo");
+  TrimTestBody(L"foo\t", L"foo");
 }
 
-TEST(Trim, trim_12)
+TEST(TrimTest, Trim12)
 {
-  TrimTest(L"foo bar", L"foo bar");
+  TrimTestBody(L"foo bar", L"foo bar");
 }
 
-TEST(Trim, trim_13)
+TEST(TrimTest, Trim13)
 {
-  TrimTest(L"foo bar \r\n", L"foo bar");
+  TrimTestBody(L"foo bar \r\n", L"foo bar");
 }
 
-TEST(Trim, trim_14)
+TEST(TrimTest, Trim14)
 {
-  TrimTest(L"  foo bar \r\n", L"foo bar");
+  TrimTestBody(L"  foo bar \r\n", L"foo bar");
 }
-