libmbcommon: Use "using namespace testing" instead of testing::

It's easier to read with heavy gmock usage. Signed-off-by: Andrew Gunnerson <[email protected]>
Dark98 · Nov 25, 2018 · fa1bbfb · fa1bbfb
1 parent 0f9f3be
commit fa1bbfb
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 198 deletions.
diff --git a/libmbcommon/tests/file/mock_test_file.cpp b/libmbcommon/tests/file/mock_test_file.cpp
@@ -24,6 +24,7 @@
 #include "mbcommon/string.h"
 
 using namespace mb;
+using namespace testing;
 
 TestFile::TestFile() : TestFile(nullptr)
 {
@@ -179,17 +180,17 @@ MockTestFile::MockTestFile(TestFileCounters *counters) : TestFile(counters)
 {
     // Call original methods by default
     ON_CALL(*this, on_open())
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_open));
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_open));
     ON_CALL(*this, on_close())
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_close));
-    ON_CALL(*this, on_read(testing::_, testing::_))
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_read));
-    ON_CALL(*this, on_write(testing::_, testing::_))
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_write));
-    ON_CALL(*this, on_seek(testing::_, testing::_))
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_seek));
-    ON_CALL(*this, on_truncate(testing::_))
-            .WillByDefault(testing::Invoke(this, &MockTestFile::orig_on_truncate));
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_close));
+    ON_CALL(*this, on_read(_, _))
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_read));
+    ON_CALL(*this, on_write(_, _))
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_write));
+    ON_CALL(*this, on_seek(_, _))
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_seek));
+    ON_CALL(*this, on_truncate(_))
+            .WillByDefault(Invoke(this, &MockTestFile::orig_on_truncate));
 }
 
 MockTestFile::~MockTestFile()

diff --git a/libmbcommon/tests/file/test_callbacks.cpp b/libmbcommon/tests/file/test_callbacks.cpp
@@ -25,8 +25,9 @@
 #include "mbcommon/file/callbacks.h"
 
 using namespace mb;
+using namespace testing;
 
-struct FileCallbacksTest : testing::Test
+struct FileCallbacksTest : Test
 {
     unsigned int _n_open_cb = 0;
     unsigned int _n_close_cb = 0;