X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FTests%2FEntity%2FEntityCacheTagsTestBase.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FTests%2FEntity%2FEntityCacheTagsTestBase.php;h=d215df5ccd42a3c2c6a71d7a84a6de6727441ec3;hp=7f5c5e340ffe33fad002285b8b146822d3cfb8fe;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5 diff --git a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php index 7f5c5e340..d215df5cc 100644 --- a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php +++ b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php @@ -415,7 +415,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $cid = $this->createCacheId($cache_keys, $entity_cache_contexts); $this->verifyRenderCache($cid, $non_referencing_entity_cache_tags); - $this->pass("Test listing of referencing entities.", 'Debug'); // Prime the page cache for the listing of referencing entities. $this->verifyPageCache($listing_url, 'MISS'); @@ -434,7 +433,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $contexts_in_header = $this->drupalGetHeader('X-Drupal-Cache-Contexts'); $this->assertEqual(Cache::mergeContexts($page_cache_contexts, $this->getAdditionalCacheContextsForEntityListing()), empty($contexts_in_header) ? [] : explode(' ', $contexts_in_header)); - $this->pass("Test listing containing referenced entity.", 'Debug'); // Prime the page cache for the listing containing the referenced entity. $this->verifyPageCache($nonempty_entity_listing_url, 'MISS', $nonempty_entity_listing_cache_tags); @@ -444,7 +442,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $contexts_in_header = $this->drupalGetHeader('X-Drupal-Cache-Contexts'); $this->assertEqual(Cache::mergeContexts($page_cache_contexts, $this->getAdditionalCacheContextsForEntityListing()), empty($contexts_in_header) ? [] : explode(' ', $contexts_in_header)); - // Verify that after modifying the referenced entity, there is a cache miss // for every route except the one for the non-referencing entity. $this->pass("Test modification of referenced entity.", 'Debug'); @@ -461,7 +458,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($empty_entity_listing_url, 'HIT'); $this->verifyPageCache($nonempty_entity_listing_url, 'HIT'); - // Verify that after modifying the referencing entity, there is a cache miss // for every route except the ones for the non-referencing entity and the // empty entity listing. @@ -478,7 +474,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($listing_url, 'HIT'); $this->verifyPageCache($nonempty_entity_listing_url, 'HIT'); - // Verify that after modifying the non-referencing entity, there is a cache // miss only for the non-referencing entity route. $this->pass("Test modification of non-referencing entity.", 'Debug'); @@ -492,7 +487,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { // Verify cache hits. $this->verifyPageCache($non_referencing_entity_url, 'HIT'); - if ($this->entity->getEntityType()->hasHandlerClass('view_builder')) { // Verify that after modifying the entity's display, there is a cache miss // for both the referencing entity, and the listing of referencing @@ -512,7 +506,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($listing_url, 'HIT'); } - if ($bundle_entity_type_id = $this->entity->getEntityType()->getBundleEntityType()) { // Verify that after modifying the corresponding bundle entity, there is a // cache miss for both the referencing entity, and the listing of @@ -546,7 +539,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { } } - if ($this->entity->getEntityType()->get('field_ui_base_route')) { // Verify that after modifying a configurable field on the entity, there // is a cache miss. @@ -564,7 +556,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($referencing_entity_url, 'HIT'); $this->verifyPageCache($listing_url, 'HIT'); - // Verify that after modifying a configurable field on the entity, there // is a cache miss. $this->pass("Test modification of referenced entity's configurable field.", 'Debug'); @@ -582,7 +573,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($listing_url, 'HIT'); } - // Verify that after invalidating the entity's cache tag directly, there is // a cache miss for every route except the ones for the non-referencing // entity and the empty entity listing. @@ -614,7 +604,6 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { $this->verifyPageCache($empty_entity_listing_url, 'HIT'); $this->verifyPageCache($nonempty_entity_listing_url, 'HIT'); - if (!empty($view_cache_tag)) { // Verify that after invalidating the generic entity type's view cache tag // directly, there is a cache miss for both the referencing entity, and the