From 727596f35d7b88691a2ac60eecc2575f2a3c33f9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 15 Nov 2010 12:32:29 -0800 Subject: [PATCH] Test oEmbed lookups with oohembed both on and off explicitly --- tests/oEmbedTest.php | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/tests/oEmbedTest.php b/tests/oEmbedTest.php index 0a8841606e..d00963003e 100644 --- a/tests/oEmbedTest.php +++ b/tests/oEmbedTest.php @@ -15,19 +15,56 @@ class oEmbedTest extends PHPUnit_Framework_TestCase public function setup() { - //$this->old_oohembed = common_config('oohembed', 'endpoint'); + $this->old_oohembed = common_config('oohembed', 'endpoint'); } public function tearDown() { - //$GLOBALS['config']['attachments']['supported'] = $this->old_attachments_supported; + $GLOBALS['config']['oohembed']['endpoint'] = $this->old_oohembed; } /** - * @dataProvider fallbackSources + * Test with oohembed DISABLED. * + * @dataProvider discoverableSources */ public function testoEmbed($url, $expectedType) + { + $GLOBALS['config']['oohembed']['endpoint'] = false; + $this->_doTest($url, $expectedType); + } + + /** + * Test with oohembed ENABLED. + * + * @dataProvider fallbackSources + */ + public function testoohEmbed($url, $expectedType) + { + $GLOBALS['config']['oohembed']['endpoint'] = $this->_endpoint(); + $this->_doTest($url, $expectedType); + } + + /** + * Get default oohembed endpoint. + * + * @return string + */ + function _endpoint() + { + $default = array(); + $_server = 'localhost'; $_path = ''; + require INSTALLDIR . '/lib/default.php'; + return $default['oohembed']['endpoint']; + } + + /** + * Actually run an individual test. + * + * @param string $url + * @param string $expectedType + */ + function _doTest($url, $expectedType) { try { $data = oEmbedHelper::getObject($url);