Drupal 8.0.0 beta 12. More info: https://www.drupal.org/node/2514176

core/modules/block/tests/modules/block_test/block_test.info.yml

@@ -0,0 +1,8 @@
+name: 'Block test'
+type: module
+description: 'Provides test blocks.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - block

core/modules/block/tests/modules/block_test/block_test.module

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ *   Provide test blocks.
+ */
+
+use Drupal\Core\Block\BlockPluginInterface;
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Implements hook_block_alter().
+ */
+function block_test_block_alter(&$block_info) {
+  if (\Drupal::state()->get('block_test_info_alter') && isset($block_info['test_block_instantiation'])) {
+    $block_info['test_block_instantiation']['category'] = t('Custom category');
+  }
+}
+
+/**
+ * Implements hook_block_view_BASE_BLOCK_ID_alter().
+ */
+function block_test_block_view_test_cache_alter(array &$build, BlockPluginInterface $block) {
+  if (\Drupal::state()->get('block_test_view_alter_suffix') !== NULL) {
+    $build['#suffix'] = '<br>Goodbye!';
+  }
+  if (\Drupal::state()->get('block_test_view_alter_cache_key') !== NULL) {
+    $build['#cache']['keys'][] = \Drupal::state()->get('block_test_view_alter_cache_key');
+  }
+  if (\Drupal::state()->get('block_test_view_alter_cache_tag') !== NULL) {
+    $build['#cache']['tags'][] = \Drupal::state()->get('block_test_view_alter_cache_tag');
+  }
+  if (\Drupal::state()->get('block_test_view_alter_append_pre_render_prefix') !== NULL) {
+    $build['#pre_render'][] = 'block_test_pre_render_alter_content';
+  }
+}
+
+/**
+ * #pre_render callback for a block to alter its content.
+ */
+function block_test_pre_render_alter_content($build) {
+  $build['#prefix'] = 'Hiya!<br>';
+  return $build;
+}

core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml

@@ -0,0 +1,17 @@
+id: test_block
+theme: stark
+weight: 0
+status: true
+langcode: en
+region: '-1'
+plugin: test_html
+settings:
+  label: 'Test HTML block'
+  provider: block_test
+  label_display: 'hidden'
+dependencies:
+  module:
+    - block_test
+  theme:
+    - classy
+visibility: {  }

core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml

@@ -0,0 +1,7 @@
+block.settings.test_block_instantiation:
+  type: block_settings
+  label: 'Test block instantiation settings'
+  mapping:
+    display_message:
+      type: string
+      label: 'Message text'

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php

