Author: bhofmann
Date: Wed Dec 22 15:07:37 2010
New Revision: 1051940
URL: http://svn.apache.org/viewvc?rev=1051940&view=rev
Log:
PHP: fixed HtmlRenderer test, added test for getRawToken in GadgetContext
Modified:
shindig/trunk/php/test/gadgets/GadgetContextTest.php
shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
shindig/trunk/php/test/gadgets/GadgetRewriterTest.php
Modified: shindig/trunk/php/test/gadgets/GadgetContextTest.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetContextTest.php?rev=1051940&r1=1051939&r2=1051940&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetContextTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetContextTest.php Wed Dec 22 15:07:37
2010
@@ -40,14 +40,22 @@ class GadgetContextTest extends PHPUnit_
*/
private $gadgetRenderingContext = 'GADGET';
+ private $orgGet;
+ private $orgPost;
+ private $orgServer;
+
/**
* Prepares the environment before running a test.
*/
protected function setUp() {
parent::setUp();
+
+ $this->orgGet = $_GET;
+ $this->orgPost = $_POST;
+ $this->orgServer = $_SERVER;
$_GET = $this->testData;
- $this->GadgetContext = new GadgetContext($this->gadgetRenderingContext);
+ $this->GadgetContext = new
TestGadgetContext($this->gadgetRenderingContext);
}
@@ -56,6 +64,10 @@ class GadgetContextTest extends PHPUnit_
*/
protected function tearDown() {
$this->GadgetContext = null;
+
+ $_GET = $this->orgGet;
+ $_POST = $this->orgPost;
+ $_SERVER = $this->orgServer;
parent::tearDown();
}
@@ -170,5 +182,37 @@ class GadgetContextTest extends PHPUnit_
}
+ public function testGetRawToken() {
+ $_GET['st'] = 'abc';
+
+ $this->assertEquals('abc', $this->GadgetContext->getRawToken());
+ $this->GadgetContext->resetRawToken();
+
+ $_POST['st'] = 'def';
+ $_SERVER['AUTHORIZATION'] = 'OAuth ghi';
+ $this->assertEquals('abc', $this->GadgetContext->getRawToken());
+
+ unset($_GET['st']);
+
+ // test if runtime cache works
+ $this->assertEquals('abc', $this->GadgetContext->getRawToken());
+ $this->GadgetContext->resetRawToken();
+ //should use post now
+ $this->assertEquals('def', $this->GadgetContext->getRawToken());
+ $this->GadgetContext->resetRawToken();
+
+ unset($_POST['st']);
+
+ // get token from OAuth header
+ $this->assertEquals('ghi', $this->GadgetContext->getRawToken());
+ }
+
}
+class TestGadgetContext extends GadgetContext
+{
+ public function resetRawToken()
+ {
+ $this->rawToken = null;
+ }
+}
Modified: shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php?rev=1051940&r1=1051939&r2=1051940&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php Wed Dec 22
15:07:37 2010
@@ -143,7 +143,7 @@ class GadgetHtmlRendererTest extends PHP
$this->fail('two entries with script type extern');
}
$hasExtern = true;
- $this->assertEquals(0, strpos($script['content'],
'/gadgets/js/dynamic-height:views.js?'));
+ $this->assertEquals(0, strpos($script['content'],
'/gadgets/js/views:dynamic-height.js?'));
break;
case 'inline':
if ($hasInline) {
@@ -213,4 +213,4 @@ class GadgetHtmlRendererTest extends PHP
}
}
-?>
+
Modified: shindig/trunk/php/test/gadgets/GadgetRewriterTest.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetRewriterTest.php?rev=1051940&r1=1051939&r2=1051940&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetRewriterTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetRewriterTest.php Wed Dec 22 15:07:37
2010
@@ -103,4 +103,3 @@ class GadgetRewriterTest extends PHPUnit
$this->assertEquals($source_string, $desc_string);
}
}
-?>
\ No newline at end of file
