From 81b77e1836e02ef91675686d920a7e748ea3894a Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 30 Apr 2009 19:45:37 +0000
Subject: [PATCH] fix now that things are packed

---
 t/Macro/EditableToggle.t | 4 ++--
 t/Macro/GroupAdd.t       | 5 ++---
 t/Macro/GroupDelete.t    | 5 ++---
 t/Macro/H_homeLink.t     | 4 ++--
 t/Macro/L_loginBox.t     | 2 +-
 t/Macro/LoginToggle.t    | 4 ++--
 t/Macro/a_account.t      | 4 ++--
 t/Macro/r_printable.t    | 5 ++---
 8 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/t/Macro/EditableToggle.t b/t/Macro/EditableToggle.t
index a818adf23..9c66f0412 100644
--- a/t/Macro/EditableToggle.t
+++ b/t/Macro/EditableToggle.t
@@ -245,8 +245,8 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
diff --git a/t/Macro/GroupAdd.t b/t/Macro/GroupAdd.t
index 0c0e36e42..e83ca4728 100644
--- a/t/Macro/GroupAdd.t
+++ b/t/Macro/GroupAdd.t
@@ -193,13 +193,12 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
 
-
 END { ##Clean-up after yourself, always
 	foreach my $testGroup (@{ $groups }, ) {
 		$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
diff --git a/t/Macro/GroupDelete.t b/t/Macro/GroupDelete.t
index f97325eea..30e0f69bc 100644
--- a/t/Macro/GroupDelete.t
+++ b/t/Macro/GroupDelete.t
@@ -193,13 +193,12 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
 
-
 END { ##Clean-up after yourself, always
 	foreach my $testGroup (@{ $groups }, ) {
 		$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
diff --git a/t/Macro/H_homeLink.t b/t/Macro/H_homeLink.t
index 195afd777..f20ca8cf6 100644
--- a/t/Macro/H_homeLink.t
+++ b/t/Macro/H_homeLink.t
@@ -120,8 +120,8 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
diff --git a/t/Macro/L_loginBox.t b/t/Macro/L_loginBox.t
index 17b533806..444e63acc 100644
--- a/t/Macro/L_loginBox.t
+++ b/t/Macro/L_loginBox.t
@@ -176,7 +176,7 @@ sub simpleTextParser {
 	my ($text) = @_;
 
 	my %pairedData = ();
-	while($text =~ m/^\s*(\S+)\s*=\s*(.*?)-\+-/smgc) {
+	while($text =~ m/\s*(\S+)\s*=\s*(.*?)-\+-/smgc) {
 		$pairedData{$1} = $2;
 	}
 	return %pairedData;
diff --git a/t/Macro/LoginToggle.t b/t/Macro/LoginToggle.t
index da2f69a6b..0cf680f3d 100644
--- a/t/Macro/LoginToggle.t
+++ b/t/Macro/LoginToggle.t
@@ -179,8 +179,8 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t
index f48ae78ee..6342fcd62 100644
--- a/t/Macro/a_account.t
+++ b/t/Macro/a_account.t
@@ -124,8 +124,8 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
diff --git a/t/Macro/r_printable.t b/t/Macro/r_printable.t
index fad6c982d..2572e4a74 100644
--- a/t/Macro/r_printable.t
+++ b/t/Macro/r_printable.t
@@ -142,13 +142,12 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /^HREF=(.+)$/m;
-	my ($label) = $text =~ /^LABEL=(.+)$/m;
+	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
+	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
 
 	return ($url, $label);
 }
 
-
 END { ##Clean-up after yourself, always
 	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
 		$versionTag->rollback;