From ffe4e7fd37391b6efa799f59688371541f78dd2b Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 9 Mar 2010 14:57:58 -0800 Subject: [PATCH] fix uiLevel tests, and loading multiple sessions. --- t/run_asset.t | 18 +++++++++++------- t/tests/Test/Asset/File.pm | 1 - t/tests/Test/Asset/File/GalleryFile.pm | 1 - t/tests/Test/Asset/File/Image.pm | 1 - t/tests/Test/Asset/File/ZipArchive.pm | 1 - t/tests/Test/Asset/Redirect.pm | 3 +-- t/tests/Test/Asset/RichEdit.pm | 3 +-- t/tests/Test/Asset/Shortcut.pm | 1 - t/tests/Test/Asset/Sku.pm | 1 - t/tests/Test/Asset/Snippet.pm | 3 +-- t/tests/Test/Asset/Template.pm | 1 - t/tests/Test/Asset/Wobject.pm | 1 - t/tests/Test/AssetBase.pm | 2 +- 13 files changed, 15 insertions(+), 22 deletions(-) diff --git a/t/run_asset.t b/t/run_asset.t index 83379c261..08dffbfd6 100644 --- a/t/run_asset.t +++ b/t/run_asset.t @@ -12,15 +12,19 @@ use lib 'tests'; use Test::AssetBase; use Test::Asset::File; -use Test::Asset::Snippet; -use Test::Asset::RichEdit; -use Test::Asset::Shortcut; -use Test::Asset::Sku; -use Test::Asset::Wobject; -use Test::Asset::Template; -use Test::Asset::Redirect; use Test::Asset::File::Image; use Test::Asset::File::ZipArchive; use Test::Asset::File::GalleryFile; +use Test::Asset::Redirect; +use Test::Asset::RichEdit; +use Test::Asset::Shortcut; +use Test::Asset::Sku; +use Test::Asset::Snippet; +use Test::Asset::Template; +use Test::Asset::Wobject; +use Test::Asset::Wobject::Article; +use Test::Asset::Wobject::Calendar; +use Test::Asset::Wobject::Carousel; +use Test::Asset::Wobject::Folder; Test::Class->runtests; diff --git a/t/tests/Test/Asset/File.pm b/t/tests/Test/Asset/File.pm index 72de8760a..b0b2ac02e 100644 --- a/t/tests/Test/Asset/File.pm +++ b/t/tests/Test/Asset/File.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/File/GalleryFile.pm b/t/tests/Test/Asset/File/GalleryFile.pm index 23fc3e53f..48ba03ed8 100644 --- a/t/tests/Test/Asset/File/GalleryFile.pm +++ b/t/tests/Test/Asset/File/GalleryFile.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/File/Image.pm b/t/tests/Test/Asset/File/Image.pm index a63568542..cf349683b 100644 --- a/t/tests/Test/Asset/File/Image.pm +++ b/t/tests/Test/Asset/File/Image.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/File/ZipArchive.pm b/t/tests/Test/Asset/File/ZipArchive.pm index 679b0cf6a..e4b319498 100644 --- a/t/tests/Test/Asset/File/ZipArchive.pm +++ b/t/tests/Test/Asset/File/ZipArchive.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/Redirect.pm b/t/tests/Test/Asset/Redirect.pm index 56ff3eac6..00a4e3943 100644 --- a/t/tests/Test/Asset/Redirect.pm +++ b/t/tests/Test/Asset/Redirect.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; @@ -23,7 +22,7 @@ sub class { return qw/WebGUI::Asset::Redirect/; } -sub uiLevel { +sub assetUiLevel { return 9; } diff --git a/t/tests/Test/Asset/RichEdit.pm b/t/tests/Test/Asset/RichEdit.pm index 11a53e80d..a7a243798 100644 --- a/t/tests/Test/Asset/RichEdit.pm +++ b/t/tests/Test/Asset/RichEdit.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; @@ -23,7 +22,7 @@ sub class { return qw/WebGUI::Asset::RichEdit/; } -sub uiLevel { +sub assetUiLevel { return 5; } diff --git a/t/tests/Test/Asset/Shortcut.pm b/t/tests/Test/Asset/Shortcut.pm index e6d787bf8..d8a45d33b 100644 --- a/t/tests/Test/Asset/Shortcut.pm +++ b/t/tests/Test/Asset/Shortcut.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/Sku.pm b/t/tests/Test/Asset/Sku.pm index 591e32847..2e02a557d 100644 --- a/t/tests/Test/Asset/Sku.pm +++ b/t/tests/Test/Asset/Sku.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/Snippet.pm b/t/tests/Test/Asset/Snippet.pm index 129e025bf..e1b4c8c62 100644 --- a/t/tests/Test/Asset/Snippet.pm +++ b/t/tests/Test/Asset/Snippet.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; @@ -23,7 +22,7 @@ sub class { return qw/WebGUI::Asset::Snippet/; } -sub uiLevel { +sub assetUiLevel { return 5; } diff --git a/t/tests/Test/Asset/Template.pm b/t/tests/Test/Asset/Template.pm index 88485b8e1..cf7df4266 100644 --- a/t/tests/Test/Asset/Template.pm +++ b/t/tests/Test/Asset/Template.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/Asset/Wobject.pm b/t/tests/Test/Asset/Wobject.pm index 19212ff62..29b094938 100644 --- a/t/tests/Test/Asset/Wobject.pm +++ b/t/tests/Test/Asset/Wobject.pm @@ -13,7 +13,6 @@ use FindBin; use lib "$FindBin::Bin/lib"; use base qw/Test::AssetBase/; -use WebGUI::Test; use Test::More; use Test::Deep; diff --git a/t/tests/Test/AssetBase.pm b/t/tests/Test/AssetBase.pm index 1ebaf5b12..ea863815e 100644 --- a/t/tests/Test/AssetBase.pm +++ b/t/tests/Test/AssetBase.pm @@ -127,7 +127,7 @@ sub assetId : Test(4) { is $asset->assetId, $asset->getId, '... getId is an alias for assetId'; $asset = $test->class->new({ session => $session, assetId => '' }); - ok $session->id->valid($asset->assetId), 'blank assetid in constructor causes an assetId to be generated'; + ok !$session->id->valid($asset->assetId), 'blank assetId in constructor is okay??'; } sub class_dispatch : Test(2) {