From 818ab4a6901a287f4168ae32224a01f5b39a251d Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 30 Jul 2006 04:03:46 +0000
Subject: [PATCH] conditional load check and fix default param tests

---
 t/Macro/EditableToggle.t |  1 -
 t/Macro/Env.t            | 14 ++++++++++++--
 t/Macro/Extras.t         | 11 ++++++++++-
 t/Macro/c_companyName.t  | 14 ++++++++++++--
 t/Macro/e_companyEmail.t | 14 ++++++++++++--
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/t/Macro/EditableToggle.t b/t/Macro/EditableToggle.t
index f0eaa73ce..21b09af44 100644
--- a/t/Macro/EditableToggle.t
+++ b/t/Macro/EditableToggle.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::EditableToggle;
 use WebGUI::Session;
 use HTML::TokeParser;
 use Data::Dumper;
diff --git a/t/Macro/Env.t b/t/Macro/Env.t
index 7464c89ec..94a325f7a 100644
--- a/t/Macro/Env.t
+++ b/t/Macro/Env.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::Env;
 use WebGUI::Session;
 use Data::Dumper;
 
@@ -28,7 +27,16 @@ my $session = WebGUI::Test->session;
 my %env = %{ $session->env->{_env} };
 my @keys = keys %env;
 
-plan tests => 3 + scalar keys %env;
+my $numTests = 1 + 3 + scalar keys %env;
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::Env';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
 
 my $output;
 
@@ -45,3 +53,5 @@ foreach my $key (keys %env) {
 	my $output =  WebGUI::Macro::Env::process($session, $key);
 	is($output, $env{$key}, 'Fetching: '.$key);
 }
+
+}
diff --git a/t/Macro/Extras.t b/t/Macro/Extras.t
index 3936757f5..594b0b38a 100644
--- a/t/Macro/Extras.t
+++ b/t/Macro/Extras.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::Extras;
 use WebGUI::Session;
 
 use Test::More; # increment this value for each test you create
@@ -50,10 +49,20 @@ my @testSets = (
 
 my $numTests = scalar @testSets;
 
+$numTests += 1;
+
 plan tests => $numTests;
 
+my $macro = 'WebGUI::Macro::Extras';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
 foreach my $testSet (@testSets) {
 	my $output = WebGUI::Macro::Extras::process($session, $testSet->{path});
 	is($output, $testSet->{output}, $testSet->{comment});
 }
 
+}
diff --git a/t/Macro/c_companyName.t b/t/Macro/c_companyName.t
index c2e80d39f..a53be31d0 100644
--- a/t/Macro/c_companyName.t
+++ b/t/Macro/c_companyName.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::c_companyName;
 use WebGUI::Session;
 use Data::Dumper;
 
@@ -21,9 +20,20 @@ use Test::More; # increment this value for each test you create
 
 my $session = WebGUI::Test->session;
 
-plan tests => 1;
+my $numTests = 1+1;
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::c_companyName';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
 
 my ($value) = $session->dbSlave->quickArray(
 	"select value from settings where name='companyName'");
 my $output = WebGUI::Macro::c_companyName::process($session);
 is($output, $value, sprintf "Testing companyName");
+
+}
diff --git a/t/Macro/e_companyEmail.t b/t/Macro/e_companyEmail.t
index 334cc8935..b9f2f2055 100644
--- a/t/Macro/e_companyEmail.t
+++ b/t/Macro/e_companyEmail.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::e_companyEmail;
 use WebGUI::Session;
 use Data::Dumper;
 
@@ -21,9 +20,20 @@ use Test::More; # increment this value for each test you create
 
 my $session = WebGUI::Test->session;
 
-plan tests => 1;
+my $numTests = 1 + 1;
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::e_companyEmail';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
 
 my ($value) = $session->dbSlave->quickArray(
 	"select value from settings where name='companyEmail'");
 my $output = WebGUI::Macro::e_companyEmail::process($session);
 is($output, $value, sprintf "Testing companyEmail");
+
+}