From d3e802b1cfa9b9d5d690670f372438915e83126b Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Fri, 20 Jun 2008 08:57:34 +0000 Subject: [PATCH] clean up test warnings --- t/Asset/File/GalleryFile/Photo/00base.t | 6 +++--- t/Asset/File/GalleryFile/Photo/comment.t | 4 ++-- t/Asset/File/GalleryFile/Photo/download.t | 1 - t/Asset/File/GalleryFile/Photo/exif.t | 1 - t/Asset/File/GalleryFile/Photo/makeResolutions.t | 1 - t/Asset/File/GalleryFile/Photo/makeShortcut.t | 2 +- t/Asset/File/GalleryFile/Photo/permissions.t | 1 - t/Asset/File/GalleryFile/Photo/setFile.t | 1 - t/Asset/File/GalleryFile/Photo/view.t | 1 - t/Asset/File/Image/setfile.t | 1 - t/Asset/File/setfile.t | 1 - t/Asset/Shortcut/010-linked-asset.t | 2 +- t/Asset/Wobject/Gallery/00base.t | 4 ++-- t/Asset/Wobject/Gallery/permission.t | 1 - t/Asset/Wobject/GalleryAlbum/00base.t | 4 ++-- t/Asset/Wobject/GalleryAlbum/addArchive.t | 1 - t/Asset/Wobject/GalleryAlbum/delete.t | 1 - t/Asset/Wobject/GalleryAlbum/permission.t | 1 - t/Asset/Wobject/GalleryAlbum/rss.t | 1 - t/Asset/Wobject/GalleryAlbum/slideshow.t | 1 - t/Asset/Wobject/GalleryAlbum/thumbnails.t | 1 - t/Asset/Wobject/GalleryAlbum/view.t | 1 - 22 files changed, 11 insertions(+), 27 deletions(-) diff --git a/t/Asset/File/GalleryFile/Photo/00base.t b/t/Asset/File/GalleryFile/Photo/00base.t index 2a69c6ce5..53ab4cc2d 100644 --- a/t/Asset/File/GalleryFile/Photo/00base.t +++ b/t/Asset/File/GalleryFile/Photo/00base.t @@ -14,7 +14,7 @@ use lib "$FindBin::Bin/../../../../lib"; ## The goal of this test is to test the creation and deletion of photo assets -use Scalar::Util qw( blessed ); +use Scalar::Util; use WebGUI::Test; use WebGUI::Session; use Test::More; @@ -71,7 +71,7 @@ $photo $versionTag->commit; is( - blessed $photo, "WebGUI::Asset::File::GalleryFile::Photo", + Scalar::Util::blessed($photo), "WebGUI::Asset::File::GalleryFile::Photo", "Photo is a WebGUI::Asset::File::GalleryFile::Photo object", ); @@ -81,7 +81,7 @@ isa_ok( is( - blessed $photo->getGallery, "WebGUI::Asset::Wobject::Gallery", + Scalar::Util::blessed($photo->getGallery), "WebGUI::Asset::Wobject::Gallery", "Photo->getGallery gets the gallery containing this photo", ); diff --git a/t/Asset/File/GalleryFile/Photo/comment.t b/t/Asset/File/GalleryFile/Photo/comment.t index fad9f265f..d81bed667 100644 --- a/t/Asset/File/GalleryFile/Photo/comment.t +++ b/t/Asset/File/GalleryFile/Photo/comment.t @@ -19,7 +19,7 @@ use WebGUI::Test; use WebGUI::Session; use Test::More; use Test::Deep; -use Scalar::Util qw( blessed ); +use Scalar::Util; use WebGUI::Asset::File::GalleryFile::Photo; #---------------------------------------------------------------------------- @@ -55,7 +55,7 @@ plan tests => 32; #---------------------------------------------------------------------------- # Test with no comments is( - blessed $photo->getCommentPaginator, "WebGUI::Paginator", + Scalar::Util::blessed($photo->getCommentPaginator), "WebGUI::Paginator", "Photo with no comments still provides comments paginator", ); diff --git a/t/Asset/File/GalleryFile/Photo/download.t b/t/Asset/File/GalleryFile/Photo/download.t index b67ada59e..5f1ecbac1 100644 --- a/t/Asset/File/GalleryFile/Photo/download.t +++ b/t/Asset/File/GalleryFile/Photo/download.t @@ -15,7 +15,6 @@ use FindBin; use strict; use lib "$FindBin::Bin/../../../../lib"; -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/GalleryFile/Photo/exif.t b/t/Asset/File/GalleryFile/Photo/exif.t index 1503c53f5..c523a089a 100644 --- a/t/Asset/File/GalleryFile/Photo/exif.t +++ b/t/Asset/File/GalleryFile/Photo/exif.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../../lib"; ## The goal of this test is to test the EXIF functionality of WebGUI's photo # asset -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/GalleryFile/Photo/makeResolutions.t b/t/Asset/File/GalleryFile/Photo/makeResolutions.t index 76a8c8c34..71c2967be 100644 --- a/t/Asset/File/GalleryFile/Photo/makeResolutions.t +++ b/t/Asset/File/GalleryFile/Photo/makeResolutions.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../../lib"; ## The goal of this test is to test the creation of photo download # resolutions -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/GalleryFile/Photo/makeShortcut.t b/t/Asset/File/GalleryFile/Photo/makeShortcut.t index c41c7fdea..fbef73ce2 100644 --- a/t/Asset/File/GalleryFile/Photo/makeShortcut.t +++ b/t/Asset/File/GalleryFile/Photo/makeShortcut.t @@ -15,7 +15,7 @@ use FindBin; use strict; use lib "$FindBin::Bin/../../../../lib"; -use Scalar::Util qw( blessed ); +use Scalar::Util; use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/GalleryFile/Photo/permissions.t b/t/Asset/File/GalleryFile/Photo/permissions.t index f4ed2129e..8973bad82 100644 --- a/t/Asset/File/GalleryFile/Photo/permissions.t +++ b/t/Asset/File/GalleryFile/Photo/permissions.t @@ -14,7 +14,6 @@ use FindBin; use strict; use lib "$FindBin::Bin/../../../../lib"; -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use WebGUI::Friends; diff --git a/t/Asset/File/GalleryFile/Photo/setFile.t b/t/Asset/File/GalleryFile/Photo/setFile.t index 4dc21c112..1967afccc 100644 --- a/t/Asset/File/GalleryFile/Photo/setFile.t +++ b/t/Asset/File/GalleryFile/Photo/setFile.t @@ -14,7 +14,6 @@ use lib "$FindBin::Bin/../../../../lib"; ## The goal of this test is to test the creation and deletion of photo assets -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/GalleryFile/Photo/view.t b/t/Asset/File/GalleryFile/Photo/view.t index 05330d449..d03d51db3 100644 --- a/t/Asset/File/GalleryFile/Photo/view.t +++ b/t/Asset/File/GalleryFile/Photo/view.t @@ -14,7 +14,6 @@ use FindBin; use strict; use lib "$FindBin::Bin/../../../../lib"; -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::HTML; use WebGUI::Session; diff --git a/t/Asset/File/Image/setfile.t b/t/Asset/File/Image/setfile.t index d9b3a5f4a..53089d413 100644 --- a/t/Asset/File/Image/setfile.t +++ b/t/Asset/File/Image/setfile.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the additional functionality of the # overridden setFile method -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/File/setfile.t b/t/Asset/File/setfile.t index 5c4486178..0aa14f7f5 100644 --- a/t/Asset/File/setfile.t +++ b/t/Asset/File/setfile.t @@ -14,7 +14,6 @@ use lib "$FindBin::Bin/../../lib"; ## The goal of this test is to test the creation and deletion of photo assets -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Shortcut/010-linked-asset.t b/t/Asset/Shortcut/010-linked-asset.t index 4748270e8..ad68e7bb5 100644 --- a/t/Asset/Shortcut/010-linked-asset.t +++ b/t/Asset/Shortcut/010-linked-asset.t @@ -62,7 +62,7 @@ ok( ); is( - blessed $original, blessed $snippet, + Scalar::Util::blessed($original), Scalar::Util::blessed($snippet), "Original asset class is correct", ); diff --git a/t/Asset/Wobject/Gallery/00base.t b/t/Asset/Wobject/Gallery/00base.t index d1f219edc..28579cab5 100644 --- a/t/Asset/Wobject/Gallery/00base.t +++ b/t/Asset/Wobject/Gallery/00base.t @@ -14,7 +14,7 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the creation and deletion of gallery assets -use Scalar::Util qw( blessed ); +use Scalar::Util; use WebGUI::Test; use WebGUI::Session; use Test::More; @@ -42,7 +42,7 @@ my $gallery $versionTag->commit; is( - blessed $gallery, "WebGUI::Asset::Wobject::Gallery", + Scalar::Util::blessed($gallery), "WebGUI::Asset::Wobject::Gallery", "Gallery is a WebGUI::Asset::Wobject::Gallery object", ); diff --git a/t/Asset/Wobject/Gallery/permission.t b/t/Asset/Wobject/Gallery/permission.t index 1704c3c0b..f531ae239 100644 --- a/t/Asset/Wobject/Gallery/permission.t +++ b/t/Asset/Wobject/Gallery/permission.t @@ -14,7 +14,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test permissions inside Gallerys -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use WebGUI::Test::Maker::Permission; diff --git a/t/Asset/Wobject/GalleryAlbum/00base.t b/t/Asset/Wobject/GalleryAlbum/00base.t index cb4522ec4..a0c6dd7ea 100644 --- a/t/Asset/Wobject/GalleryAlbum/00base.t +++ b/t/Asset/Wobject/GalleryAlbum/00base.t @@ -14,7 +14,7 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the creation and deletion of album assets -use Scalar::Util qw( blessed ); +use Scalar::Util; use WebGUI::Test; use WebGUI::Session; use Test::More; @@ -53,7 +53,7 @@ my $album $versionTag->commit; is( - blessed $album, "WebGUI::Asset::Wobject::GalleryAlbum", + Scalar::Util::blessed($album), "WebGUI::Asset::Wobject::GalleryAlbum", "Album is a WebGUI::Asset::Wobject::GalleryAlbum object", ); diff --git a/t/Asset/Wobject/GalleryAlbum/addArchive.t b/t/Asset/Wobject/GalleryAlbum/addArchive.t index 0896309ca..ce59631fa 100644 --- a/t/Asset/Wobject/GalleryAlbum/addArchive.t +++ b/t/Asset/Wobject/GalleryAlbum/addArchive.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the permissions of GalleryAlbum assets -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Wobject/GalleryAlbum/delete.t b/t/Asset/Wobject/GalleryAlbum/delete.t index 1c9c6b512..19d5a40b0 100644 --- a/t/Asset/Wobject/GalleryAlbum/delete.t +++ b/t/Asset/Wobject/GalleryAlbum/delete.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the deleting of GalleryAlbums -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Test::Maker::HTML; use WebGUI::Session; diff --git a/t/Asset/Wobject/GalleryAlbum/permission.t b/t/Asset/Wobject/GalleryAlbum/permission.t index 5f016ba01..044bda2af 100644 --- a/t/Asset/Wobject/GalleryAlbum/permission.t +++ b/t/Asset/Wobject/GalleryAlbum/permission.t @@ -14,7 +14,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the permissions of GalleryAlbum assets -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Wobject/GalleryAlbum/rss.t b/t/Asset/Wobject/GalleryAlbum/rss.t index f725adb9e..6042cbba8 100644 --- a/t/Asset/Wobject/GalleryAlbum/rss.t +++ b/t/Asset/Wobject/GalleryAlbum/rss.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the rss view of GalleryAlbums -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Wobject/GalleryAlbum/slideshow.t b/t/Asset/Wobject/GalleryAlbum/slideshow.t index f8aa0657e..bc7513a18 100644 --- a/t/Asset/Wobject/GalleryAlbum/slideshow.t +++ b/t/Asset/Wobject/GalleryAlbum/slideshow.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the slideshow view of GalleryAlbums -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Wobject/GalleryAlbum/thumbnails.t b/t/Asset/Wobject/GalleryAlbum/thumbnails.t index 0034897c0..6a3201414 100644 --- a/t/Asset/Wobject/GalleryAlbum/thumbnails.t +++ b/t/Asset/Wobject/GalleryAlbum/thumbnails.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the thumbnails view of GalleryAlbums -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More; diff --git a/t/Asset/Wobject/GalleryAlbum/view.t b/t/Asset/Wobject/GalleryAlbum/view.t index 69123241a..b67c49497 100644 --- a/t/Asset/Wobject/GalleryAlbum/view.t +++ b/t/Asset/Wobject/GalleryAlbum/view.t @@ -15,7 +15,6 @@ use lib "$FindBin::Bin/../../../lib"; ## The goal of this test is to test the default view and associated subs -use Scalar::Util qw( blessed ); use WebGUI::Test; use WebGUI::Session; use Test::More;