@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestAccessBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\State\StateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a block to test access.
+ *
+ * @Block(
+ *   id = "test_access",
+ *   admin_label = @Translation("Test block access")
+ * )
+ */
+class TestAccessBlock extends BlockBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Tests the test access block.
+   *
+   *
+   * @param array $configuration
+   *   The plugin configuration, i.e. an array with configuration values keyed
+   *   by configuration option name. The special key 'context' may be used to
+   *   initialize the defined contexts by setting it to an array of context
+   *   values keyed by context names.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, StateInterface $state) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->state = $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('state')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function blockAccess(AccountInterface $account) {
+    return $this->state->get('test_block_access', FALSE) ? AccessResult::allowed() : AccessResult::forbidden();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    return ['#markup' => 'Hello test world'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+
+}
+

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php

@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestBlockInstantiation.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * Provides a basic block for testing block instantiation and configuration.
+ *
+ * @Block(
+ *   id = "test_block_instantiation",
+ *   admin_label = @Translation("Display message")
+ * )
+ */
+class TestBlockInstantiation extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return array(
+      'display_message' => 'no message set',
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function blockAccess(AccountInterface $account) {
+    return AccessResult::allowedIfHasPermission($account, 'access content');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function blockForm($form, FormStateInterface $form_state) {
+    $form['display_message'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Display message'),
+      '#default_value' => $this->configuration['display_message'],
+    );
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function blockSubmit($form, FormStateInterface $form_state) {
+    $this->configuration['display_message'] = $form_state->getValue('display_message');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    return array(
+      '#children' => $this->configuration['display_message'],
+    );
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestCacheBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a block to test caching.
+ *
+ * @Block(
+ *   id = "test_cache",
+ *   admin_label = @Translation("Test block caching")
+ * )
+ */
+class TestCacheBlock extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    $content = \Drupal::state()->get('block_test.content');
+
+    $build = array();
+    if (!empty($content)) {
+      $build['#markup'] = $content;
+    }
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return \Drupal::state()->get('block_test.cache_contexts', []);
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestContextAwareBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a context-aware block.
+ *
+ * @Block(
+ *   id = "test_context_aware",
+ *   admin_label = @Translation("Test context-aware block"),
+ *   context = {
+ *     "user" = @ContextDefinition("entity:user")
+ *   }
+ * )
+ */
+class TestContextAwareBlock extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    /** @var $user \Drupal\user\UserInterface */
+    $user = $this->getContextValue('user');
+    return array(
+      '#markup' => $user->getUsername(),
+    );
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestHtmlBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a block to test HTML.
+ *
+ * @Block(
+ *   id = "test_html",
+ *   admin_label = @Translation("Test HTML block")
+ * )
+ */
+class TestHtmlBlock extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    return array(
+      '#attributes' => \Drupal::state()->get('block_test.attributes'),
+      '#children' => \Drupal::state()->get('block_test.content'),
+    );
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestXSSTitleBlock.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestXSSTitleBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+/**
+ * Provides a block to test XSS in title.
+ *
+ * @Block(
+ *   id = "test_xss_title",
+ *   admin_label = "<script>alert('XSS subject');</script>"
+ * )
+ */
+class TestXSSTitleBlock extends TestCacheBlock {
+}

core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml

@@ -0,0 +1,7 @@
+name: '<"Cat" & ''Mouse''>'
+type: theme
+description: 'Theme for testing special characters in block admin.'
+core: 8.x
+regions:
+  content: Content
+  help: Help

core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml

@@ -0,0 +1,16 @@
+name: 'Block test theme'
+type: theme
+description: 'Theme for testing the block system'
+version: VERSION
+core: 8.x
+regions:
+  sidebar_first: 'Left sidebar'
+  sidebar_second: 'Right sidebar'
+  content: Content
+  header: Header
+  footer: Footer
+  highlighted: Highlighted
+  help: Help
+regions_hidden:
+  - sidebar_first
+  - sidebar_second

core/modules/block/tests/modules/block_test_views/block_test_views.info.yml

@@ -0,0 +1,9 @@
+name: 'Block test views'
+type: module
+description: 'Provides a view and block to test block displays in views.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - block
+  - views

core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml

@@ -0,0 +1,45 @@
+langcode: en
+status: true
+dependencies: {  }
+id: test_view_block
+label: test_view_block
+module: views
+description: ''
+tag: ''
+base_table: views_test_data
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: null
+    display_options:
+      access:
+        type: none
+      cache:
+        type: tag
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: views_test_data
+          field: name
+      title: test_view_block
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: null

core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml

@@ -0,0 +1,57 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: test_view_block2
+label: test_view_block2
+module: views
+description: ''
+tag: ''
+base_table: views_test_data
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: null
+    display_options:
+      access:
+        type: perm
+      cache:
+        type: tag
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: views_test_data
+          field: name
+      title: test_view_block2
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: null
+  block_2:
+    display_plugin: block
+    id: block_2
+    display_title: Block
+    position: null
+  block_3:
+    display_plugin: block
+    id: block_3
+    display_title: Block
+    position: null

core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php

@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\BlockConfigEntityUnitTest.
+ */
+
+namespace Drupal\Tests\block\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\block\Entity\Block
+ * @group block
+ */
+class BlockConfigEntityUnitTest extends UnitTestCase {
+
+  /**
+   * The entity type used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityType;
+
+  /**
+   * The entity manager used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityManager;
+
+  /**
+   * The ID of the type of the entity under test.
+   *
+   * @var string
+   */
+  protected $entityTypeId;
+
+  /**
+   * The UUID generator used for testing.
+   *
+   * @var \Drupal\Component\Uuid\UuidInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $uuid;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->entityTypeId = $this->randomMachineName();
+
+    $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
+    $this->entityType->expects($this->any())
+      ->method('getProvider')
+      ->will($this->returnValue('block'));
+
+    $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
+    $this->entityManager->expects($this->any())
+      ->method('getDefinition')
+      ->with($this->entityTypeId)
+      ->will($this->returnValue($this->entityType));
+
+    $this->uuid = $this->getMock('\Drupal\Component\Uuid\UuidInterface');
+
+    $container = new ContainerBuilder();
+    $container->set('entity.manager', $this->entityManager);
+    $container->set('uuid', $this->uuid);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::calculateDependencies
+   */
+  public function testCalculateDependencies() {
+    $values = array('theme' => 'stark');
+    // Mock the entity under test so that we can mock getPluginCollections().
+    $entity = $this->getMockBuilder('\Drupal\block\Entity\Block')
+      ->setConstructorArgs(array($values, $this->entityTypeId))
+      ->setMethods(array('getPluginCollections'))
+      ->getMock();
+    // Create a configurable plugin that would add a dependency.
+    $instance_id = $this->randomMachineName();
+    $instance = new TestConfigurablePlugin(array(), $instance_id, array('provider' => 'test'));
+
+    // Create a plugin collection to contain the instance.
+    $plugin_collection = $this->getMockBuilder('\Drupal\Core\Plugin\DefaultLazyPluginCollection')
+      ->disableOriginalConstructor()
+      ->setMethods(array('get'))
+      ->getMock();
+    $plugin_collection->expects($this->atLeastOnce())
+      ->method('get')
+      ->with($instance_id)
+      ->will($this->returnValue($instance));
+    $plugin_collection->addInstanceId($instance_id);
+
+    // Return the mocked plugin collection.
+    $entity->expects($this->once())
+      ->method('getPluginCollections')
+      ->will($this->returnValue(array($plugin_collection)));
+
+    $dependencies = $entity->calculateDependencies();
+    $this->assertContains('test', $dependencies['module']);
+    $this->assertContains('stark', $dependencies['theme']);
+  }
+
+}

core/modules/block/tests/src/Unit/BlockFormTest.php

@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\BlockFormTest.
+ */
+
+namespace Drupal\Tests\block\Unit;
+
+use Drupal\block\BlockForm;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\block\BlockForm
+ * @group block
+ */
+class BlockFormTest extends UnitTestCase {
+
+  /**
+   * The condition plugin manager.
+   *
+   * @var \Drupal\Core\Executable\ExecutableManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $conditionManager;
+
+  /**
+   * The block storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $storage;
+
+  /**
+   * The event dispatcher service.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $dispatcher;
+
+  /**
+   * The language manager service.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $language;
+
+
+  /**
+   * The theme handler.
+   *
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $themeHandler;
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->conditionManager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface');
+    $this->language = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
+    $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+
+    $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
+    $this->storage = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
+    $this->themeHandler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
+    $this->entityManager->expects($this->any())
+      ->method('getStorage')
+      ->will($this->returnValue($this->storage));
+
+  }
+
+  /**
+   * Tests the unique machine name generator.
+   *
+   * @see \Drupal\block\BlockForm::getUniqueMachineName()
+   */
+  public function testGetUniqueMachineName() {
+    $blocks = array();
+
+    $blocks['test'] = $this->getBlockMockWithMachineName('test');
+    $blocks['other_test'] = $this->getBlockMockWithMachineName('other_test');
+    $blocks['other_test_1'] = $this->getBlockMockWithMachineName('other_test');
+    $blocks['other_test_2'] = $this->getBlockMockWithMachineName('other_test');
+
+    $query = $this->getMock('Drupal\Core\Entity\Query\QueryInterface');
+    $query->expects($this->exactly(5))
+      ->method('condition')
+      ->will($this->returnValue($query));
+
+    $query->expects($this->exactly(5))
+      ->method('execute')
+      ->will($this->returnValue(array('test', 'other_test', 'other_test_1', 'other_test_2')));
+
+    $this->storage->expects($this->exactly(5))
+      ->method('getQuery')
+      ->will($this->returnValue($query));
+
+    $block_form_controller = new BlockForm($this->entityManager, $this->conditionManager, $this->dispatcher, $this->language, $this->themeHandler);
+
+    // Ensure that the block with just one other instance gets the next available
+    // name suggestion.
+    $this->assertEquals('test_2', $block_form_controller->getUniqueMachineName($blocks['test']));
+
+    // Ensure that the block with already three instances (_0, _1, _2) gets the
+    // 4th available name.
+    $this->assertEquals('other_test_3', $block_form_controller->getUniqueMachineName($blocks['other_test']));
+    $this->assertEquals('other_test_3', $block_form_controller->getUniqueMachineName($blocks['other_test_1']));
+    $this->assertEquals('other_test_3', $block_form_controller->getUniqueMachineName($blocks['other_test_2']));
+
+    // Ensure that a block without an instance yet gets the suggestion as
+    // unique machine name.
+    $last_block = $this->getBlockMockWithMachineName('last_test');
+    $this->assertEquals('last_test', $block_form_controller->getUniqueMachineName($last_block));
+  }
+
+}

core/modules/block/tests/src/Unit/BlockRepositoryTest.php

@@ -0,0 +1,185 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\BlockRepositoryTest.
+ */
+
+namespace Drupal\Tests\block\Unit;
+
+use Drupal\block\BlockRepository;
+use Drupal\Core\Block\BlockPluginInterface;
+use Drupal\Core\Plugin\ContextAwarePluginInterface;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\block\BlockRepository
+ * @group block
+ */
+class BlockRepositoryTest extends UnitTestCase {
+
+  /**
+   * @var \Drupal\block\BlockRepository
+   */
+  protected $blockRepository;
+
+  /**
+   * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $blockStorage;
+
+  /**
+   * @var string
+   */
+  protected $theme;
+
+  /**
+   * @var \Drupal\Core\Plugin\Context\ContextHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $contextHandler;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $active_theme = $this->getMockBuilder('Drupal\Core\Theme\ActiveTheme')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $this->theme = $this->randomMachineName();
+    $active_theme->expects($this->atLeastOnce())
+      ->method('getName')
+      ->willReturn($this->theme);
+    $active_theme->expects($this->atLeastOnce())
+      ->method('getRegions')
+      ->willReturn([
+        'top',
+        'center',
+        'bottom',
+      ]);
+
+    $theme_manager = $this->getMock('Drupal\Core\Theme\ThemeManagerInterface');
+    $theme_manager->expects($this->once())
+      ->method('getActiveTheme')
+      ->will($this->returnValue($active_theme));
+
+    $this->contextHandler = $this->getMock('Drupal\Core\Plugin\Context\ContextHandlerInterface');
+    $this->blockStorage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+    $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
+    $entity_manager->expects($this->any())
+      ->method('getStorage')
+      ->willReturn($this->blockStorage);
+
+    $this->blockRepository = new BlockRepository($entity_manager, $theme_manager, $this->contextHandler);
+  }
+
+  /**
+   * Tests the retrieval of block entities.
+   *
+   * @covers ::getVisibleBlocksPerRegion
+   *
+   * @dataProvider providerBlocksConfig
+   */
+  public function testGetVisibleBlocksPerRegion(array $blocks_config, array $expected_blocks) {
+    $blocks = [];
+    foreach ($blocks_config as $block_id => $block_config) {
+      $block = $this->getMock('Drupal\block\BlockInterface');
+      $block->expects($this->once())
+        ->method('setContexts')
+        ->willReturnSelf();
+      $block->expects($this->once())
+        ->method('access')
+        ->will($this->returnValue($block_config[0]));
+      $block->expects($block_config[0] ? $this->atLeastOnce() : $this->never())
+        ->method('getRegion')
+        ->willReturn($block_config[1]);
+      $blocks[$block_id] = $block;
+    }
+
+    $this->blockStorage->expects($this->once())
+      ->method('loadByProperties')
+      ->with(['theme' => $this->theme])
+      ->willReturn($blocks);
+    $result = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion([]) as $region => $resulting_blocks) {
+      $result[$region] = [];
+      foreach ($resulting_blocks as $plugin_id => $block) {
+        $result[$region][] = $plugin_id;
+      }
+    }
+    $this->assertSame($result, $expected_blocks);
+  }
+
+  public function providerBlocksConfig() {
+    $blocks_config = array(
+      'block1' => array(
+        TRUE, 'top', 0
+      ),
+      // Test a block without access.
+      'block2' => array(
+        FALSE, 'bottom', 0
+      ),
+      // Test two blocks in the same region with specific weight.
+      'block3' => array(
+        TRUE, 'bottom', 5
+      ),
+      'block4' => array(
+        TRUE, 'bottom', -5
+      ),
+    );
+
+    $test_cases = [];
+    $test_cases[] = [$blocks_config,
+      [
+        'top' => ['block1'],
+        'center' => [],
+        'bottom' => ['block4', 'block3'],
+      ]
+    ];
+    return $test_cases;
+  }
+
+  /**
+   * Tests the retrieval of block entities that are context-aware.
+   *
+   * @covers ::getVisibleBlocksPerRegion
+   */
+  public function testGetVisibleBlocksPerRegionWithContext() {
+    $block = $this->getMock('Drupal\block\BlockInterface');
+    $block->expects($this->once())
+      ->method('setContexts')
+      ->willReturnSelf();
+    $block->expects($this->once())
+      ->method('access')
+      ->willReturn(TRUE);
+    $block->expects($this->once())
+      ->method('getRegion')
+      ->willReturn('top');
+    $blocks['block_id'] = $block;
+
+    $contexts = [];
+    $this->blockStorage->expects($this->once())
+      ->method('loadByProperties')
+      ->with(['theme' => $this->theme])
+      ->willReturn($blocks);
+    $result = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion($contexts) as $region => $resulting_blocks) {
+      $result[$region] = [];
+      foreach ($resulting_blocks as $plugin_id => $block) {
+        $result[$region][] = $plugin_id;
+      }
+    }
+    $expected = [
+      'top' => [
+        'block_id',
+      ],
+      'center' => [],
+      'bottom' => [],
+    ];
+    $this->assertSame($expected, $result);
+  }
+
+}
+
+interface TestContextAwareBlockInterface extends BlockPluginInterface, ContextAwarePluginInterface {
+}

core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\CategoryAutocompleteTest.
+ */
+
+namespace Drupal\Tests\block\Unit;
+
+use Drupal\block\Controller\CategoryAutocompleteController;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @coversDefaultClass \Drupal\block\Controller\CategoryAutocompleteController
+ * @group block
+ */
+class CategoryAutocompleteTest extends UnitTestCase {
+
+  /**
+   * The autocomplete controller.
+   *
+   * @var \Drupal\block\Controller\CategoryAutocompleteController
+   */
+  protected $autocompleteController;
+
+  protected function setUp() {
+    $block_manager = $this->getMock('Drupal\Core\Block\BlockManagerInterface');
+    $block_manager->expects($this->any())
+      ->method('getCategories')
+      ->will($this->returnValue(array('Comment', 'Node', 'None & Such', 'User')));
+
+    $this->autocompleteController = new CategoryAutocompleteController($block_manager);
+  }
+
+  /**
+   * Tests the autocomplete method.
+   *
+   * @param string $string
+   *   The string entered into the autocomplete.
+   * @param array $suggestions
+   *   The array of expected suggestions.
+   *
+   * @see \Drupal\block\Controller\CategoryAutocompleteController::autocomplete()
+   *
+   * @dataProvider providerTestAutocompleteSuggestions
+   */
+  public function testAutocompleteSuggestions($string, $suggestions) {
+    $suggestions = array_map(function ($suggestion) {
+      return array('value' => $suggestion, 'label' => SafeMarkup::checkPlain($suggestion));
+    }, $suggestions);
+    $result = $this->autocompleteController->autocomplete(new Request(array('q' => $string)));
+    $this->assertSame($suggestions, json_decode($result->getContent(), TRUE));
+  }
+
+  /**
+   * Data provider for testAutocompleteSuggestions().
+   *
+   * @return array
+   */
+  public function providerTestAutocompleteSuggestions() {
+    $test_parameters = array();
+    $test_parameters[] = array(
+      'string' => 'Com',
+      'suggestions' => array(
+        'Comment',
+      ),
+    );
+    $test_parameters[] = array(
+      'string' => 'No',
+      'suggestions' => array(
+        'Node',
+        'None & Such',
+      ),
+    );
+    $test_parameters[] = array(
+      'string' => 'us',
+      'suggestions' => array(
+        'User',
+      ),
+    );
+    $test_parameters[] = array(
+      'string' => 'Banana',
+      'suggestions' => array(),
+    );
+    return $test_parameters;
+  }
+
+}

core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\Menu\BlockLocalTasksTest.
+ */
+
+namespace Drupal\Tests\block\Unit\Menu;
+
+use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Tests block local tasks.
+ *
+ * @group block
+ */
+class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
+
+  protected function setUp() {
+    $this->directoryList = array('block' => 'core/modules/block');
+    parent::setUp();
+
+    $config_factory = $this->getConfigFactoryStub(array('system.theme' => array(
+      'default' => 'test_c',
+    )));
+
+    $themes = array();
+    $themes['test_a'] = (object) array(
+      'status' => 0,
+    );
+    $themes['test_b'] = (object) array(
+      'status' => 1,
+      'info' => array(
+        'name' => 'test_b',
+      ),
+    );
+    $themes['test_c'] = (object) array(
+      'status' => 1,
+      'info' => array(
+        'name' => 'test_c',
+      ),
+    );
+    $theme_handler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
+    $theme_handler->expects($this->any())
+      ->method('listInfo')
+      ->will($this->returnValue($themes));
+
+    $container = new ContainerBuilder();
+    $container->set('config.factory', $config_factory);
+    $container->set('theme_handler', $theme_handler);
+    $container->set('app.root', $this->root);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Tests the admin edit local task.
+   */
+  public function testBlockAdminLocalTasks() {
+    $this->assertLocalTasks('entity.block.edit_form', array(array('entity.block.edit_form')));
+  }
+
+  /**
+   * Tests the block admin display local tasks.
+   *
+   * @dataProvider providerTestBlockAdminDisplay
+   */
+  public function testBlockAdminDisplay($route, $expected) {
+    $this->assertLocalTasks($route, $expected);
+  }
+
+  /**
+   * Provides a list of routes to test.
+   */
+  public function providerTestBlockAdminDisplay() {
+    return array(
+      array('block.admin_display', array(array('block.admin_display'), array('block.admin_display_theme:test_b', 'block.admin_display_theme:test_c'))),
+      array('block.admin_display_theme', array(array('block.admin_display'), array('block.admin_display_theme:test_b', 'block.admin_display_theme:test_c'))),
+    );
+  }
+
+}

core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php

@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Unit\Plugin\DisplayVariant\BlockPageVariantTest.
+ */
+
+namespace Drupal\Tests\block\Unit\Plugin\DisplayVariant;
+
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\block\Plugin\DisplayVariant\BlockPageVariant
+ * @group block
+ */
+class BlockPageVariantTest extends UnitTestCase {
+
+  /**
+   * The block repository.
+   *
+   * @var \Drupal\block\BlockRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $blockRepository;
+
+  /**
+   * The block view builder.
+   *
+   * @var \Drupal\Core\Entity\EntityViewBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $blockViewBuilder;
+
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $dispatcher;
+
+  /**
+   * The plugin context handler.
+   *
+   * @var \Drupal\Core\Plugin\Context\ContextHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $contextHandler;
+
+  /**
+   * Sets up a display variant plugin for testing.
+   *
+   * @param array $configuration
+   *   An array of plugin configuration.
+   * @param array $definition
+   *   The plugin definition array.
+   *
+   * @return \Drupal\block\Plugin\DisplayVariant\BlockPageVariant|\PHPUnit_Framework_MockObject_MockObject
+   *   A mocked display variant plugin.
+   */
+  public function setUpDisplayVariant($configuration = array(), $definition = array()) {
+    $this->blockRepository = $this->getMock('Drupal\block\BlockRepositoryInterface');
+    $this->blockViewBuilder = $this->getMock('Drupal\Core\Entity\EntityViewBuilderInterface');
+    $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+    $this->dispatcher->expects($this->any())
+      ->method('dispatch')
+      ->willReturnArgument(1);
+    return $this->getMockBuilder('Drupal\block\Plugin\DisplayVariant\BlockPageVariant')
+      ->setConstructorArgs(array($configuration, 'test', $definition, $this->blockRepository, $this->blockViewBuilder, $this->dispatcher, ['config:block_list']))
+      ->setMethods(array('getRegionNames'))
+      ->getMock();
+  }
+
+  public function providerBuild() {
+    $blocks_config = array(
+      'block1' => array(
+        // region, is main content block, is messages block
+        'top', FALSE, FALSE,
+      ),
+      // Test multiple blocks in the same region.
+      'block2' => array(
+        'bottom', FALSE, FALSE,
+      ),
+      'block3' => array(
+        'bottom', FALSE, FALSE,
+      ),
+      // Test a block implementing MainContentBlockPluginInterface.
+      'block4' => array(
+        'center', TRUE, FALSE,
+      ),
+      // Test a block implementing MessagesBlockPluginInterface.
+      'block5' => array(
+        'center', FALSE, TRUE,
+      ),
+    );
+
+    $test_cases = [];
+    $test_cases[] = [$blocks_config, 5,
+      [
+        '#cache' => [
+          'tags' => [
+            'config:block_list',
+          ],
+        ],
+        'top' => [
+          'block1' => [],
+          '#sorted' => TRUE,
+        ],
+        // The main content was rendered via a block.
+        'center' => [
+          'block4' => [],
+          'block5' => [],
+          '#sorted' => TRUE,
+        ],
+        'bottom' => [
+          'block2' => [],
+          'block3' => [],
+          '#sorted' => TRUE,
+        ],
+      ],
+    ];
+    unset($blocks_config['block5']);
+    $test_cases[] = [$blocks_config, 4,
+      [
+        '#cache' => [
+          'tags' => [
+            'config:block_list',
+          ],
+        ],
+        'top' => [
+          'block1' => [],
+          '#sorted' => TRUE,
+        ],
+        'center' => [
+          'block4' => [],
+          '#sorted' => TRUE,
+        ],
+        'bottom' => [
+          'block2' => [],
+          'block3' => [],
+          '#sorted' => TRUE,
+        ],
+        // The messages are rendered via the fallback in case there is no block
+        // rendering the main content.
+        'content' => [
+          'messages' => [
+            '#weight' => -1000,
+            '#type' => 'status_messages',
+          ],
+        ],
+      ],
+    ];
+    unset($blocks_config['block4']);
+    $test_cases[] = [$blocks_config, 3,
+      [
+        '#cache' => [
+          'tags' => [
+            'config:block_list',
+          ],
+        ],
+        'top' => [
+          'block1' => [],
+          '#sorted' => TRUE,
+        ],
+        'bottom' => [
+          'block2' => [],
+          'block3' => [],
+          '#sorted' => TRUE,
+        ],
+        // The main content & messages are rendered via the fallback in case
+        // there are no blocks rendering them.
+        'content' => [
+          'system_main' => ['#markup' => 'Hello kittens!'],
+          'messages' => [
+            '#weight' => -1000,
+            '#type' => 'status_messages',
+          ],
+        ],
+      ],
+    ];
+    return $test_cases;
+  }
+
+  /**
+   * Tests the building of a full page variant.
+   *
+   * @covers ::build
+   *
+   * @dataProvider providerBuild
+   */
+  public function testBuild(array $blocks_config, $visible_block_count, array $expected_render_array) {
+    $display_variant = $this->setUpDisplayVariant();
+    $display_variant->setMainContent(['#markup' => 'Hello kittens!']);
+
+    $blocks = ['top' => [], 'center' => [], 'bottom' => []];
+    $block_plugin = $this->getMock('Drupal\Core\Block\BlockPluginInterface');
+    $main_content_block_plugin = $this->getMock('Drupal\Core\Block\MainContentBlockPluginInterface');
+    $messages_block_plugin = $this->getMock('Drupal\Core\Block\MessagesBlockPluginInterface');
+    foreach ($blocks_config as $block_id => $block_config) {
+      $block = $this->getMock('Drupal\block\BlockInterface');
+      $block->expects($this->atLeastOnce())
+        ->method('getPlugin')
+        ->willReturn($block_config[1] ? $main_content_block_plugin : ($block_config[2] ? $messages_block_plugin : $block_plugin));
+      $blocks[$block_config[0]][$block_id] = $block;
+    }
+
+    $this->blockViewBuilder->expects($this->exactly($visible_block_count))
+      ->method('view')
+      ->will($this->returnValue(array()));
+    $this->blockRepository->expects($this->once())
+      ->method('getVisibleBlocksPerRegion')
+      ->will($this->returnValue($blocks));
+
+    $this->assertSame($expected_render_array, $display_variant->build());
+  }
+
+  /**
+   * Tests the building of a full page variant with no main content set.
+   *
+   * @covers ::build
+   */
+  public function testBuildWithoutMainContent() {
+    $display_variant = $this->setUpDisplayVariant();
+    $this->blockRepository->expects($this->once())
+      ->method('getVisibleBlocksPerRegion')
+      ->willReturn([]);
+
+    $expected = [
+      '#cache' => [
+        'tags' => [
+          'config:block_list',
+        ],
+      ],
+      'content' => [
+        'system_main' => [],
+        'messages' => [
+          '#weight' => -1000,
+          '#type' => 'status_messages',
+        ],
+      ],
+    ];
+    $this->assertSame($expected, $display_variant->build());
+  }
+
+}