From ab502e84d8827024a9aadb9b3d947dc920b5edd3 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 21 Oct 2006 16:44:51 +0000
Subject: [PATCH] make test more robust to handle multiple toolbars

---
 t/Session/Icon.t | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/t/Session/Icon.t b/t/Session/Icon.t
index 5b461711b..7fa791598 100644
--- a/t/Session/Icon.t
+++ b/t/Session/Icon.t
@@ -141,13 +141,21 @@ is($anchorTag, undef, "moveDown: no anchor tag when disabled is set");
 #
 ####################################################
 
-my $toolbarOptions = $session->icon->getToolbarOptions();
-my $expectedOptions = {
-	useLanguageDefault => $i18n->get('1084', 'WebGUI'),
-	bullet => 'bullet', 
-};
+my $toolbarDir = join '/', $session->config->get('extrasPath'), 'toolbar';
+my $dirOpened = opendir my $tbdir, $toolbarDir or diag "uh-oh: $!";
+
+SKIP: {
+
+	skip 'No toolbar dir', 1 unless $dirOpened;
+	my @toolbarDirs = grep {! /^\./ } readdir $tbdir;
+	push @toolbarDirs, 'useLanguageDefault';
+
+	my $toolbarOptions = $session->icon->getToolbarOptions();
+	my @toolbarOptionDirs = keys %{ $toolbarOptions };
+
+	cmp_bag(\@toolbarDirs, \@toolbarOptionDirs, 'getToolbarOptions');
+}
 
-cmp_deeply($expectedOptions, $toolbarOptions, 'getToolbarOptions');
 
 sub linkAndText {
 	my ($text, $tag, @params) = @_;