Updated the caching framework to the according FLOW3 revision 2616

[Packages/TYPO3.CMS.git] / tests / t3lib / cache / frontend / t3lib_cache_frontend_abstractfrontendtestcase.php

diff --git a/tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php b/tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php
index 1af9a00..4fe578d 100644 (file)
--- a/tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php
+++ b/tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php
@@ -44,7 +44,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
         */
        public function theConstructorAcceptsValidIdentifiers() {
                $mockBackend = $this->getMock('t3lib_cache_backend_AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'findIdentifiersByTags', 'flush', 'flushByTag', 'flushByTags', 'collectGarbage'), array(), '', FALSE);
-               foreach (array('x', 'someValue', '123fivesixseveneight', 'ab_cd%', rawurlencode('package://some/äöü$&% sadf'), str_repeat('x', 250)) as $identifier) {
+               foreach (array('x', 'someValue', '123fivesixseveneight', 'some&', 'ab_cd%', rawurlencode('package://some/äöü$&% sadf'), str_repeat('x', 250)) as $identifier) {
                        $abstractCache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
                }
        }
@@ -56,7 +56,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
         */
        public function theConstructorRejectsInvalidIdentifiers() {
                $mockBackend = $this->getMock('t3lib_cache_backend_AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'findIdentifiersByTags', 'flush', 'flushByTag', 'flushByTags', 'collectGarbage'), array(), '', FALSE);
-               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#', 'some&') as $identifier) {
+               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $identifier) {
                        try {
                                $abstractCache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
                                $this->fail('Identifier "' . $identifier . '" was not rejected.');
@@ -146,7 +146,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
                $identifier = 'someCacheIdentifier';
                $backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array(), array(), '', FALSE);
                $cache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
-               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#', 'some&') as $entryIdentifier) {
+               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $entryIdentifier) {
                        $this->assertFalse($cache->isValidEntryIdentifier($entryIdentifier), 'Invalid identifier "' . $entryIdentifier . '" was not rejected.');
                }
        }
@@ -160,7 +160,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
                $identifier = 'someCacheIdentifier';
                $backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array(), array(), '', FALSE);
                $cache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
-               foreach (array('_', 'abcdef', 'foo', 'bar123', '3some', '_bl_a', 'one%TWO', str_repeat('x', 250)) as $entryIdentifier) {
+               foreach (array('_', 'abcdef', 'foo', 'bar123', '3some', '_bl_a', 'some&', 'one%TWO', str_repeat('x', 250)) as $entryIdentifier) {
                        $this->assertTrue($cache->isValidEntryIdentifier($entryIdentifier), 'Valid identifier "' . $entryIdentifier . '" was not accepted.');
                }
        }
@@ -174,7 +174,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
                $identifier = 'someCacheIdentifier';
                $backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array(), array(), '', FALSE);
                $cache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
-               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#', 'some&') as $tag) {
+               foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $tag) {
                        $this->assertFalse($cache->isValidTag($tag), 'Invalid tag "' . $tag . '" was not rejected.');
                }
        }
@@ -188,7 +188,7 @@ class t3lib_cache_frontend_AbstractFrontendTestCase extends tx_phpunit_testcase
                $identifier = 'someCacheIdentifier';
                $backend = $this->getMock('t3lib_cache_backend_AbstractBackend', array(), array(), '', FALSE);
                $cache = $this->getMock('t3lib_cache_frontend_StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
-               foreach (array('abcdef', 'foo_baar', 'bar123', '3some', 'file%Thing', '%x%', str_repeat('x', 250)) as $tag) {
+               foreach (array('abcdef', 'foo-bar', 'foo_baar', 'bar123', '3some', 'file%Thing', 'some&', '%x%', str_repeat('x', 250)) as $tag) {
                        $this->assertTrue($cache->isValidTag($tag), 'Valid tag "' . $tag . '" was not accepted.');
                }
        }