summaryrefslogtreecommitdiffstats
path: root/core/modules/breakpoint/tests
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/breakpoint/tests')
-rw-r--r--core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml21
-rw-r--r--core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.info.yml6
-rw-r--r--core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php123
-rw-r--r--core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php158
-rw-r--r--core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php117
-rw-r--r--core/modules/breakpoint/tests/src/BreakpointTest.php122
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml11
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml11
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml11
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml11
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml12
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml11
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml41
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml (renamed from core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml)0
14 files changed, 190 insertions, 465 deletions
diff --git a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
new file mode 100644
index 0000000..0c24709
--- /dev/null
+++ b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
@@ -0,0 +1,21 @@
+breakpoint_module_test.mobile:
+ label: mobile
+ mediaQuery: '(min-width: 0px)'
+ weight: 0
+ # Don't include multipliers. A 1x multiplier this will be enforced by default.
+breakpoint_module_test.standard:
+ label: standard
+ mediaQuery: '(min-width: 560px)'
+ weight: 1
+ # Don't include a 1x multiplier this will be enforced by default.
+ multipliers:
+ - 2x
+# Test providing a breakpoint for group matching the group provided by
+# breakpoint_test_theme.
+breakpoint_module_test.breakpoint_theme_test.group2.tv:
+ label: tv
+ mediaQuery: '(min-width: 6000px)'
+ weight: 3
+ multipliers:
+ - 1x
+ group: breakpoint_theme_test.group2
diff --git a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.info.yml b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.info.yml
new file mode 100644
index 0000000..5acc9cd
--- /dev/null
+++ b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Breakpoint test module'
+type: module
+description: 'Test module for breakpoint.'
+version: VERSION
+core: 8.x
+
diff --git a/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php b/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php
deleted file mode 100644
index 3b10801..0000000
--- a/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointConfigEntityUnitTest.
- */
-
-namespace Drupal\breakpoint\Tests;
-
-use Drupal\breakpoint\Entity\Breakpoint;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * @coversDefaultClass \Drupal\breakpoint\Entity\Breakpoint
- * @group breakpoint
- */
-class BreakpointConfigEntityUnitTest extends UnitTestCase {
-
- /**
- * The entity under test.
- *
- * @var \Drupal\breakpoint\Entity\Breakpoint|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entity;
-
- /**
- * 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('breakpoint'));
-
- $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 testCalculateDependenciesModule() {
- $values = array(
- 'name' => 'test',
- 'source' => 'test_module',
- 'sourceType' => Breakpoint::SOURCE_TYPE_MODULE,
- );
- $entity = new Breakpoint($values, $this->entityTypeId);
-
- $dependencies = $entity->calculateDependencies();
- $this->assertArrayNotHasKey('theme', $dependencies);
- $this->assertContains('test_module', $dependencies['module']);
- }
-
- /**
- * @covers ::calculateDependencies
- */
- public function testCalculateDependenciesTheme() {
- $values = array(
- 'name' => 'test',
- 'source' => 'test_theme',
- 'sourceType' => Breakpoint::SOURCE_TYPE_THEME,
- );
- $entity = new Breakpoint($values, $this->entityTypeId);
-
- $dependencies = $entity->calculateDependencies();
- $this->assertArrayNotHasKey('module', $dependencies);
- $this->assertContains('test_theme', $dependencies['theme']);
- }
-
- /**
- * @expectedException \Drupal\breakpoint\InvalidBreakpointNameException
- */
- public function testNameException () {
- new Breakpoint(array(
- 'label' => $this->randomMachineName(),
- 'source' => 'custom_module',
- 'sourceType' => 'oops',
- ));
- }
-
-}
diff --git a/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php b/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php
deleted file mode 100644
index 61ad1ac..0000000
--- a/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointGroupConfigEntityUnitTest.
- */
-
-namespace Drupal\breakpoint\Tests;
-
-use Drupal\breakpoint\Entity\Breakpoint;
-use Drupal\breakpoint\Entity\BreakpointGroup;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * @coversDefaultClass \Drupal\breakpoint\Entity\BreakpointGroup
- * @group breakpoint
- */
-class BreakpointGroupConfigEntityUnitTest extends UnitTestCase {
-
- /**
- * The entity under test.
- *
- * @var \Drupal\breakpoint\Entity\BreakpointGroup|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entity;
-
- /**
- * 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('breakpoint'));
-
- $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);
- }
-
- /**
- * Sets up the entity to test.
- */
- public function setUpEntity($values) {
- // Mocking the entity under test because the class contains calls to
- // procedural code.
- $this->entity = $this->getMockBuilder('\Drupal\breakpoint\Entity\BreakpointGroup')
- ->setConstructorArgs(array($values, $this->entityTypeId))
- ->setMethods(array('getBreakpoints'))
- ->getMock();
- }
-
- /**
- * @covers ::calculateDependencies
- */
- public function testCalculateDependenciesModule() {
- $this->setUpEntity(
- array(
- 'name' => 'test',
- 'source' => 'test_module',
- 'sourceType' => Breakpoint::SOURCE_TYPE_MODULE,
- )
- );
- $breakpoint = $this->getMock('\Drupal\breakpoint\BreakpointInterface');
- $breakpoint->expects($this->once())
- ->method('getConfigDependencyName')
- ->will($this->returnValue('breakpoint.breakpoint.test'));
-
- $this->entity->expects($this->once())
- ->method('getBreakpoints')
- ->will($this->returnValue(array($breakpoint)));
-
- $dependencies = $this->entity->calculateDependencies();
- $this->assertArrayNotHasKey('theme', $dependencies);
- $this->assertContains('test_module', $dependencies['module']);
- $this->assertContains('breakpoint.breakpoint.test', $dependencies['entity']);
- }
-
- /**
- * @covers ::calculateDependencies
- */
- public function testCalculateDependenciesTheme() {
- $this->setUpEntity(
- array(
- 'name' => 'test',
- 'source' => 'test_theme',
- 'sourceType' => Breakpoint::SOURCE_TYPE_THEME,
- )
- );
-
- $breakpoint = $this->getMockBuilder('\Drupal\breakpoint\Entity\Breakpoint')
- ->disableOriginalConstructor()->getMock();
- $breakpoint->expects($this->once())
- ->method('getConfigDependencyName')
- ->will($this->returnValue('breakpoint.breakpoint.test'));
-
- $this->entity->expects($this->once())
- ->method('getBreakpoints')
- ->will($this->returnValue(array($breakpoint)));
-
- $dependencies = $this->entity->calculateDependencies();
- $this->assertArrayNotHasKey('module', $dependencies);
- $this->assertContains('test_theme', $dependencies['theme']);
- $this->assertContains('breakpoint.breakpoint.test', $dependencies['entity']);
- }
-
- /**
- * @expectedException \Drupal\breakpoint\InvalidBreakpointNameException
- */
- public function testNameException () {
- new BreakpointGroup(array(
- 'label' => $this->randomMachineName(),
- 'source' => 'custom_module',
- 'sourceType' => 'oops',
- ));
- }
-
-}
diff --git a/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php b/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php
deleted file mode 100644
index c8ab81d..0000000
--- a/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * @file
- * Definition of Drupal\breakpoint\Tests\BreakpointMediaQueryTest.
- */
-
-namespace Drupal\breakpoint\Tests;
-
-use Drupal\Tests\UnitTestCase;
-use Drupal\breakpoint\Entity\Breakpoint;
-use Drupal\breakpoint\InvalidBreakpointMediaQueryException;
-
-/**
- * Tests validation of media queries.
- *
- * @group breakpoint
- */
-class BreakpointMediaQueryTest extends UnitTestCase {
-
- /**
- * Test valid media queries.
- */
- public function testValidMediaQueries() {
- $media_queries = array(
- // Bartik breakpoints.
- '(min-width: 0px)',
- 'all and (min-width: 560px) and (max-width:850px)',
- 'all and (min-width: 851px)',
- // Seven breakpoints.
- '(min-width: 0em)',
- 'screen and (min-width: 40em)',
- // Stark breakpoints.
- '(min-width: 0px)',
- 'all and (min-width: 480px) and (max-width: 959px)',
- 'all and (min-width: 960px)',
- // Other media queries.
- '(orientation)',
- 'all and (orientation)',
- 'not all and (orientation)',
- 'only all and (orientation)',
- 'screen and (width)',
- 'screen and (width: 0)',
- 'screen and (width: 0px)',
- 'screen and (width: 0em)',
- 'screen and (min-width: -0)',
- 'screen and (max-width: 0)',
- 'screen and (max-width: 0.3)',
- 'screen and (min-width)',
- // Multiline and comments.
- 'screen and /* this is a comment */ (min-width)',
- "screen\nand /* this is a comment */ (min-width)",
- "screen\n\nand /* this is\n a comment */ (min-width)",
- // Unrecognized features are allowed.
- 'screen and (-webkit-min-device-pixel-ratio: 7)',
- 'screen and (min-orientation: landscape)',
- 'screen and (max-orientation: landscape)',
- );
-
- foreach ($media_queries as $media_query) {
- $this->assertTrue(Breakpoint::isValidMediaQuery($media_query), $media_query . ' is valid.');
- }
- }
-
- /**
- * Test invalid media queries.
- */
- public function testInvalidMediaQueries() {
- $media_queries = array(
- '',
- 'not (orientation)',
- 'only (orientation)',
- 'all and not all',
- 'screen and (width: 0xx)',
- 'screen and (width: -8xx)',
- 'screen and (width: -xx)',
- 'screen and (width: xx)',
- 'screen and (width: px)',
- 'screen and (width: -8px)',
- 'screen and (width: -0.8px)',
- 'screen and (height: 0xx)',
- 'screen and (height: -8xx)',
- 'screen and (height: -xx)',
- 'screen and (height: xx)',
- 'screen and (height: px)',
- 'screen and (height: -8px)',
- 'screen and (height: -0.8px)',
- 'screen and (device-width: 0xx)',
- 'screen and (device-width: -8xx)',
- 'screen and (device-width: -xx)',
- 'screen and (device-width: xx)',
- 'screen and (device-width: px)',
- 'screen and (device-width: -8px)',
- 'screen and (device-width: -0.8px)',
- 'screen and (device-height: 0xx)',
- 'screen and (device-height: -8xx)',
- 'screen and (device-height: -xx)',
- 'screen and (device-height: xx)',
- 'screen and (device-height: px)',
- 'screen and (device-height: -8px)',
- 'screen and (device-height: -0.8px)',
- 'screen and (min-orientation)',
- 'screen and (max-orientation)',
- 'screen and (orientation: bogus)',
- '(orientation: bogus)',
- 'screen and (ori"entation: bogus)',
- );
-
- foreach ($media_queries as $media_query) {
- try {
- $this->assertFalse(Breakpoint::isValidMediaQuery($media_query), $media_query . ' is not valid.');
- }
- catch (InvalidBreakpointMediaQueryException $e) {
- $this->assertTrue(TRUE, sprintf('%s is not valid.', $media_query));
- }
- }
- }
-}
diff --git a/core/modules/breakpoint/tests/src/BreakpointTest.php b/core/modules/breakpoint/tests/src/BreakpointTest.php
new file mode 100644
index 0000000..a2b62ea
--- /dev/null
+++ b/core/modules/breakpoint/tests/src/BreakpointTest.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\breakpoint\Tests\BreakpointTest.
+ */
+
+namespace Drupal\breakpoint\Tests;
+
+use Drupal\breakpoint\Breakpoint;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\breakpoint\Breakpoint
+ * @group Breakpoint
+ */
+class BreakpointTest extends UnitTestCase {
+
+ /**
+ * The used plugin ID.
+ *
+ * @var string
+ */
+ protected $pluginId = 'breakpoint';
+
+ /**
+ * The used plugin definition.
+ *
+ * @var array
+ */
+ protected $pluginDefinition = array(
+ 'id' => 'breakpoint',
+ );
+
+ /**
+ * The breakpoint under test.
+ *
+ * @var \Drupal\breakpoint\Breakpoint
+ */
+ protected $breakpoint;
+
+ /**
+ * The mocked translator.
+ *
+ * @var \Drupal\Core\StringTranslation\TranslationInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $stringTranslation;
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this->stringTranslation = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
+ }
+
+ /**
+ * Sets up the breakpoint defaults.
+ */
+ protected function setupBreakpoint() {
+ $this->breakpoint = new Breakpoint(array(), $this->pluginId, $this->pluginDefinition);
+ $this->breakpoint->setStringTranslation($this->stringTranslation);
+ }
+
+ /**
+ * @covers ::getLabel
+ */
+ public function testGetLabel() {
+ $this->pluginDefinition['label'] = 'Test label';
+ $this->stringTranslation->expects($this->once())
+ ->method('translate')
+ ->with($this->pluginDefinition['label'], array(), array('context' => 'breakpoint'))
+ ->will($this->returnValue('Test label translated'));
+ $this->setupBreakpoint();
+ $this->assertEquals('Test label translated', $this->breakpoint->getLabel());
+ }
+
+ /**
+ * @covers ::getWeight
+ */
+ public function testGetWeight() {
+ $this->pluginDefinition['weight'] = '4';
+ $this->setupBreakpoint();
+ // Assert that the type returned in an integer.
+ $this->assertSame(4, $this->breakpoint->getWeight());
+ }
+
+ /**
+ * @covers ::getMediaQuery
+ */
+ public function testGetMediaQuery() {
+ $this->pluginDefinition['mediaQuery'] = 'only screen and (min-width: 3456px)';
+ $this->setupBreakpoint();
+ $this->assertEquals('only screen and (min-width: 3456px)', $this->breakpoint->getMediaQuery());
+ }
+
+ /**
+ * @covers ::getMultipliers
+ */
+ public function testGetMultipliers() {
+ $this->pluginDefinition['multipliers'] = array('1x', '2x');
+ $this->setupBreakpoint();
+ $this->assertSame(array('1x', '2x'), $this->breakpoint->getMultipliers());
+ }
+
+ /**
+ * @covers ::getProvider
+ */
+ public function testGetProvider() {
+ $this->pluginDefinition['provider'] = 'Breakpoint';
+ $this->setupBreakpoint();
+ $this->assertEquals('Breakpoint', $this->breakpoint->getProvider());
+ }
+
+ /**
+ * @covers ::getGroup
+ */
+ public function testGetGroup() {
+ $this->pluginDefinition['group'] = 'Breakpoint';
+ $this->setupBreakpoint();
+ $this->assertEquals('Breakpoint', $this->breakpoint->getGroup());
+ }
+
+}
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml
deleted file mode 100644
index 8e5e3c4..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: theme.breakpoint_test_theme.mobile
-name: mobile
-label: mobile
-mediaQuery: '(min-width: 0px)'
-source: breakpoint_test_theme
-sourceType: theme
-weight: 0
-multipliers:
- 1x: 1x
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml
deleted file mode 100644
index a34b582..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: theme.breakpoint_test_theme.narrow
-name: narrow
-label: narrow
-mediaQuery: '(min-width: 560px)'
-source: breakpoint_test_theme
-sourceType: theme
-weight: 1
-multipliers:
- 1x: 1x
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml
deleted file mode 100644
index d594ff4..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: theme.breakpoint_test_theme.tv
-name: tv
-label: tv
-mediaQuery: 'only screen and (min-width: 3456px)'
-source: breakpoint_test_theme
-sourceType: theme
-weight: 3
-multipliers:
- 1x: 1x
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml
deleted file mode 100644
index 34e5f4f..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: theme.breakpoint_test_theme.wide
-name: wide
-label: wide
-mediaQuery: '(min-width: 851px)'
-source: breakpoint_test_theme
-sourceType: theme
-weight: 2
-multipliers:
- 1x: 1x
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml
deleted file mode 100644
index c335fb0..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: theme.breakpoint_test_theme.breakpoint_test_theme
-name: breakpoint_test_theme
-label: 'Breakpoint test theme'
-breakpoint_ids:
- - theme.breakpoint_test_theme.mobile
- - theme.breakpoint_test_theme.narrow
- - theme.breakpoint_test_theme.wide
- - theme.breakpoint_test_theme.tv
-source: breakpoint_test_theme
-sourceType: theme
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml
deleted file mode 100644
index e074998..0000000
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: theme.breakpoint_test_theme.test
-name: test
-label: 'Test Theme'
-breakpoint_ids:
- - theme.breakpoint_test_theme.mobile
- - theme.breakpoint_test_theme.narrow
- - theme.breakpoint_test_theme.wide
-source: breakpoint_test_theme
-sourceType: theme
-status: true
-langcode: en
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
new file mode 100644
index 0000000..6d34ec7
--- /dev/null
+++ b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
@@ -0,0 +1,41 @@
+breakpoint_theme_test.mobile:
+ label: mobile
+ mediaQuery: '(min-width: 0px)'
+ weight: 0
+ multipliers:
+ - 1x
+breakpoint_theme_test.narrow:
+ label: narrow
+ mediaQuery: '(min-width: 560px)'
+ weight: 1
+ multipliers:
+ - 1x
+# Out of order breakpoint to test sorting.
+breakpoint_theme_test.tv:
+ label: tv
+ mediaQuery: 'only screen and (min-width: 3456px)'
+ weight: 3
+ multipliers:
+ - 1x
+breakpoint_theme_test.wide:
+ label: wide
+ mediaQuery: '(min-width: 851px)'
+ weight: 2
+ multipliers:
+ - 1x
+breakpoint_theme_test.group2.narrow:
+ label: narrow
+ mediaQuery: '(min-width: 560px)'
+ weight: 1
+ multipliers:
+ - 1x
+ - 2x
+ group: breakpoint_theme_test.group2
+breakpoint_theme_test.group2.wide:
+ label: wide
+ mediaQuery: '(min-width: 851px)'
+ weight: 2
+ multipliers:
+ - 1x
+ - 2x
+ group: breakpoint_theme_test.group2
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml
index 779f997..779f997 100644
--- a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml
+++ b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml