From 8460733e3100e4dd5fe82dbc15eb9bbafa6eaf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Mon, 5 Sep 2016 22:11:08 +0200
Subject: [PATCH] Add test for urlhint

---
 dapps/src/apps/fetcher.rs  |  2 +-
 dapps/src/apps/urlhint.rs  | 21 +++++++++++++++++++++
 dapps/src/tests/helpers.rs |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dapps/src/apps/fetcher.rs b/dapps/src/apps/fetcher.rs
index f5d402a15..8c0e7c421 100644
--- a/dapps/src/apps/fetcher.rs
+++ b/dapps/src/apps/fetcher.rs
@@ -145,7 +145,7 @@ impl<R: URLHint> ContentFetcher<R> {
 						),
 						Some(URLHintResult::Content(content)) => (
 							Some(ContentStatus::Fetching(abort.clone())),
-								Box::new(ContentFetcherHandler::new(
+							Box::new(ContentFetcherHandler::new(
 								content.url,
 								abort,
 								control,
diff --git a/dapps/src/apps/urlhint.rs b/dapps/src/apps/urlhint.rs
index 692860a62..2b86c0777 100644
--- a/dapps/src/apps/urlhint.rs
+++ b/dapps/src/apps/urlhint.rs
@@ -343,6 +343,27 @@ mod tests {
 		})))
 	}
 
+	#[test]
+	fn should_decode_urlhint_content_output() {
+		// given
+		let mut registrar = FakeRegistrar::new();
+		registrar.responses = Mutex::new(vec![
+			Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
+			Ok("00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000deadcafebeefbeefcafedeaddeedfeedffffffff000000000000000000000000000000000000000000000000000000000000003d68747470733a2f2f657468636f72652e696f2f6173736574732f696d616765732f657468636f72652d626c61636b2d686f72697a6f6e74616c2e706e67000000".from_hex().unwrap()),
+		]);
+		let urlhint = URLHintContract::new(Arc::new(registrar));
+
+		// when
+		let res = urlhint.resolve("test".bytes().collect());
+
+		// then
+		assert_eq!(res, Some(URLHintResult::Content(Content {
+			url: "https://ethcore.io/assets/images/ethcore-black-horizontal.png".into(),
+			mime: "image/png".into(),
+			owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
+		})))
+	}
+
 	#[test]
 	fn should_return_valid_url() {
 		// given
diff --git a/dapps/src/tests/helpers.rs b/dapps/src/tests/helpers.rs
index 4cd21520c..efbd24a8d 100644
--- a/dapps/src/tests/helpers.rs
+++ b/dapps/src/tests/helpers.rs
@@ -17,7 +17,7 @@
 use std::env;
 use std::str;
 use std::sync::Arc;
-use rustc_serialize::hex::{ToHex, FromHex};
+use rustc_serialize::hex::FromHex;
 
 use ServerBuilder;
 use Server;