Author: bhofmann
Date: Thu Sep 23 15:32:00 2010
New Revision: 1000500
URL: http://svn.apache.org/viewvc?rev=1000500&view=rev
Log:
deactivated compress_javascript for phpunit tests which is not needed for our
current test cases and significantly improves runtime
Modified:
shindig/trunk/php/config/test.php
shindig/trunk/php/test/gadgets/FilesServletTest.php
shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
Modified: shindig/trunk/php/config/test.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/config/test.php?rev=1000500&r1=1000499&r2=1000500&view=diff
==============================================================================
--- shindig/trunk/php/config/test.php (original)
+++ shindig/trunk/php/config/test.php Thu Sep 23 15:32:00 2010
@@ -23,6 +23,7 @@
* you should not use these settings in production
*/
$shindigConfig = array(
+ 'compress_javascript' => false,
'private_key_file' => realpath(dirname(__FILE__) . '/../test/certs') .
'/private.key',
'public_key_file' => realpath(dirname(__FILE__) . '/../test/certs') .
'/public.crt',
'private_key_phrase' => 'partuza',
Modified: shindig/trunk/php/test/gadgets/FilesServletTest.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/FilesServletTest.php?rev=1000500&r1=1000499&r2=1000500&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/FilesServletTest.php (original)
+++ shindig/trunk/php/test/gadgets/FilesServletTest.php Thu Sep 23 15:32:00 2010
@@ -38,6 +38,10 @@ class MockContentFilesServlet extends Co
class FilesServletTest extends PHPUnit_Framework_TestCase
{
+ public function tearDown() {
+ ob_end_clean();
+ }
+
public function testResources() {
$servlet = new MockResourcesFilesServlet();
$servlet->uri = 'com/google/caja/plugin/domita-minified.js';
Modified: shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php?rev=1000500&r1=1000499&r2=1000500&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php Thu Sep 23
15:32:00 2010
@@ -150,12 +150,12 @@ class GadgetHtmlRendererTest extends PHP
$this->fail('two entries with script type inline');
}
//this is from dynamic height and should not be included
- $this->assertFalse(strpos($script['content'],
'gadgets.window=gadgets.window||{};'));
+ $this->assertFalse(strpos($script['content'], 'gadgets.window
= gadgets.window || {};'));
//minimessage should be included
- $miniMessagePos = strpos($script['content'],
'gadgets.MiniMessage=function');
+ $miniMessagePos = strpos($script['content'],
'gadgets.MiniMessage = function');
$this->assertTrue($miniMessagePos > 0);
//we force flash to be appended, so it should be after
minimessage
- $this->assertTrue(strpos($script['content'],
'gadgets.flash=gadgets.flash||{};') > $miniMessagePos);
+ $this->assertTrue(strpos($script['content'], 'gadgets.flash =
gadgets.flash || {};') > $miniMessagePos);
$hasInline = true;
break;
default:
