From ecf7646948be1b8dd0cab5e087192ab75a361dcd Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 22 Sep 2010 11:42:36 -0700
Subject: [PATCH] Update merged tests to use session->cache

---
 t/Asset/Wobject/SyndicatedContent/encodings.t | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/t/Asset/Wobject/SyndicatedContent/encodings.t b/t/Asset/Wobject/SyndicatedContent/encodings.t
index 29804f44e..54974dbed 100644
--- a/t/Asset/Wobject/SyndicatedContent/encodings.t
+++ b/t/Asset/Wobject/SyndicatedContent/encodings.t
@@ -23,7 +23,6 @@ plan tests    => 13; # increment this value for each test you create
 use Test::Deep;
 use WebGUI::Asset::Wobject::SyndicatedContent;
 use XML::FeedPP;
-use WebGUI::Cache;
 
 my $session = WebGUI::Test->session;
 my %var;
@@ -54,7 +53,7 @@ $syndicated_content->update({
     hasTerms => '',
     rssUrl   => $testFeedUrl,
 });
-my $cache = WebGUI::Cache->new($session, $testFeedUrl, 'RSS');
+$session->cache->set($testFeedUrl, , 60);
 
 my $utf8_es = slurp_rss('utf8-es.rss');
 my $utf8_ru = slurp_rss('utf8-ru.rss');
@@ -67,46 +66,46 @@ my $iso_8859_5 = slurp_rss('iso-8859-5.rss');
 my $es_title = "PM captur\x{00F3} a tres delincuentes que robaron agencia bancaria en San Mart\x{00ED}n";
 my $ru_title = "\x{412}\x{438}\x{43a}\x{438}\x{43f}\x{435}\x{434}\x{438}\x{44f}  - \x{421}\x{432}\x{435}\x{436}\x{438}\x{435} \x{43f}\x{440}\x{430}\x{432}\x{43a}\x{438} [ru]";
 
-$cache->set($utf8_es, 60);
+$session->cache->set($testFeedUrl, $utf8_es, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1 compatible, UTF-8 encoded';
 
-$cache->set($utf8_ru, 60);
+$session->cache->set($testFeedUrl, $utf8_ru, 60);
 is $syndicated_content->generateFeed->title, $ru_title, 'Russian, UTF-8 encoded';
 
-$cache->set($entity_es, 60);
+$session->cache->set($testFeedUrl, $entity_es, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1 compatible, Entity encoded, utf8 flag off';
 
-$cache->set($entity_ru, 60);
+$session->cache->set($testFeedUrl, $entity_ru, 60);
 is $syndicated_content->generateFeed->title, $ru_title, 'Russian, Entity encoded, utf8 flag off';
 
-$cache->set($UTF8_BOM . $utf8_es, 60);
+$session->cache->set($testFeedUrl, $UTF8_BOM . $utf8_es, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1 compatible, UTF-8 encoded, With BOM';
 
-$cache->set(Encode::decode_utf8($utf8_es), 60);
+$session->cache->set($testFeedUrl, Encode::decode_utf8($utf8_es), 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1 compatible, Decoded';
 
-$cache->set(Encode::decode_utf8($utf8_ru), 60);
+$session->cache->set($testFeedUrl, Encode::decode_utf8($utf8_ru), 60);
 is $syndicated_content->generateFeed->title, $ru_title, 'Russian, Decoded';
 
-$cache->set(Encode::decode_utf8($entity_es), 60);
+$session->cache->set($testFeedUrl, $UTF8_BOM . $utf8_es, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1, Entity encoded, utf8 flag on';
 
-$cache->set(Encode::decode_utf8($entity_ru), 60);
+$session->cache->set($testFeedUrl, Encode::decode_utf8($entity_ru), 60);
 is $syndicated_content->generateFeed->title, $ru_title, 'Russian, Entity encoded, utf8 flag on';
 
-$cache->set($UTF8_BOM . Encode::decode_utf8($utf8_es), 60);
+$session->cache->set($testFeedUrl, $UTF8_BOM . Encode::decode_utf8($utf8_es), 60);
 is $syndicated_content->generateFeed->title, $es_title, 'Latin-1 compatible, Decoded, With BOM';
 
-$cache->set($utf8_no_prolog, 60);
+$session->cache->set($testFeedUrl, $utf8_no_prolog, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'No encoding in prolog, Decoded';
 
-$cache->set($iso_8859_1, 60);
+$session->cache->set($testFeedUrl, $iso_8859_1, 60);
 is $syndicated_content->generateFeed->title, $es_title, 'ISO-8859-1 encoded';
 
-$cache->set($iso_8859_5, 60);
+$session->cache->set($testFeedUrl, $iso_8859_5, 60);
 is $syndicated_content->generateFeed->title, $ru_title, 'ISO-8859-5 encoded';
 
-$cache->delete;
+$session->cache->remove($testFeedUrl);
 
 sub slurp_rss {
     my $file = shift;