From d0872f58a55a64c4ce7b0d541feae40f9a0e74d9 Mon Sep 17 00:00:00 2001
From: Kunal Sachdev <57170-kunal.sachdev@users.noreply.drupalcode.org>
Date: Tue, 18 Apr 2023 15:28:08 +0000
Subject: [PATCH] Issue #3352355 by kunal.sachdev, omkar.podey: Rename test
modules to something more specific.
---
...tomaticUpdatesExtensionsKernelTestBase.php | 2 +-
... => package_manager_test_update.7.0.1.xml} | 70 +++++++++----------
.../aaa_package_manager_test.info.yml | 4 --
.../package_manager_test_update.info.yml | 4 ++
.../tests/src/Kernel/ProjectInfoTest.php | 20 +++---
.../Kernel/SupportedReleaseValidatorTest.php | 14 ++--
.../automatic_updates_test.info.yml | 2 +-
.../automatic_updates_test2.services.yml | 6 --
...atic_updates_test_status_checker.info.yml} | 2 +-
...c_updates_test_status_checker.services.yml | 6 ++
.../src/EventSubscriber/TestSubscriber2.php | 4 +-
tests/src/Functional/StatusCheckTest.php | 8 +--
.../Kernel/StatusCheck/StatusCheckerTest.php | 12 ++--
13 files changed, 77 insertions(+), 77 deletions(-)
rename package_manager/tests/fixtures/release-history/{aaa_package_manager_test.7.0.1.xml => package_manager_test_update.7.0.1.xml} (58%)
delete mode 100644 package_manager/tests/modules/aaa_package_manager_test/aaa_package_manager_test.info.yml
create mode 100644 package_manager/tests/modules/package_manager_test_update/package_manager_test_update.info.yml
delete mode 100644 tests/modules/automatic_updates_test2/automatic_updates_test2.services.yml
rename tests/modules/{automatic_updates_test2/automatic_updates_test2.info.yml => automatic_updates_test_status_checker/automatic_updates_test_status_checker.info.yml} (72%)
create mode 100644 tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.services.yml
rename tests/modules/{automatic_updates_test2 => automatic_updates_test_status_checker}/src/EventSubscriber/TestSubscriber2.php (75%)
diff --git a/automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php b/automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php
index c309d8a641..34c66b5fbe 100644
--- a/automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php
+++ b/automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php
@@ -63,7 +63,7 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
"type" => "drupal-module",
])
->addPackage([
- "name" => "drupal/aaa_package_manager_test",
+ "name" => "drupal/package_manager_test_update",
"version" => "1.0.0",
"type" => "drupal-module",
])->commitChanges();
diff --git a/package_manager/tests/fixtures/release-history/aaa_package_manager_test.7.0.1.xml b/package_manager/tests/fixtures/release-history/package_manager_test_update.7.0.1.xml
similarity index 58%
rename from package_manager/tests/fixtures/release-history/aaa_package_manager_test.7.0.1.xml
rename to package_manager/tests/fixtures/release-history/package_manager_test_update.7.0.1.xml
index fdd4605014..dd5c12a33a 100644
--- a/package_manager/tests/fixtures/release-history/aaa_package_manager_test.7.0.1.xml
+++ b/package_manager/tests/fixtures/release-history/package_manager_test_update.7.0.1.xml
@@ -4,7 +4,7 @@ This fixture is used by:
- \Drupal\Tests\package_manager\Kernel\SupportedReleaseValidatorTest
- \Drupal\Tests\package_manager\Kernel\ProjectInfoTest
-Contains metadata about the following (fake) releases of aaa_package_manager_test module, all of which are secure, in order:
+Contains metadata about the following (fake) releases of package_manager_test_update module, all of which are secure, in order:
- 7.0.1
- 7.0.0
- 7.0.0-alpha1
@@ -17,22 +17,22 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
- 8.x-5.x - An invalid release to ensure invalid releases do not affect processing other releases.
-->
<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>AAA</title>
-<short_name>aaa_package_manager_test</short_name>
-<dc:creator>AAA</dc:creator>
+<title>Package Manager Test Update</title>
+<short_name>package_manager_test_update</short_name>
+<dc:creator>Package Manager</dc:creator>
<supported_branches>7.0.,8.x-6.</supported_branches>
<project_status>published</project_status>
-<link>http://example.com/project/aaa_package_manager_test</link>
+<link>http://example.com/project/package_manager_test_update</link>
<terms>
- <term><name>Projects</name><value>AAA project</value></term>
+ <term><name>Projects</name><value>Package Manager Test Update project</value></term>
</terms>
<releases>
<release>
- <name>AAA 7.0.1</name>
+ <name>Package Manager Test Update 7.0.1</name>
<version>7.0.1</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-7-1-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-7-1.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-7-1-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-7-1.tar.gz</download_link>
<date>1250425521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -40,11 +40,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 7.0.0</name>
+ <name>Package Manager Test Update 7.0.0</name>
<version>7.0.0</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-7-0-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-7-0.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-7-0-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-7-0.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -52,11 +52,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 7.0.0-alpha1</name>
+ <name>Package Manager Test Update 7.0.0-alpha1</name>
<version>7.0.0-alpha1</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-7-0-alpha1-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-7-0-alpha1.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-7-0-alpha1-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-7-0-alpha1.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -64,11 +64,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-6.2</name>
+ <name>Package Manager Test Update 8.x-6.2</name>
<version>8.x-6.2</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-8-2-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-8-2.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-8-2-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-8-2.tar.gz</download_link>
<date>1250425521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -76,11 +76,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-6.1</name>
+ <name>Package Manager Test Update 8.x-6.1</name>
<version>8.x-6.1</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-8-1-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-8-1.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-8-1-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-8-1.tar.gz</download_link>
<date>1250425521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -88,11 +88,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-6.0</name>
+ <name>Package Manager Test Update 8.x-6.0</name>
<version>8.x-6.0</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-8-0-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-8-0.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-8-0-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-8-0.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -100,11 +100,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-6.0-alpha1</name>
+ <name>Package Manager Test Update 8.x-6.0-alpha1</name>
<version>8.x-6.0-alpha1</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-8-0-alpha1-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-8-0-alpha1.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-8-0-alpha1-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-8-0-alpha1.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -112,11 +112,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 7.0.0-dev</name>
+ <name>Package Manager Test Update 7.0.0-dev</name>
<version>7.0.x-dev</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-7-0-dev-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-7-0-dev.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-7-0-dev-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-7-0-dev.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -124,11 +124,11 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-6.x-dev</name>
+ <name>Package Manager Test Update 8.x-6.x-dev</name>
<version>8.x-6.x-dev</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-8-0-dev-release</release_link>
- <download_link>http://example.com/aaa_package_manager_test-9-8-0-dev.tar.gz</download_link>
+ <release_link>http://example.com/package_manager_test_update-9-8-0-dev-release</release_link>
+ <download_link>http://example.com/package_manager_test_update-9-8-0-dev.tar.gz</download_link>
<date>1250424521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
@@ -136,10 +136,10 @@ Contains metadata about the following (fake) releases of aaa_package_manager_tes
</terms>
</release>
<release>
- <name>AAA 8.x-5.x</name>
+ <name>Package Manager Test Update 8.x-5.x</name>
<version>8.x-5.x</version>
<status>published</status>
- <release_link>http://example.com/aaa_package_manager_test-9-5-0-dev-release</release_link>
+ <release_link>http://example.com/package_manager_test_update-9-5-0-dev-release</release_link>
<download_link/>
<date/>
<filesize/>
diff --git a/package_manager/tests/modules/aaa_package_manager_test/aaa_package_manager_test.info.yml b/package_manager/tests/modules/aaa_package_manager_test/aaa_package_manager_test.info.yml
deleted file mode 100644
index 79010053c9..0000000000
--- a/package_manager/tests/modules/aaa_package_manager_test/aaa_package_manager_test.info.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: AAA test module
-description: A module to test updates
-type: module
-package: Testing
diff --git a/package_manager/tests/modules/package_manager_test_update/package_manager_test_update.info.yml b/package_manager/tests/modules/package_manager_test_update/package_manager_test_update.info.yml
new file mode 100644
index 0000000000..c245910b78
--- /dev/null
+++ b/package_manager/tests/modules/package_manager_test_update/package_manager_test_update.info.yml
@@ -0,0 +1,4 @@
+name: 'Package Manager Test Update'
+description: 'A module to test updates'
+type: module
+package: Testing
diff --git a/package_manager/tests/src/Kernel/ProjectInfoTest.php b/package_manager/tests/src/Kernel/ProjectInfoTest.php
index 3dd465293a..d10f2f65a0 100644
--- a/package_manager/tests/src/Kernel/ProjectInfoTest.php
+++ b/package_manager/tests/src/Kernel/ProjectInfoTest.php
@@ -34,10 +34,10 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
}
else {
// Update the version and the project of the project.
- $this->enableModules(['aaa_package_manager_test']);
+ $this->enableModules(['package_manager_test_update']);
$extension_info_update = [
'version' => $installed_version,
- 'project' => 'aaa_package_manager_test',
+ 'project' => 'package_manager_test_update',
];
// @todo Replace with use of the trait from the Update module in https://drupal.org/i/3348234.
$this->config('update_test.settings')
@@ -104,22 +104,22 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
['9.8.2', '9.8.1', '9.8.1-beta1', '9.8.0-alpha1', '9.7.1'],
],
'contrib, semver and legacy' => [
- 'aaa_package_manager_test.7.0.1.xml',
+ 'package_manager_test_update.7.0.1.xml',
'8.x-6.0-alpha1',
['7.0.1', '7.0.0', '7.0.0-alpha1', '8.x-6.2', '8.x-6.1', '8.x-6.0'],
],
'contrib, semver and legacy, some lower' => [
- 'aaa_package_manager_test.7.0.1.xml',
+ 'package_manager_test_update.7.0.1.xml',
'8.x-6.1',
['7.0.1', '7.0.0', '7.0.0-alpha1', '8.x-6.2'],
],
'contrib, semver and legacy, on semantic dev' => [
- 'aaa_package_manager_test.7.0.1.xml',
+ 'package_manager_test_update.7.0.1.xml',
'7.0.x-dev',
['7.0.1', '7.0.0', '7.0.0-alpha1'],
],
'contrib, semver and legacy, on legacy dev' => [
- 'aaa_package_manager_test.7.0.1.xml',
+ 'package_manager_test_update.7.0.1.xml',
'8.x-6.x-dev',
['7.0.1', '7.0.0', '7.0.0-alpha1', '8.x-6.2', '8.x-6.1', '8.x-6.0', '8.x-6.0-alpha1'],
],
@@ -132,7 +132,7 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
public function testNewProject(): void {
$fixtures_directory = __DIR__ . '/../../fixtures/release-history/';
$metadata_fixtures['drupal'] = $fixtures_directory . 'drupal.9.8.2.xml';
- $metadata_fixtures['aaa_package_manager_test'] = $fixtures_directory . 'aaa_package_manager_test.7.0.1.xml';
+ $metadata_fixtures['package_manager_test_update'] = $fixtures_directory . 'package_manager_test_update.7.0.1.xml';
$this->setReleaseMetadata($metadata_fixtures);
$available = update_get_available(TRUE);
$this->assertSame(['drupal'], array_keys($available));
@@ -141,10 +141,10 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
// Set the state that the update module uses to store last checked time
// ensure our calls do not affect it.
$state->set('update.last_check', 123);
- $project_info = new ProjectInfo('aaa_package_manager_test');
+ $project_info = new ProjectInfo('package_manager_test_update');
$project_data = $project_info->getProjectInfo();
// Ensure the project information is correct.
- $this->assertSame('AAA', $project_data['title']);
+ $this->assertSame('Package Manager Test Update', $project_data['title']);
$all_releases = [
'7.0.1',
'7.0.0',
@@ -173,7 +173,7 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
$this->assertSame(123, $state->get('update.last_check'));
$this->assertTrue($this->failureLogger->hasRecordThatContains('Invalid project format: Array', (string) RfcLogLevel::ERROR));
- $this->assertTrue($this->failureLogger->hasRecordThatContains('[name] => AAA 8.x-5.x', (string) RfcLogLevel::ERROR));
+ $this->assertTrue($this->failureLogger->hasRecordThatContains('[name] => Package Manager Test Update 8.x-5.x', (string) RfcLogLevel::ERROR));
// Prevent the logged errors from causing failures during tear-down.
$this->failureLogger->reset();
}
diff --git a/package_manager/tests/src/Kernel/SupportedReleaseValidatorTest.php b/package_manager/tests/src/Kernel/SupportedReleaseValidatorTest.php
index 2c945982b2..6cf8701d5e 100644
--- a/package_manager/tests/src/Kernel/SupportedReleaseValidatorTest.php
+++ b/package_manager/tests/src/Kernel/SupportedReleaseValidatorTest.php
@@ -114,27 +114,27 @@ class SupportedReleaseValidatorTest extends PackageManagerKernelTestBase {
ValidationResult::createError([t('aaa_update_test (drupal/aaa_update_test) 3.0.0')], $summary),
],
],
- 'aaa_package_manager_test(not in active), update to unsupported branch' => [
+ 'package_manager_test_update(not in active), update to unsupported branch' => [
[
- 'aaa_package_manager_test' => "$release_fixture_folder/aaa_package_manager_test.7.0.1.xml",
+ 'package_manager_test_update' => "$release_fixture_folder/package_manager_test_update.7.0.1.xml",
],
FALSE,
[
- 'name' => "drupal/aaa_package_manager_test",
+ 'name' => "drupal/package_manager_test_update",
'version' => '7.0.1-dev',
'type' => 'drupal-module',
],
[
- ValidationResult::createError([t('aaa_package_manager_test (drupal/aaa_package_manager_test) 7.0.1-dev')], $summary),
+ ValidationResult::createError([t('package_manager_test_update (drupal/package_manager_test_update) 7.0.1-dev')], $summary),
],
],
- 'aaa_package_manager_test(not in active), update to supported branch' => [
+ 'package_manager_test_update(not in active), update to supported branch' => [
[
- 'aaa_package_manager_test' => "$release_fixture_folder/aaa_package_manager_test.7.0.1.xml",
+ 'package_manager_test_update' => "$release_fixture_folder/package_manager_test_update.7.0.1.xml",
],
FALSE,
[
- 'name' => "drupal/aaa_package_manager_test",
+ 'name' => "drupal/package_manager_test_update",
'version' => '7.0.1',
'type' => 'drupal-module',
],
diff --git a/tests/modules/automatic_updates_test/automatic_updates_test.info.yml b/tests/modules/automatic_updates_test/automatic_updates_test.info.yml
index 3cb26fcffb..29571f0617 100644
--- a/tests/modules/automatic_updates_test/automatic_updates_test.info.yml
+++ b/tests/modules/automatic_updates_test/automatic_updates_test.info.yml
@@ -1,4 +1,4 @@
-name: 'Automatic Updates Test module 1'
+name: 'Automatic Updates Test module'
type: module
description: 'Module for testing Automatic Updates.'
package: Testing
diff --git a/tests/modules/automatic_updates_test2/automatic_updates_test2.services.yml b/tests/modules/automatic_updates_test2/automatic_updates_test2.services.yml
deleted file mode 100644
index 1612f63d5e..0000000000
--- a/tests/modules/automatic_updates_test2/automatic_updates_test2.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
- automatic_updates_test2.checker:
- class: Drupal\automatic_updates_test2\EventSubscriber\TestSubscriber2
- tags:
- - { name: event_subscriber }
- arguments: ['@state']
diff --git a/tests/modules/automatic_updates_test2/automatic_updates_test2.info.yml b/tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.info.yml
similarity index 72%
rename from tests/modules/automatic_updates_test2/automatic_updates_test2.info.yml
rename to tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.info.yml
index 0df8da0b73..322b439b0f 100644
--- a/tests/modules/automatic_updates_test2/automatic_updates_test2.info.yml
+++ b/tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.info.yml
@@ -1,4 +1,4 @@
-name: 'Automatic Updates Test module 2'
+name: 'Automatic Updates Test Status Checker Provider'
type: module
description: 'Test module to provide an additional status checker.'
package: Testing
diff --git a/tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.services.yml b/tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.services.yml
new file mode 100644
index 0000000000..39adcf596b
--- /dev/null
+++ b/tests/modules/automatic_updates_test_status_checker/automatic_updates_test_status_checker.services.yml
@@ -0,0 +1,6 @@
+services:
+ automatic_updates_test_status_checker.checker:
+ class: Drupal\automatic_updates_test_status_checker\EventSubscriber\TestSubscriber2
+ tags:
+ - { name: event_subscriber }
+ arguments: ['@state']
diff --git a/tests/modules/automatic_updates_test2/src/EventSubscriber/TestSubscriber2.php b/tests/modules/automatic_updates_test_status_checker/src/EventSubscriber/TestSubscriber2.php
similarity index 75%
rename from tests/modules/automatic_updates_test2/src/EventSubscriber/TestSubscriber2.php
rename to tests/modules/automatic_updates_test_status_checker/src/EventSubscriber/TestSubscriber2.php
index 8a0ab81148..a2857173a7 100644
--- a/tests/modules/automatic_updates_test2/src/EventSubscriber/TestSubscriber2.php
+++ b/tests/modules/automatic_updates_test_status_checker/src/EventSubscriber/TestSubscriber2.php
@@ -2,7 +2,7 @@
declare(strict_types = 1);
-namespace Drupal\automatic_updates_test2\EventSubscriber;
+namespace Drupal\automatic_updates_test_status_checker\EventSubscriber;
use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
use Drupal\package_manager\Event\PreCreateEvent;
@@ -13,7 +13,7 @@ use Drupal\package_manager\Event\StatusCheckEvent;
*/
class TestSubscriber2 extends TestSubscriber1 {
- protected const STATE_KEY = 'automatic_updates_test2.checker_results';
+ protected const STATE_KEY = 'automatic_updates_test_status_checker.checker_results';
public static function getSubscribedEvents(): array {
$events[StatusCheckEvent::class][] = ['handleEvent', 4];
diff --git a/tests/src/Functional/StatusCheckTest.php b/tests/src/Functional/StatusCheckTest.php
index 2c9a8fe0b1..3f9fa4505a 100644
--- a/tests/src/Functional/StatusCheckTest.php
+++ b/tests/src/Functional/StatusCheckTest.php
@@ -9,7 +9,7 @@ use Drupal\automatic_updates\CronUpdateStage;
use Drupal\automatic_updates\StatusCheckMailer;
use Drupal\automatic_updates_test\Datetime\TestTime;
use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
-use Drupal\automatic_updates_test2\EventSubscriber\TestSubscriber2;
+use Drupal\automatic_updates_test_status_checker\EventSubscriber\TestSubscriber2;
use Drupal\Core\Url;
use Drupal\package_manager\Event\StatusCheckEvent;
use Drupal\package_manager\ValidationResult;
@@ -409,7 +409,7 @@ class StatusCheckTest extends AutomaticUpdatesFunctionalTestBase {
$expected_results = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
TestSubscriber2::setTestResult($expected_results, StatusCheckEvent::class);
- $this->container->get('module_installer')->install(['automatic_updates_test2']);
+ $this->container->get('module_installer')->install(['automatic_updates_test_status_checker']);
$this->drupalGet('admin/structure');
$assert->pageTextContainsOnce((string) $expected_results[0]->summary);
@@ -445,7 +445,7 @@ class StatusCheckTest extends AutomaticUpdatesFunctionalTestBase {
$this->container->get('module_installer')->install([
'automatic_updates',
'automatic_updates_test',
- 'automatic_updates_test2',
+ 'automatic_updates_test_status_checker',
]);
// Check for message on 'admin/structure' instead of the status report
// because checkers will be run if needed on the status report.
@@ -455,7 +455,7 @@ class StatusCheckTest extends AutomaticUpdatesFunctionalTestBase {
// Confirm that when on of the module is uninstalled the other module's
// checker result is still displayed.
- $this->container->get('module_installer')->uninstall(['automatic_updates_test2']);
+ $this->container->get('module_installer')->uninstall(['automatic_updates_test_status_checker']);
$this->drupalGet('admin/structure');
$assert->pageTextNotContains($expected_results_2[0]->summary);
$assert->pageTextContainsOnce($expected_results_1[0]->summary);
diff --git a/tests/src/Kernel/StatusCheck/StatusCheckerTest.php b/tests/src/Kernel/StatusCheck/StatusCheckerTest.php
index af083d22d6..0837b7108b 100644
--- a/tests/src/Kernel/StatusCheck/StatusCheckerTest.php
+++ b/tests/src/Kernel/StatusCheck/StatusCheckerTest.php
@@ -10,7 +10,7 @@ use Drupal\automatic_updates\Validation\StatusChecker;
use Drupal\automatic_updates\Validator\ScaffoldFilePermissionsValidator;
use Drupal\automatic_updates\Validator\StagedProjectsValidator;
use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
-use Drupal\automatic_updates_test2\EventSubscriber\TestSubscriber2;
+use Drupal\automatic_updates_test_status_checker\EventSubscriber\TestSubscriber2;
use Drupal\package_manager\Event\StatusCheckEvent;
use Drupal\system\SystemManager;
use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
@@ -52,7 +52,7 @@ class StatusCheckerTest extends AutomaticUpdatesKernelTestBase {
*/
public function testGetResults(): void {
$this->container->get('module_installer')
- ->install(['automatic_updates', 'automatic_updates_test2']);
+ ->install(['automatic_updates', 'automatic_updates_test_status_checker']);
$this->assertCheckerResultsFromManager([], TRUE);
$checker_1_expected = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
$checker_2_expected = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
@@ -118,7 +118,7 @@ class StatusCheckerTest extends AutomaticUpdatesKernelTestBase {
$checker_2_results = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
TestSubscriber1::setTestResult($checker_1_results, StatusCheckEvent::class);
TestSubscriber2::setTestResult($checker_2_results, StatusCheckEvent::class);
- $this->container->get('module_installer')->install(['automatic_updates_test2']);
+ $this->container->get('module_installer')->install(['automatic_updates_test_status_checker']);
$expected_results_all = array_merge($checker_1_results, $checker_2_results);
$this->assertCheckerResultsFromManager($expected_results_all);
@@ -143,7 +143,7 @@ class StatusCheckerTest extends AutomaticUpdatesKernelTestBase {
TestSubscriber2::setTestResult($checker_2_results, StatusCheckEvent::class);
// Confirm that messages from existing modules are displayed when
// 'automatic_updates' is installed.
- $this->container->get('module_installer')->install(['automatic_updates', 'automatic_updates_test2', 'help']);
+ $this->container->get('module_installer')->install(['automatic_updates', 'automatic_updates_test_status_checker', 'help']);
$expected_results_all = array_merge($checker_1_results, $checker_2_results);
$this->assertCheckerResultsFromManager($expected_results_all);
@@ -153,7 +153,7 @@ class StatusCheckerTest extends AutomaticUpdatesKernelTestBase {
$checker_2_results = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
TestSubscriber1::setTestResult($checker_1_results, StatusCheckEvent::class);
TestSubscriber2::setTestResult($checker_2_results, StatusCheckEvent::class);
- $this->container->get('module_installer')->uninstall(['automatic_updates_test2']);
+ $this->container->get('module_installer')->uninstall(['automatic_updates_test_status_checker']);
$this->assertCheckerResultsFromManager($checker_1_results);
// Confirm that the checkers are run when a module that does not provide a
@@ -171,7 +171,7 @@ class StatusCheckerTest extends AutomaticUpdatesKernelTestBase {
public function testRunIfNeeded(): void {
$expected_results = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
TestSubscriber1::setTestResult($expected_results, StatusCheckEvent::class);
- $this->container->get('module_installer')->install(['automatic_updates', 'automatic_updates_test2']);
+ $this->container->get('module_installer')->install(['automatic_updates', 'automatic_updates_test_status_checker']);
$this->assertCheckerResultsFromManager($expected_results);
$unexpected_results = [$this->createValidationResult(SystemManager::REQUIREMENT_ERROR)];
--
GitLab