tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Manually testing exceptions in SSViewerCacheBlockTest to avoid PHPUnit 3.6 warnings

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-14 17:24:42 +02:00
parent 9bf3ae9a19
commit b211c38010
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/SSViewerCacheBlockTest.php
View File

@ -186,12 +186,13 @@ class SSViewerCacheBlockTest extends SapphireTest {
$this->assertEquals($this->_runtemplate($template, array('Foo' => 2, 'Fooa' => 9, 'Foob' => 9, 'Bar' => 2, 'Bara' => 1)), ' 9 9 9 '); $this->assertEquals($this->_runtemplate($template, array('Foo' => 2, 'Fooa' => 9, 'Foob' => 9, 'Bar' => 2, 'Bara' => 1)), ' 9 9 9 ');
} }
/**
* @expectedException Exception
*/
function testErrorMessageForCachedWithinControlWithinCached() { function testErrorMessageForCachedWithinControlWithinCached() {
$this->_reset(true); $this->_reset(true);
try {
$this->_runtemplate('<% cached %><% control Foo %><% cached %>$Bar<% end_cached %><% end_control %><% end_cached %>'); $this->_runtemplate('<% cached %><% control Foo %><% cached %>$Bar<% end_cached %><% end_control %><% end_cached %>');
} catch(Exception $e) {
return;
}
} }
function testNoErrorMessageForCachedWithinControlWithinUncached() { function testNoErrorMessageForCachedWithinControlWithinUncached() {
@ -199,20 +200,24 @@ class SSViewerCacheBlockTest extends SapphireTest {
$this->_runtemplate('<% uncached %><% control Foo %><% cached %>$Bar<% end_cached %><% end_control %><% end_uncached %>'); $this->_runtemplate('<% uncached %><% control Foo %><% cached %>$Bar<% end_cached %><% end_control %><% end_uncached %>');
} }
/**
* @expectedException Exception
*/
function testErrorMessageForCachedWithinIf() { function testErrorMessageForCachedWithinIf() {
$this->_reset(true); $this->_reset(true);
try {
$this->_runtemplate('<% cached %><% if Foo %><% cached %>$Bar<% end_cached %><% end_if %><% end_cached %>'); $this->_runtemplate('<% cached %><% if Foo %><% cached %>$Bar<% end_cached %><% end_if %><% end_cached %>');
} catch(Exception $e) {
return;
}
$this->fail();
} }
/**
* @expectedException Exception
*/
function testErrorMessageForInvalidConditional() { function testErrorMessageForInvalidConditional() {
$this->_reset(true); $this->_reset(true);
try {
$this->_runtemplate('<% cached Foo if %>$Bar<% end_cached %>'); $this->_runtemplate('<% cached Foo if %>$Bar<% end_cached %>');
} catch(Exception $e) {
return;
}
} }
} }