From d55789fce3bed1e722cd73ffd62f51de7c6b5ffc Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 20 Oct 2006 22:56:30 +0000
Subject: [PATCH] refactored test to make pick up tests easier

---
 t/Session/Icon.t | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/t/Session/Icon.t b/t/Session/Icon.t
index b671cbb3a..333e17a84 100644
--- a/t/Session/Icon.t
+++ b/t/Session/Icon.t
@@ -72,31 +72,30 @@ foreach my $test (@iconTests) {
 	my $label = $i18n->get($test->{label});
 
 	my $icon = $session->icon->$method($test->{urlParam});
-	my ($url, $alt, $title) = linkAndText($icon);
 
+	my ($url) = linkAndText($icon, 'a', 'href');
 	is($url, $session->url->gateway($requestedUrl, $test->{urlParam}), "$method: url okay");
+
+	my ($alt, $title) = linkAndText($icon, 'img', 'alt', 'title');
 	is($alt, $label, "$method: alt okay");
 	is($title, $label, "$method: title okay");
 
 	$icon = $session->icon->copy($test->{urlParam2}, '/lowes');
-	($url, $alt, $title) = linkAndText($icon);
+	($url) = linkAndText($icon, 'a', 'href');
 	is($url, $session->url->gateway('/lowes', $test->{urlParam2}), "$method: manual url okay");
 
 }
 
 
 sub linkAndText {
-	my ($text) = @_;
+	my ($text, $tag, @params) = @_;
 	my $p = HTML::TokeParser->new(\$text);
 
-	my $token = $p->get_tag('a');
-	my $url = $token->[1]{href} || "-";
+	my $token = $p->get_tag($tag);
 
-	$token = $p->get_tag('img');
-	my $alt = $token->[1]{alt} || "-";
-	my $title = $token->[1]{title} || "-";
+	my @parsedParams = map { $token->[1]{$_} || '-' } @params;
 
-	return ($url, $alt, $title);
+	return @parsedParams;
 }
 
 ####################################################
@@ -108,6 +107,8 @@ sub linkAndText {
 #
 ####################################################
 
+my $icon = $session->icon->drag();
+
 END: {
 	$session->user->profileField('toolbar', $origToolbar);
 }