Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: Source/wtf/FunctionalTest.cpp

Issue 1184043002: Fix unit test style in Source/wtf/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: apply review comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/wtf/DequeTest.cpp ('k') | Source/wtf/HashMapTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/FunctionalTest.cpp
diff --git a/Source/wtf/FunctionalTest.cpp b/Source/wtf/FunctionalTest.cpp
index 8ccc3214df0cb2d4977e836d9aebd27309359b67..c5e8fec4f06d0787ddb452e8a21490d9c3f4ebc2 100644
--- a/Source/wtf/FunctionalTest.cpp
+++ b/Source/wtf/FunctionalTest.cpp
@@ -24,13 +24,13 @@
*/
#include "config.h"
-
#include "wtf/Functional.h"
+
#include "wtf/OwnPtr.h"
#include "wtf/RefCounted.h"
#include <gtest/gtest.h>
-namespace {
+namespace WTF {
class UnwrappedClass {
public:
@@ -73,21 +73,15 @@ private:
int m_value;
};
-} // namespace
-
-namespace WTF {
-
template<> struct ParamStorageTraits<ClassToBeWrapped> {
using StorageType = WrappedClass;
static StorageType wrap(const ClassToBeWrapped& value) { return value.wrap(); }
static UnwrappedClass unwrap(const StorageType& value) { return value.unwrap(); }
};
-} // namespace WTF
-
namespace {
-static int returnFortyTwo()
+int returnFortyTwo()
{
return 42;
}
@@ -98,12 +92,12 @@ TEST(FunctionalTest, Basic)
EXPECT_EQ(42, (*returnFortyTwoFunction)());
}
-static int multiplyByTwo(int n)
+int multiplyByTwo(int n)
{
return n * 2;
}
-static double multiplyByOneAndAHalf(double d)
+double multiplyByOneAndAHalf(double d)
{
return d * 1.5;
}
@@ -126,12 +120,12 @@ TEST(FunctionalTest, UnaryPartBind)
EXPECT_EQ(4.5, (*multiplyByOneAndAHalfFunction)(3));
}
-static int multiply(int x, int y)
+int multiply(int x, int y)
{
return x * y;
}
-static int subtract(int x, int y)
+int subtract(int x, int y)
{
return x - y;
}
@@ -158,14 +152,14 @@ TEST(FunctionalTest, BinaryPartBind)
EXPECT_EQ(2, (*subtractFunction)(4, 2));
}
-static void sixArgFunc(int a, double b, char c, int* d, double* e, char* f)
+void sixArgFunc(int a, double b, char c, int* d, double* e, char* f)
{
*d = a;
*e = b;
*f = c;
}
-static void assertArgs(int actualInt, double actualDouble, char actualChar, int expectedInt, double expectedDouble, char expectedChar)
+void assertArgs(int actualInt, double actualDouble, char actualChar, int expectedInt, double expectedDouble, char expectedChar)
{
EXPECT_EQ(expectedInt, actualInt);
EXPECT_EQ(expectedDouble, actualDouble);
@@ -275,7 +269,7 @@ private:
int m_value;
};
-static int multiplyNumberByTwo(Number* number)
+int multiplyNumberByTwo(Number* number)
{
return number->value() * 2;
}
@@ -318,4 +312,6 @@ TEST(FunctionalTest, WrapUnwrapInPartialBind)
EXPECT_EQ(21, (*partiallyBoundFunction)(7));
}
-} // namespace
+} // anonymous namespace
+
+} // namespace WTF
« no previous file with comments | « Source/wtf/DequeTest.cpp ('k') | Source/wtf/HashMapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698