Merge pull request #13371 from vespa-engine/toregge/move-fastlib-testsuite-to-namespace-fast-testsuite

Move fastlib testsuite into namespace fast::testsuite.

3 files changed, 16 insertions, 0 deletions

diff --git a/fastlib/src/vespa/fastlib/testsuite/suite.h b/fastlib/src/vespa/fastlib/testsuite/suite.h
index 94e756387bf..ee8775518a2 100644
--- a/fastlib/src/vespa/fastlib/testsuite/suite.h
+++ b/fastlib/src/vespa/fastlib/testsuite/suite.h
@@ -68,6 +68,8 @@
 #include <cassert>
 
 
+namespace fast::testsuite {
+
 class TestSuiteError;
 
 class Suite
@@ -258,3 +260,7 @@ void Suite::Reset()
         m_tests[i]->Reset();
     }
 }
+
+}
+
+using fast::testsuite::Suite;
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.cpp b/fastlib/src/vespa/fastlib/testsuite/test.cpp
index d7541d163e7..a29e5053c98 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.cpp
+++ b/fastlib/src/vespa/fastlib/testsuite/test.cpp
@@ -2,6 +2,8 @@
 
 #include "test.h"
 
+namespace fast::testsuite {
+
 Test::Test(std::ostream* osptr, const char*name) :
     m_osptr(osptr),
     name_(name),
@@ -135,3 +137,5 @@ long Test::Report(int padSpaces) const
     }
     return m_nFail;
 }
+
+}
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.h b/fastlib/src/vespa/fastlib/testsuite/test.h
index ea17e64dba2..96f38c1577b 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.h
+++ b/fastlib/src/vespa/fastlib/testsuite/test.h
@@ -73,6 +73,8 @@
     do_equality_test((lhs), (rhs),  #lhs, __FILE__, __LINE__)
 #define _fail(str) do_fail((str), __FILE__, __LINE__)
 
+namespace fast::testsuite {
+
 class Test
 {
 public:
@@ -143,3 +145,7 @@ bool Test::do_equality_test(const t1& lhs, const t2& rhs, const char* lbl,
     }
     return false;
 }
+
+}
+
+using fast::testsuite::Test;