diff options
Diffstat (limited to 'src/mongo/unittest')
| -rw-r--r-- | src/mongo/unittest/temp_dir.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/unittest/unittest.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/unittest/temp_dir.cpp b/src/mongo/unittest/temp_dir.cpp index 19ab9b5d077..a4a91fa8a90 100644 --- a/src/mongo/unittest/temp_dir.cpp +++ b/src/mongo/unittest/temp_dir.cpp @@ -38,9 +38,9 @@ #include "mongo/base/init.h" #include "mongo/unittest/unittest.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" #include "mongo/util/options_parser/startup_option_init.h" #include "mongo/util/options_parser/startup_options.h" +#include "mongo/util/str.h" namespace mongo { @@ -48,7 +48,6 @@ namespace mongo { using std::string; namespace unittest { -namespace str = mongoutils::str; namespace moe = mongo::optionenvironment; namespace { diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h index 204443b9708..d00338348a9 100644 --- a/src/mongo/unittest/unittest.h +++ b/src/mongo/unittest/unittest.h @@ -49,7 +49,7 @@ #include "mongo/unittest/bson_test_util.h" #include "mongo/unittest/unittest_helpers.h" #include "mongo/util/assert_util.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" /** * Fail unconditionally, reporting the given message. @@ -206,7 +206,7 @@ std::string myString(BIG_STRING); \ std::string myContains(CONTAINS); \ if (myString.find(myContains) == std::string::npos) { \ - ::mongoutils::str::stream err; \ + ::mongo::str::stream err; \ err << "Expected to find " #CONTAINS " (" << myContains << ") in " #BIG_STRING " (" \ << myString << ")"; \ ::mongo::unittest::TestAssertionFailure(__FILE__, __LINE__, err).stream(); \ |