From ada68bcee66690f3511db14306d6bdff6e1f7dc5 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 18 Sep 2017 22:25:50 +0100
Subject: Add tests for constant bytes/strings

---
 test/libsolidity/SolidityEndToEndTest.cpp          | 24 ++++++++++++++++++++++
 test/libsolidity/SolidityNameAndTypeResolution.cpp | 12 +++++++++++
 2 files changed, 36 insertions(+)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index f885b0d3..bdac8278 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -10076,6 +10076,30 @@ BOOST_AUTO_TEST_CASE(function_types_sig)
 	BOOST_CHECK(callContractFunction("h()") == encodeArgs(asString(FixedHash<4>(dev::keccak256("f()")).asBytes())));
 }
 
+BOOST_AUTO_TEST_CASE(constant_string)
+{
+	char const* sourceCode = R"(
+		contract C {
+			bytes constant a = "\x03\x01\x02";
+			bytes constant b = hex"030102";
+			string constant c = "hello";
+			function f() returns (bytes) {
+				return a;
+			}
+			function g() returns (bytes) {
+				return b;
+			}
+			function h() returns (bytes) {
+				return bytes(c);
+			}
+		}
+	)";
+	compileAndRun(sourceCode, 0, "C");
+	BOOST_CHECK(callContractFunction("f()") == encodeDyn(string("\x03\x01\x02")));
+	BOOST_CHECK(callContractFunction("g()") == encodeDyn(string("\x03\x01\x02")));
+	BOOST_CHECK(callContractFunction("h()") == encodeDyn(string("hello")));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 85acd8bf..2ca3a562 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -2385,6 +2385,18 @@ BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
 	CHECK_ERROR(text, TypeError, "implemented");
 }
 
+BOOST_AUTO_TEST_CASE(assignment_to_const_string_bytes)
+{
+	char const* text = R"(
+		contract C {
+			bytes constant a = "\x00\x01\x02";
+			bytes constant b = hex"000102";
+			string constant c = "hello";
+		}
+	)";
+	CHECK_SUCCESS(text);
+}
+
 BOOST_AUTO_TEST_CASE(constant_struct)
 {
 	char const* text = R"(
-- 
cgit