X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/091e5aaa26d999d2217c5acd47989036a09c567e..64958543888084feeabb624ec37af5f552cc5e54:/tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php

diff --git a/tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php b/tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php
index b53bb8cb35c..421b38bba36 100644
--- a/tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php
+++ b/tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php
@@ -38,25 +38,29 @@ require_once(PATH_t3lib . 'cache/frontend/class.t3lib_cache_frontend_stringfront
 class t3lib_cache_frontend_StringFrontendTestCase extends tx_phpunit_testcase {
 
 	/**
+	 * @expectedException InvalidArgumentException
 	 * @test
 	 * @author Robert Lemke <robert@typo3.org>
+	 * @author Ingo Renner <ingo@typo3.org>
+	 */
+	public function setChecksIfTheIdentifierIsValid() {
+		$cache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('isValidEntryIdentifier'), array(), '', FALSE);
+		$cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(FALSE));
+		$cache->set('foo', 'bar');
+	}
+
+	/**
+	 * @test
 	 * @author Karsten Dambekalns <karsten@typo3.org>
 	 * @author Ingo Renner <ingo@typo3.org>
 	 */
-	public function setRejectsInvalidIdentifiers() {
+	public function setPassesStringToBackend() {
 		$theString = 'Just some value';
-		$backend = $this->getMock('t3lib_cache_backend_Backend', array(), array(), '', FALSE);
-		$backend->expects($this->never())->method('set');
+		$backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'findIdentifiersByTags', 'flush', 'flushByTag', 'flushByTags', 'collectGarbage'), array(), '', FALSE);
+		$backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString));
 
 		$cache = new t3lib_cache_frontend_StringFrontend('StringFrontend', $backend);
-
-		foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#', 'some&') as $entryIdentifier) {
-			try {
-				$cache->set($entryIdentifier, $theString);
-				$this->fail('set() did no reject the entry identifier "' . $entryIdentifier . '".');
-			} catch (InvalidArgumentException $exception) {
-			}
-		}
+		$cache->set('StringCacheTest', $theString);
 	}
 
 	/**
@@ -64,13 +68,14 @@ class t3lib_cache_frontend_StringFrontendTestCase extends tx_phpunit_testcase {
 	 * @author Karsten Dambekalns <karsten@typo3.org>
 	 * @author Ingo Renner <ingo@typo3.org>
 	 */
-	public function setPassesStringToBackend() {
+	public function setPassesLifetimeToBackend() {
 		$theString = 'Just some value';
+		$theLifetime = 1234;
 		$backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'findIdentifiersByTags', 'flush', 'flushByTag', 'flushByTags', 'collectGarbage'), array(), '', FALSE);
-		$backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString));
+		$backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString), $this->equalTo(array()), $this->equalTo($theLifetime));
 
 		$cache = new t3lib_cache_frontend_StringFrontend('StringFrontend', $backend);
-		$cache->set('StringCacheTest', $theString);
+		$cache->set('StringCacheTest', $theString, array(), $theLifetime);
 	}
 
 	/**