From dd05751adf8325176d18eb15b21ed5ce9d50fc3e Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Mon, 2 Mar 2015 21:19:36 +0100
Subject: [PATCH] add memory tests

---
 state.cpp | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/state.cpp b/state.cpp
index 71a4bbcfa..07409d000 100644
--- a/state.cpp
+++ b/state.cpp
@@ -93,7 +93,6 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 
 			// check addresses
 #if ETH_FATDB
-			cout << "fatDB is defined\n";
 			auto expectedAddrs = importer.m_statePost.addresses();
 			auto resultAddrs = theState.addresses();
 			for (auto& expectedPair : expectedAddrs)
@@ -207,16 +206,46 @@ BOOST_AUTO_TEST_CASE(stMemoryStressTest)
 	   }
 }
 
- BOOST_AUTO_TEST_CASE(stSolidityTest)
- {
-		dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
- }
+BOOST_AUTO_TEST_CASE(stSolidityTest)
+{
+	   for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	   {
+			   string arg = boost::unit_test::framework::master_test_suite().argv[i];
+			   if (arg == "--quadratic" || arg == "--all")
+			   {
+					   auto start = chrono::steady_clock::now();
+
+					   dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
+
+					   auto end = chrono::steady_clock::now();
+					   auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+					   cnote << "test duration: " << duration.count() << " milliseconds.\n";
+			   }
+	   }
+}
 
 BOOST_AUTO_TEST_CASE(stMemoryTest)
 {
 	   dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stMemoryStressTest)
+{
+	   for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	   {
+			   string arg = boost::unit_test::framework::master_test_suite().argv[i];
+			   if (arg == "--memory" || arg == "--all")
+			   {
+					   auto start = chrono::steady_clock::now();
+
+					   dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
+
+					   auto end = chrono::steady_clock::now();
+					   auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+					   cnote << "test duration: " << duration.count() << " milliseconds.\n";
+			   }
+	   }
+}
 
 BOOST_AUTO_TEST_CASE(stCreateTest)
 {