Changeset 1649

Timestamp:

06/23/08 23:40:18 (4 months ago)

Author:

mikey

Message:

remove possibility to configure name of rss-feeds.ini file

Files:

• trunk/src/main/php/net/stubbles/xml/rss/stubRSSProcessor.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/xml/rss/stubRSSProcessorTestCase.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/xml/rss/stubRSSProcessor.php

@@ -25 +25 @@
-{
-    /**
-     * registry key for the feeds config file
-     */
-    const KEY_FEEDS_FILE = 'net.stubbles.xml.rss.feeds';
-    /**
-     * list of configured feeds
-     *
@@ -40 +36 @@
-    protected function doConstruct()
-    {
-stubRegistry::getConfig(self::KEY_FEEDS_FILE, 'rss-feeds.ini')
+'rss-feeds.ini'
-    }
-

trunk/src/test/php/net/stubbles/xml/rss/stubRSSProcessorTestCase.php

@@ -108 +108 @@
-                     ->method('loadFeeds')
-                     ->with($this->equalTo(stubConfig::getConfigPath() . DIRECTORY_SEPARATOR . 'rss-feeds.ini'));
-        $rssProcessor->callDoConstruct();
-    }
-
-    /**
-     * construction with configured config file should use configured config file
-     *
-     * @test
-     */
-    public function constructionWithSpecialConfigFile()
-    {
-        stubRegistry::setConfig(stubRSSProcessor::KEY_FEEDS_FILE, 'rss-test.ini');
-        $rssProcessor = $this->getMock('TeststubRSSProcessor',
-                                       array('loadFeeds'),
-                                       array($this->mockRequest,
-                                             $this->mockSession,
-                                             $this->mockResponse
-                                       )
-                        );
-        $rssProcessor->expects($this->once())
-                     ->method('loadFeeds')
-                     ->with($this->equalTo(stubConfig::getConfigPath() . DIRECTORY_SEPARATOR . 'rss-test.ini'));
-        $rssProcessor->callDoConstruct();
-    }