Move ExecutionFramework to the dev::test namespace

test/ExecutionFramework.cpp

@@ -27,8 +27,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::solidity;
+using namespace dev::test;
-using namespace dev::solidity::test;
 
 namespace // anonymous
 {

test/ExecutionFramework.h

@@ -32,7 +32,7 @@
 
 namespace dev
 {
-namespace solidity
+namespace test
 {
 	using rational = boost::rational<dev::bigint>;
 	/// An Ethereum address: 20 bytes.
@@ -46,9 +46,6 @@ namespace solidity
 	static const u256 shannon = exp10<9>();
 	static const u256 wei = exp10<0>();
 
-namespace test
-{
-
 class ExecutionFramework
 {
 
@@ -282,7 +279,6 @@ protected:
 	u256 m_gasUsed;
 };
 
-}
 }
 } // end namespaces
 

test/contracts/AuctionRegistrar.cpp

@@ -27,6 +27,7 @@
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
+using namespace dev::test;
 
 namespace dev
 {

test/contracts/FixedFeeRegistrar.cpp

@@ -35,6 +35,7 @@
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
+using namespace dev::test;
 
 namespace dev
 {

test/contracts/Wallet.cpp

@@ -35,6 +35,7 @@
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
+using namespace dev::test;
 
 namespace dev
 {

test/libsolidity/GasMeter.cpp

@@ -32,6 +32,7 @@
 using namespace std;
 using namespace dev::eth;
 using namespace dev::solidity;
+using namespace dev::test;
 
 namespace dev
 {

test/libsolidity/SolidityEndToEndTest.cpp

@@ -31,6 +31,7 @@
 
 using namespace std;
 using namespace std::placeholders;
+using namespace dev::test;
 
 namespace dev
 {

test/libsolidity/SolidityExecutionFramework.cpp

@@ -24,8 +24,7 @@
 #include <boost/test/framework.hpp>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
-using namespace std;
+using namespace dev::test;
-using namespace dev;
 using namespace dev::solidity;
 using namespace dev::solidity::test;
 

test/libsolidity/SolidityExecutionFramework.h

@@ -38,7 +38,7 @@ namespace solidity
 namespace test
 {
 
-class SolidityExecutionFramework: public ExecutionFramework
+class SolidityExecutionFramework: public dev::test::ExecutionFramework
 {
 
 public:
@@ -49,7 +49,7 @@ public:
 		u256 const& _value = 0,
 		std::string const& _contractName = "",
 		bytes const& _arguments = bytes(),
-		std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
+		std::map<std::string, dev::test::Address> const& _libraryAddresses = std::map<std::string, dev::test::Address>()
 	) override
 	{
 		// Silence compiler version warning

test/libsolidity/SolidityOptimizer.cpp

@@ -37,6 +37,7 @@
 
 using namespace std;
 using namespace dev::eth;
+using namespace dev::test;
 
 namespace dev
 {