Index: branches/release-41/t/48-cache.t
===================================================================
--- branches/release-41/t/48-cache.t (revision 1098)
+++ branches/release-41/t/48-cache.t (revision 2681)
@@ -2,18 +2,12 @@
 
 use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
-use Test::More tests => 9;
+use Test::More tests => 8;
 
-use vars qw($T_CFG);
 use MT::Test qw(:db :data);
-
-
-$T_CFG = -r 't/mysql.cfg' ? 't/mysql.cfg' : $ENV{HOME} .'/mysql-test.cfg';
-$T_CFG = -r 't/mt.cfg' ? 't/mt.cfg' : $ENV{HOME} .'/mt-test.cfg';
-
 use MT;
 
 require MT::Category;
 my $cat_cache = MT::Category->cache(blog_id => 1);
-ok($cat_cache);
+ok($cat_cache, "category cache exists for blog id 1");
 
 # make sure order is consistent
@@ -21,14 +15,13 @@
 
 # check one of the elements
-is($cat_cache->[0][0], '2');
-is($cat_cache->[0][1], 'bar');
-is($cat_cache->[0][2], '0');
+is($cat_cache->[0][0], '2', "category id is 2");
+is($cat_cache->[0][1], 'bar', "category name is 'bar'");
+is($cat_cache->[0][2], '0', "no parent for 'bar' category");
 
 require MT::Tag;
 my $tag_cache = MT::Tag->cache(blog_id => 1, class => 'MT::Entry');
-ok($tag_cache);
+ok($tag_cache, "tag cache exists for blog id 1");
 
-is($tag_cache->{grandpa}, 1);
-is($tag_cache->{verse}, MT::Object->driver->can('count_group_by') ? 5 : 1);
+is(@$tag_cache, 5, "number of tags in cache is 5"); # relies on test data
 
 my $entry = MT::Entry->load(1);
@@ -37,5 +30,5 @@
 
 $tag_cache = MT::Tag->cache(blog_id => 1, class => 'MT::Entry');
-is($tag_cache->{newtag}, 1);
+ok(grep('newtag', @$tag_cache), "newtag is in cache");
 
 my $cat = new MT::Category;
@@ -46,5 +39,5 @@
 my $new_cat_cache_count = (scalar @$cat_cache) + 1;
 $cat_cache = MT::Category->cache(blog_id => 1);
-is((scalar @$cat_cache), $new_cat_cache_count);
+is((scalar @$cat_cache), $new_cat_cache_count, "category cache count incremented");
 
 1;