From: Andrew Moore <[EMAIL PROTECTED]>
the icondirectories.t test depends on the database, so it needed to be
moved. But, it's really more of an author test since it's testinging the
correct structure of our distribution, so I'm moving it to xt/author.
Signed-off-by: Galen Charlton <[EMAIL PROTECTED]>
---
t/icondirectories.t | 62 ------------------------------------------
xt/author/icondirectories.t | 63 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 62 deletions(-)
delete mode 100644 t/icondirectories.t
create mode 100644 xt/author/icondirectories.t
diff --git a/t/icondirectories.t b/t/icondirectories.t
deleted file mode 100644
index 6408d89..0000000
--- a/t/icondirectories.t
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env perl
-
-=head1 NAME
-
-icondirectories.t - test to ensure that the two directories of icons
-in the staff and opac interface are identical.
-
-=head1 DESCRIPTION
-
-Tere are two directories of icons for media types, one for the opac
-and one for the staff interface. They need to be identical. This
-ensures that they are.
-
-=cut
-
-use strict;
-use warnings;
-
-use lib qw( .. );
-
-use C4::Koha;
-
-use Data::Dumper;
-use File::Find;
-use Test::More tests => 1;
-
-my $opac_icon_directory = getitemtypeimagedir('opac');
-my $staff_icon_directory = getitemtypeimagedir('intranet');
-
-my $opac_icons; # hashref of filenames to sizes
-sub opac_wanted {
- my $file = $File::Find::name;
- $file =~ s/^$opac_icon_directory//;
- $opac_icons->{ $file } = -s $_;
-}
-
-find( \&opac_wanted, $opac_icon_directory );
-
-my $staff_icons; # hashref of filenames to sizes
-sub staff_wanted {
- my $file = $File::Find::name;
- $file =~ s/^$staff_icon_directory//;
- $staff_icons->{ $file } = -s $_;
-}
-find( \&staff_wanted, $staff_icon_directory );
-
-is_deeply( $opac_icons, $staff_icons )
- or diag( Data::Dumper->Dump( [ $opac_icons ], [ 'opac_icons' ] ) );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xt/author/icondirectories.t b/xt/author/icondirectories.t
new file mode 100644
index 0000000..d6b0177
--- /dev/null
+++ b/xt/author/icondirectories.t
@@ -0,0 +1,63 @@
+#!/usr/bin/env perl
+
+=head1 NAME
+
+icondirectories.t - test to ensure that the two directories of icons
+in the staff and opac interface are identical.
+
+=head1 DESCRIPTION
+
+Tere are two directories of icons for media types, one for the opac
+and one for the staff interface. They need to be identical. This
+ensures that they are.
+
+=cut
+
+use strict;
+use warnings;
+
+use lib qw( .. );
+
+use Data::Dumper;
+use File::Find;
+use Test::More tests => 3;
+
+my $opac_icon_directory = 'koha-tmpl/opac-tmpl/prog/itemtypeimg';
+my $staff_icon_directory = 'koha-tmpl/intranet-tmpl/prog/img/itemtypeimg';
+
+ok( -d $opac_icon_directory, "opac_icon_directory: $opac_icon_directory
exists" );
+ok( -d $staff_icon_directory, "staff_icon_directory: $staff_icon_directory
exists" );
+
+my $opac_icons; # hashref of filenames to sizes
+sub opac_wanted {
+ my $file = $File::Find::name;
+ $file =~ s/^$opac_icon_directory//;
+ $opac_icons->{ $file } = -s $_;
+}
+
+find( \&opac_wanted, $opac_icon_directory );
+
+my $staff_icons; # hashref of filenames to sizes
+sub staff_wanted {
+ my $file = $File::Find::name;
+ $file =~ s/^$staff_icon_directory//;
+ $staff_icons->{ $file } = -s $_;
+}
+find( \&staff_wanted, $staff_icon_directory );
+
+is_deeply( $opac_icons, $staff_icons )
+ or diag( Data::Dumper->Dump( [ $opac_icons ], [ 'opac_icons' ] ) );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
