Merge branch 'master' into upstream-master (big-o team branch)

wilr · Jan 7, 2013 · 90f3c82 · 90f3c82
2 parents d5f6732 + 8d787c4
commit 90f3c82
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/code/GoogleSitemap.php b/code/GoogleSitemap.php
@@ -102,6 +102,13 @@ public static function unregister_dataobject($className) {
 		unset(self::$dataobjects[$className]);
 	}
 
+	/**
+	 * Clears registered dataobjects. Useful for unit tests.
+	 */
+	public static function clear_registered_dataobjects() {
+		self::$dataobjects = array();
+	}
+
 	/**
 	 * Returns a list containing each viewable {@link DataObject} instance of 
 	 * the registered class names.

diff --git a/tests/GoogleSitemapTest.php b/tests/GoogleSitemapTest.php
@@ -27,6 +27,12 @@ public function setUp() {
 		GoogleSitemap::unregister_dataobject('GoogleSitemapTest_UnviewableDataObject');
 	}
 
+	public function tearDown() {
+		parent::tearDown();
+
+		GoogleSitemap::clear_registered_dataobjects();
+	}
+
 	public function testItems() {
 		$sitemap = new GoogleSitemap();