From 3782a33e5004df06714648b5462d3d1960ed9de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Fri, 13 Mar 2015 13:10:38 +0100
Subject: [PATCH] Prettify VM and State test outputs

---
 TestHelper.cpp | 2 +-
 state.cpp      | 6 +++---
 vm.cpp         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 72fecf593..128318b8c 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -473,7 +473,7 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun
 
 	try
 	{
-		cnote << "Testing ..." << _name;
+		std::cout << "TEST " << _name << ":\n";
 		json_spirit::mValue v;
 		string s = asString(dev::contents(testPath + "/" + _name + ".json"));
 		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + testPath + "/" + _name + ".json is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?");
diff --git a/state.cpp b/state.cpp
index 8c191aa70..162ae5f34 100644
--- a/state.cpp
+++ b/state.cpp
@@ -47,7 +47,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 
 	for (auto& i: v.get_obj())
 	{
-		cerr << i.first << endl;
+		std::cout << "  " << i.first << "\n";
 		mObject& o = i.second.get_obj();
 
 		BOOST_REQUIRE(o.count("env") > 0);
@@ -67,12 +67,12 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 		}
 		catch (Exception const& _e)
 		{
-			cnote << "state execution did throw an exception: " << diagnostic_information(_e);
+			cnote << "Exception:\n" << diagnostic_information(_e);
 			theState.commit();
 		}
 		catch (std::exception const& _e)
 		{
-			cnote << "state execution did throw an exception: " << _e.what();
+			cnote << "state execution exception: " << _e.what();
 		}
 
 		if (_fillin)
diff --git a/vm.cpp b/vm.cpp
index 24ae4e069..2bdafb270 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -316,7 +316,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 
 	for (auto& i: v.get_obj())
 	{
-		cnote << i.first;
+		std::cout << "  " << i.first << "\n";
 		mObject& o = i.second.get_obj();
 
 		BOOST_REQUIRE(o.count("env") > 0);
@@ -354,7 +354,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 		}
 		catch (VMException const&)
 		{
-			cnote << "Safe VM Exception";
+			std::cout << "    Safe VM Exception\n";
 			vmExceptionOccured = true;
 		}
 		catch (Exception const& _e)
@@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE(vmRandom)
 	{
 		try
 		{
-			cnote << "Testing ..." << path.filename();
+			std::cout << "TEST " << path.filename() << "\n";
 			json_spirit::mValue v;
 			string s = asString(dev::contents(path.string()));
 			BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content of " + path.string() + " is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?");