From 808c7ea26db2fb0cdf692620c14c13842007ab1c Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethdev.com>
Date: Tue, 9 Jun 2015 11:55:19 +0200
Subject: [PATCH] cleaned up the tests

---
 test/libsolidity/SolidityEndToEndTest.cpp     | 38 +++++++------------
 .../SolidityNameAndTypeResolution.cpp         | 10 -----
 2 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index a2c5556d1..fdd865e74 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -564,6 +564,20 @@ BOOST_AUTO_TEST_CASE(strings)
 	BOOST_CHECK(callContractFunction("pipeThrough(bytes2,bool)", string("\0\x02", 2), true) == encodeArgs(string("\0\x2", 2), true));
 }
 
+BOOST_AUTO_TEST_CASE(empty_string_on_stack)
+{
+	char const* sourceCode = R"(
+		contract test {
+			function run() external returns(bytes2 ret) {
+				var y = "";
+				ret = y;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("run()") == encodeArgs(byte(0x00)));
+}
+
 BOOST_AUTO_TEST_CASE(inc_dec_operators)
 {
 	char const* sourceCode = R"(
@@ -3772,30 +3786,6 @@ BOOST_AUTO_TEST_CASE(packed_storage_structs_delete)
 	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
 }
 
-BOOST_AUTO_TEST_CASE(packed_storage_structs_with_empty_string)
-{
-	char const* sourceCode = R"(
-	contract C {
-		struct str { uint8 a; string b; uint8 c; }
-		uint8 a;
-		uint8 b;
-		str data;
-		function test() returns (bool) {
-			a = 2;
-			b = 3;
-			var x = "";
-			data.a = 4;
-			data.c = 5;
-			delete x;
-			delete data.b;
-			return a == 2 && b == 3 && data.a == 4 && data.c == 5;
-		}
-	}
-	)";
-	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("test()") == encodeArgs(true));
-}
-
 BOOST_AUTO_TEST_CASE(overloaded_function_call_resolve_to_first)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index ca89f42bc..b078fe6a2 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -1665,16 +1665,6 @@ BOOST_AUTO_TEST_CASE(local_const_variable)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(text), ParserError);
 }
 
-BOOST_AUTO_TEST_CASE(bytes0_array)
-{
-	char const* text = R"(
-		contract Foo {
-			bytes0[] illegalArray;
-		}
-	)";
-	BOOST_CHECK_THROW(parseTextAndResolveNames(text), DeclarationError);
-}
-
 BOOST_AUTO_TEST_CASE(overloaded_function_cannot_resolve)
 {
 	char const* sourceCode = R"(