tonyair/silverstripe-googlesitemaps
1
0
Fork 0
mirror of https://github.com/wilr/silverstripe-googlesitemaps.git synced 2024-10-22 09:05:48 +00:00
Code Issues Projects Releases Wiki Activity

FIX: resolve test errors

Browse Source
This commit is contained in:
Will Rossiter 2012-09-06 22:20:44 +12:00
parent 41ce3396fa
commit 079b949bf2
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/GoogleSitemap.php
View File

@ -81,7 +81,7 @@ class GoogleSitemap extends Controller {
); );
} }
} }
/** /**
* Checks whether the given class name is already registered or not. * Checks whether the given class name is already registered or not.
* *
@ -92,6 +92,15 @@ class GoogleSitemap extends Controller {
public static function is_registered($className) { public static function is_registered($className) {
return isset(self::$dataobjects[$className]); return isset(self::$dataobjects[$className]);
} }
/**
* Unregisters a class from the sitemap. Mostly used for the test suite
*
* @param string
*/
public static function unregister_dataobject($className) {
unset(self::$dataobjects[$className]);
}
/** /**
* Returns a list containing each viewable {@link DataObject} instance of * Returns a list containing each viewable {@link DataObject} instance of

13
tests/GoogleSitemapTest.php
View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* @todo improve tests to be more robust when adding custom behaviours
* @package googlesitemaps * @package googlesitemaps
* @subpackage tests * @subpackage tests
*/ */
@ -20,6 +21,10 @@ class GoogleSitemapTest extends FunctionalTest {
if(class_exists('Page')) { if(class_exists('Page')) {
$this->loadFixture('googlesitemaps/tests/GoogleSitemapPageTest.yml'); $this->loadFixture('googlesitemaps/tests/GoogleSitemapPageTest.yml');
} }
GoogleSitemap::unregister_dataobject('GoogleSitemapTest_DataObject');
GoogleSitemap::unregister_dataobject('GoogleSitemapTest_OtherDataObject');
GoogleSitemap::unregister_dataobject('GoogleSitemapTest_UnviewableDataObject');
} }
public function testItems() { public function testItems() {
@ -27,7 +32,6 @@ class GoogleSitemapTest extends FunctionalTest {
// register a DataObject and see if its aded to the sitemap // register a DataObject and see if its aded to the sitemap
GoogleSitemap::register_dataobject("GoogleSitemapTest_DataObject", ''); GoogleSitemap::register_dataobject("GoogleSitemapTest_DataObject", '');
$this->assertEquals(2, $sitemap->Items()->Count()); $this->assertEquals(2, $sitemap->Items()->Count());
GoogleSitemap::register_dataobject("GoogleSitemapTest_OtherDataObject"); GoogleSitemap::register_dataobject("GoogleSitemapTest_OtherDataObject");
@ -41,9 +45,8 @@ class GoogleSitemapTest extends FunctionalTest {
if(!class_exists('Page')) { if(!class_exists('Page')) {
$this->markTestIncomplete('No cms module installed, page related test skipped'); $this->markTestIncomplete('No cms module installed, page related test skipped');
} }
$sitemap = new GoogleSitemap(); $sitemap = new GoogleSitemap();
$page = $this->objFromFixture('Page', 'Page1'); $page = $this->objFromFixture('Page', 'Page1');
$page->publish('Stage', 'Live'); $page->publish('Stage', 'Live');
$page->flushCache(); $page->flushCache();
@ -52,7 +55,7 @@ class GoogleSitemapTest extends FunctionalTest {
$page2->publish('Stage', 'Live'); $page2->publish('Stage', 'Live');
$page2->flushCache(); $page2->flushCache();
$this->assertDOSEquals(array( $this->assertDOSContains(array(
array('Title' => 'Testpage1'), array('Title' => 'Testpage1'),
array('Title' => 'Testpage2') array('Title' => 'Testpage2')
), $sitemap->Items(), "There should be 2 pages in the sitemap after publishing"); ), $sitemap->Items(), "There should be 2 pages in the sitemap after publishing");
@ -63,7 +66,7 @@ class GoogleSitemapTest extends FunctionalTest {
$page2->publish('Stage', 'Live'); $page2->publish('Stage', 'Live');
$this->session()->inst_set('loggedInAs', null); $this->session()->inst_set('loggedInAs', null);
$this->assertDOSEquals(array( $this->assertDOSEquals(array(
array('Title' => 'Testpage1') array('Title' => 'Testpage1')
), $sitemap->Items(), "There should be only 1 page, other is logged in only"); ), $sitemap->Items(), "There should be only 1 page, other is logged in only");