Refactor: Remove using namespace <xxx> from /dbwrapper_tests

random-zebra · random-zebra · commit 82f90883b101 · 2020-05-26T00:58:23.000+02:00
backports (partially) bitcoin/bitcoin@73f4119
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
@@ -11,12 +11,9 @@
 #include <boost/assert.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-using namespace boost::assign; // bring 'operator+=()' into scope
-using namespace boost::filesystem;
 
 // Test if a string consists entirely of null characters
-bool is_null_key(const vector<unsigned char>& key) {
+bool is_null_key(const std::vector<unsigned char>& key) {
     bool isnull = true;
 
     for (unsigned int i = 0; i < key.size(); i++)
@@ -30,7 +27,7 @@ BOOST_FIXTURE_TEST_SUITE(dbwrapper_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(dbwrapper)
 {
     {
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false);
         char key = 'k';
         uint256 in = GetRandHash();
@@ -46,7 +43,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper)
 BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 {
     {
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false);
 
         char key = 'i';
@@ -81,7 +78,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
 {
     {
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false);
 
         // The two keys are intentionally chosen for ordering

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,9 @@`
`11`	`11`	`#include <boost/assert.hpp>`
`12`	`12`	`#include <boost/test/unit_test.hpp>`
`13`	`13`
`14`		`-using namespace std;`
`15`		`-using namespace boost::assign; // bring 'operator+=()' into scope`
`16`		`-using namespace boost::filesystem;`
`17`	`14`
`18`	`15`	`// Test if a string consists entirely of null characters`
`19`		`-bool is_null_key(const vector<unsigned char>& key) {`
	`16`	`+bool is_null_key(const std::vector<unsigned char>& key) {`
`20`	`17`	`bool isnull = true;`
`21`	`18`
`22`	`19`	`for (unsigned int i = 0; i < key.size(); i++)`
`@@ -30,7 +27,7 @@ BOOST_FIXTURE_TEST_SUITE(dbwrapper_tests, BasicTestingSetup)`
`30`	`27`	`BOOST_AUTO_TEST_CASE(dbwrapper)`
`31`	`28`	`{`
`32`	`29`	`{`
`33`		`- path ph = temp_directory_path() / unique_path();`
	`30`	`+ boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();`
`34`	`31`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`35`	`32`	`char key = 'k';`
`36`	`33`	`uint256 in = GetRandHash();`
`@@ -46,7 +43,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper)`
`46`	`43`	`BOOST_AUTO_TEST_CASE(dbwrapper_batch)`
`47`	`44`	`{`
`48`	`45`	`{`
`49`		`- path ph = temp_directory_path() / unique_path();`
	`46`	`+ boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();`
`50`	`47`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`51`	`48`
`52`	`49`	`char key = 'i';`
`@@ -81,7 +78,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)`
`81`	`78`	`BOOST_AUTO_TEST_CASE(dbwrapper_iterator)`
`82`	`79`	`{`
`83`	`80`	`{`
`84`		`- path ph = temp_directory_path() / unique_path();`
	`81`	`+ boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();`
`85`	`82`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`86`	`83`
`87`	`84`	`// The two keys are intentionally chosen for ordering`