You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/02/02 08:30:50 UTC
svn commit: r905538 - in /incubator/shindig/trunk/php/test/gadgets:
ExpressionParserTest.php GadgetHtmlRendererTest.php
Author: lindner
Date: Tue Feb 2 07:30:49 2010
New Revision: 905538
URL: http://svn.apache.org/viewvc?rev=905538&view=rev
Log:
SHINDIG-1279 | Patch from Jacky Wang | Test breaks on Expression evaluator and GadgetHtmlRender
Modified:
incubator/shindig/trunk/php/test/gadgets/ExpressionParserTest.php
incubator/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
Modified: incubator/shindig/trunk/php/test/gadgets/ExpressionParserTest.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/gadgets/ExpressionParserTest.php?rev=905538&r1=905537&r2=905538&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/gadgets/ExpressionParserTest.php (original)
+++ incubator/shindig/trunk/php/test/gadgets/ExpressionParserTest.php Tue Feb 2 07:30:49 2010
@@ -41,9 +41,9 @@
$this->input = 'osx:parseJson(osx:urlDecode(osx:urlEncode(osx:decodeBase64("' . $encoded_json . '"))))'
. '.array_attr['
. $attr_equ . "?0:1"
- . "]==1?(true?'no_prefix_id.Ee > 0':"
+ . "]==1?(true?'no_prefix_id.Ee <= 0':"
. '"\'should never be here\' \\\\\\""'
- . "):'no_prefix_id.Ee <= 0'";
+ . "):'no_prefix_id.Ee > 0'";
$this->tokenStream = array(
new Token(ExpType::$FUNCTION, 'osx:parseJson'),
@@ -54,7 +54,7 @@
new Token(ExpType::$PAREN, '('),
new Token(ExpType::$FUNCTION, 'osx:decodeBase64'),
new Token(ExpType::$PAREN, '('),
- new Token(ExpType::$STRING, 'eyJhcnJheV9hdHRyIjpbMSwgMF19'),
+ new Token(ExpType::$STRING, 'eyJhcnJheV9hdHRyIjogWzAsIDFdfQ=='),
new Token(ExpType::$PAREN, ')'),
new Token(ExpType::$PAREN, ')'),
new Token(ExpType::$PAREN, ')'),
@@ -66,9 +66,9 @@
new Token(ExpType::$DOT, '.'),
new Token(ExpType::$IDENTITY, 'Ee'),
new Token(ExpType::$BINARY_OP, '+'),
- new Token(ExpType::$UNARY_OP, '- '),
- new Token(ExpType::$UNARY_OP, '- '),
- new Token(ExpType::$UNARY_OP, '- '),
+ new Token(ExpType::$UNARY_OP, ' -'),
+ new Token(ExpType::$UNARY_OP, ' -'),
+ new Token(ExpType::$UNARY_OP, ' -'),
new Token(ExpType::$PAREN, '('),
new Token(ExpType::$PAREN, '('),
new Token(ExpType::$INT, 2),
@@ -80,6 +80,7 @@
new Token(ExpType::$FLOAT, 4.0),
new Token(ExpType::$BINARY_OP, ' - '),
new Token(ExpType::$INT, 3),
+ new Token(ExpType::$PAREN, ')'),
new Token(ExpType::$BINARY_OP, ' - '),
new Token(ExpType::$FLOAT, 1.0),
new Token(ExpType::$BINARY_OP, '/'),
@@ -88,7 +89,7 @@
new Token(ExpType::$FLOAT, 0.5),
new Token(ExpType::$PAREN, ')'),
new Token(ExpType::$BINARY_OP, '>'),
- new Token(ExpType::$UNARY_OP, '- '),
+ new Token(ExpType::$UNARY_OP, ' -'),
new Token(ExpType::$FLOAT, 5.0),
new Token(ExpType::$BINARY_OP, '+'),
new Token(ExpType::$INT, 4),
@@ -115,12 +116,12 @@
new Token(ExpType::$PAREN, '('),
new Token(ExpType::$BOOL, true),
new Token(ExpType::$TERNARY, '?'),
- new Token(ExpType::$STRING, 'no_prefix_id.Ee > 0'),
+ new Token(ExpType::$STRING, 'no_prefix_id.Ee <= 0'),
new Token(ExpType::$TERNARY, ':'),
- new Token(ExpType::$STRING, '"\'should never be here\' \\\\\\""'),
+ new Token(ExpType::$STRING, '\'should never be here\' \\"'),
new Token(ExpType::$PAREN, ')'),
new Token(ExpType::$TERNARY, ':'),
- new Token(ExpType::$STRING, 'no_prefix_id.Ee <= 0')
+ new Token(ExpType::$STRING, 'no_prefix_id.Ee > 0')
);
$no_prefix_id = new ObjEe();
Modified: incubator/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php?rev=905538&r1=905537&r2=905538&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php (original)
+++ incubator/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php Tue Feb 2 07:30:49 2010
@@ -142,17 +142,19 @@
ob_end_clean();
$this->GadgetHtmlRenderer->addHeadTags($this->domElement, $this->domDocument);
- $tmpNodeList = $this->domElement->getElementsByTagName("style");
+ // TODO: currently we just test the script part
$tmpNodeList = $this->domElement->getElementsByTagName("script");
- $script = '';
- foreach($this->GadgetHtmlRenderer->gadget->features as $feature) {
- $script .= $this->gadgetContext->getRegistry()->getFeatureContent($feature, $this->gadgetContext, true);
- }
+ $scripts = $this->GadgetHtmlRenderer->getJavaScripts();
+ $idx = 0;
foreach($tmpNodeList as $tmpNode) {
- $this->assertEquals('text/javascript', $tmpNode->getAttribute('type'));
- $nodeValue = substr($tmpNode->nodeValue, 0, strpos($tmpNode->nodeValue, 'gadgets.config.init('));
- $this->assertEquals(trim($script), trim($nodeValue));
+ $script = $scripts[$idx++];
+ if ($script['type'] == 'inline') {
+ $this->assertEquals('text/javascript', $tmpNode->getAttribute('type'));
+ $this->assertEquals(trim($script['content']), trim($tmpNode->nodeValue));
+ } else {
+ $this->assertEquals($script['content'], $tmpNode->getAttribute('src'));
+ }
}
}