From d0a5cc8d66534f05abd4e60de08cc8c460172ecc Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 7 May 2009 18:18:55 +0000
Subject: [PATCH] fixed tests

---
 t/Asset/Sku.t            | 3 ++-
 t/Macro/AdminToggle.t    | 5 +++--
 t/Macro/EditableToggle.t | 1 +
 t/Macro/GroupAdd.t       | 1 +
 t/Macro/GroupDelete.t    | 1 +
 t/Macro/H_homeLink.t     | 3 ++-
 t/Macro/LoginToggle.t    | 1 +
 t/Macro/a_account.t      | 3 ++-
 t/Macro/r_printable.t    | 1 +
 9 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/t/Asset/Sku.t b/t/Asset/Sku.t
index b6ee46ca5..a16009acd 100644
--- a/t/Asset/Sku.t
+++ b/t/Asset/Sku.t
@@ -66,7 +66,8 @@ is($sku->getConfiguredTitle, $sku->getTitle, "configured title and title should
 is($sku->shipsSeparately, 0, 'shipsSeparately return 0 by default');
 
 $sku->update({shipsSeparately => 1,});
-is($sku->shipsSeparately, 1, '... tracks shipsSepartely sku property');
+$sku->update({isShippingRequired => 1,});
+is($sku->shipsSeparately, 1, 'shipsSeparately only returns true when isShippingRequired and shipsSeparately');
 
 isa_ok($sku->getCart, "WebGUI::Shop::Cart", "can get a cart object");
 my $item = $sku->addToCart;
diff --git a/t/Macro/AdminToggle.t b/t/Macro/AdminToggle.t
index ca1afe405..80435a523 100644
--- a/t/Macro/AdminToggle.t
+++ b/t/Macro/AdminToggle.t
@@ -155,6 +155,7 @@ sub addTemplate {
 		namespace => 'Macro/AdminToggle',
 		template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
 		id => 'AdminToggleTemplate--Z',
+        usePacked => 0,
 	};
 	my $template = $importNode->addChild($properties, $properties->{id});
 	$versionTag->commit;
@@ -175,8 +176,8 @@ sub simpleHTMLParser {
 sub simpleTextParser {
 	my ($text) = @_;
 
-	my ($url)   = $text =~ /HREF=(.+?)(LABEL|\Z)/;
-	my ($label) = $text =~ /LABEL=(.+?)(HREF|\Z)/;
+	my ($url)   = $text =~ /HREF=(.+?)\s/;
+	my ($label) = $text =~ /LABEL=(.+?)\Z/;
 
 	return ($url, $label);
 }
diff --git a/t/Macro/EditableToggle.t b/t/Macro/EditableToggle.t
index 7fcb5fc0e..bf26cb1a6 100644
--- a/t/Macro/EditableToggle.t
+++ b/t/Macro/EditableToggle.t
@@ -269,6 +269,7 @@ sub setupTest {
 		groupIdEdit => $editGroup->getId(),
 		#     '1234567890123456789012'
 		id => 'EditableToggleTemplate',
+        usePacked => 1,
 	};
 	my $asset = $defaultNode->addChild($properties, $properties->{id});
 	$versionTag->commit;
diff --git a/t/Macro/GroupAdd.t b/t/Macro/GroupAdd.t
index 101fb1e31..32e2f8c8d 100644
--- a/t/Macro/GroupAdd.t
+++ b/t/Macro/GroupAdd.t
@@ -174,6 +174,7 @@ sub setupTest {
 		template => "HREF=<tmpl_var group.url>\nLABEL=<tmpl_var group.text>",
 		#     '1234567890123456789012'
 		id => 'GroupAdd001100Template',
+        usePacked => 1,
 	};
 	my $asset = $defaultNode->addChild($properties, $properties->{id});
 	$versionTag->commit;
diff --git a/t/Macro/GroupDelete.t b/t/Macro/GroupDelete.t
index 64d5aad47..c8ec7eb0f 100644
--- a/t/Macro/GroupDelete.t
+++ b/t/Macro/GroupDelete.t
@@ -172,6 +172,7 @@ sub setupTest {
 		url => 'groupdelete-test',
 		namespace => 'Macro/GroupDelete',
 		template => "HREF=<tmpl_var group.url>\nLABEL=<tmpl_var group.text>",
+        usePacked => 1,
 		#     '1234567890123456789012'
 		id => 'GroupDelete001Template',
 	};
diff --git a/t/Macro/H_homeLink.t b/t/Macro/H_homeLink.t
index f20ca8cf6..61e0be123 100644
--- a/t/Macro/H_homeLink.t
+++ b/t/Macro/H_homeLink.t
@@ -99,7 +99,8 @@ sub addTemplate {
 		url => 'h_homelink-test',
 		namespace => 'Macro/H_homeLink',
 		template => "HREF=<tmpl_var homeLink.url>\nLABEL=<tmpl_var homeLink.text>",
-		id => 'testTemplateH_HomeLink'
+		id => 'testTemplateH_HomeLink',
+        usePacked => 1,
 	};
 	my $template = $importNode->addChild($properties, $properties->{id});
 	$versionTag->commit;
diff --git a/t/Macro/LoginToggle.t b/t/Macro/LoginToggle.t
index 1b7a4f337..0b34064bd 100644
--- a/t/Macro/LoginToggle.t
+++ b/t/Macro/LoginToggle.t
@@ -199,6 +199,7 @@ sub setupTest {
 		namespace => 'Macro/LoginToggle',
 		template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
 		groupIdEdit => $tao->getId(),
+        usePacked => 1,
 		#     '1234567890123456789012'
 		id => 'LoginToggleTemplateA01',
 	};
diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t
index 6342fcd62..f46bc8f68 100644
--- a/t/Macro/a_account.t
+++ b/t/Macro/a_account.t
@@ -103,7 +103,8 @@ sub addTemplate {
 		url => 'a_account-test',
 		namespace => 'Macro/a_account',
 		template => "HREF=<tmpl_var account.url>\nLABEL=<tmpl_var account.text>",
-		id => 'testTemplatea_account1'
+		id => 'testTemplatea_account1',
+        usePacked => 1,
 	};
 	my $template = $importNode->addChild($properties, $properties->{id});
 	$versionTag->commit;
diff --git a/t/Macro/r_printable.t b/t/Macro/r_printable.t
index 2572e4a74..2578c88eb 100644
--- a/t/Macro/r_printable.t
+++ b/t/Macro/r_printable.t
@@ -121,6 +121,7 @@ sub setupTest {
 		template => "HREF=<tmpl_var printable.url>\nLABEL=<tmpl_var printable.text>",
 		#     '1234567890123456789012'
 		id => 'printable01100Template',
+        usePacked => 1,
 	};
 	my $asset = $defaultNode->addChild($properties, $properties->{id});
 	$versionTag->commit;