Problem/Motivation

@xjm:

Also, we have a silly rule that requires function and class one-line summaries to start with a verb.

-- see the comment here

And found the following after committed, see #3103090: Avoid re-scaffolding unchanged files (and printing scaffold file information over and over)

+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
@@ -136,4 +127,29 @@ public function testComposerHooks() {
+   * Test to see if scaffold messages are omitted when running scaffold twice.
+   */
+  public function testScaffoldMessagesDoNotPrintTwice() {

Proposed resolution

There are many more to fix, but for this issue, just focus on replacing Test with Tests.

Remaining tasks

Needs followup for

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#76 reroll_diff_67-74.txt173.61 KBNeslee Canil Pinto
#74 3133162-74.patch394.73 KBNeslee Canil Pinto
#67 interdiff_63_67.txt5.3 KBanmolgoyal74
#67 3133162-67.patch395.99 KBanmolgoyal74
#63 3133162-63.patch395.95 KBjungle
#63 raw-interdiff-60-63.txt27.6 KBjungle
#60 3133162-60.patch396.04 KBravi.shankar
#59 interdiff_55-59.txt7.6 KBDeepak Goyal
#59 3133162-59.patch396.03 KBDeepak Goyal
#55 3133162-55.patch395.9 KBravi.shankar
#47 interdiff-46-47.txt12.32 KBjungle
#47 3133162-47.patch400.42 KBjungle
#46 interdiff-42-46.txt3.74 KBjungle
#46 3133162-46.patch405.72 KBjungle
#42 3133162-42.patch409.46 KBjungle
#42 interdiff-28-42.txt110.69 KBjungle
#31 interdiff-29-31.txt606 bytesjungle
#31 3133162-31.patch503.58 KBjungle
#29 raw-interdiff-23-28.txt1.18 KBjungle
#29 3133162-28.patch504.17 KBjungle
#23 interdiff-20-23.txt1.42 KBjungle
#23 3133162-8.8.x-23.patch534.27 KBjungle
#23 3133162-8.9.x-23.patch540.8 KBjungle
#23 3133162-9.x-23.patch504.19 KBjungle
#20 3133162-9.x-20.patch504.18 KBjungle
#20 3133162-8.9.x-20.patch540.8 KBjungle
#20 3133162-8.8.x-20.patch534.26 KBjungle
#19 interdiff-10-19.txt13.49 KBjungle
#19 3133162-8.9.x-19.patch540.55 KBjungle
#18 interdiff-10-18.txt13.49 KBjungle
#18 3133162-8.8.x-18.patch534.02 KBjungle
#17 3133162-9.x-17.patch503.94 KBjungle
#17 interdiff-8-17.txt13.51 KBjungle
#10 3133162-8.9.x-10.patch534.7 KBjungle
#10 3133162-8.8.x-10.patch528.16 KBjungle
#8 interdiff-7-8.txt3.74 KBjungle
#8 3133162-8.patch498.08 KBjungle
#7 3133162-7.patch494.63 KBjungle
#2 3133162-2.patch494.38 KBjungle

Issue fork drupal-3133162

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

jungle created an issue. See original summary.

jungle’s picture

The commands used:

find core/ -type f -name "*.php" -print0 | xargs -0 gsed -i -E ':a;N;$!ba;s|(\*\*\n\s+\* Test) |\1s |g'

jungle’s picture

Status: Active » Needs review
jungle’s picture

Two more things:

  1. Some comments exceed 80 chars, a part of them exceed 80 chars originally, the rest is because of the one more char s added. I think it's out of scope here to fix it. But maybe it's good to allow method comments of tests exceeding 80 chars. In general, it's just one line. Break them into summary + blank line + description is unnecessary
  2. As this is docs only fixes. IMHO, it's fine backporting it to all branches down to 8.8.x
jungle’s picture

Title: Replace the start verb Test with Tests in comments of tests » Replace the start verb Test with Tests in method comments of tests
jungle’s picture

Status: Needs review » Needs work

Ooops, patches failed to apply as the victims of #3126906: MenuLinkContentTest.php is recognized as a binary file by git

jungle’s picture

A new patch by using git diff --text

jungle’s picture

jungle’s picture

jungle’s picture

Patches for 8.8.x and 8.9.x

Kristen Pol’s picture

Assigned: Unassigned » Kristen Pol

Assigning to myself for review.

Kristen Pol’s picture

Assigned: Kristen Pol » Unassigned
Status: Needs review » Needs work

Thanks for the patch. Lots of changes!

IMO it's good to fix some formatting issues while doing this patch.

I explicitly looked for:

  • Changed Test => Tests.
  • Missing period at end of comment.
  • Text longer than 80 characters.
  • Text with "API's".

but didn't read each comment for clarity.

1) Changed Test => Tests:

Seemed ok.

2) Missing periods (not necessarily in order):

  1. +++ b/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
    @@ -65,7 +65,7 @@ public function testCachePerPage() {
       /**
    -   * Test the actual placeholders
    +   * Tests the actual placeholders
        */
    
  2. +++ b/core/modules/content_moderation/tests/src/Kernel/StateFormatterTest.php
    @@ -62,7 +62,7 @@ public function testStateFieldFormatter($field_value, $formatter_settings, $expe
       /**
    -   * Test cases for ::
    +   * Tests cases for ::
        */
    
  3. +++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php
    @@ -43,7 +43,7 @@ public function testPermissions($workflow, $permissions) {
       /**
    -   * Test cases for ::testPermissions
    +   * Tests cases for ::testPermissions
        *
    
  4. +++ b/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
    @@ -37,7 +37,7 @@ class FieldUIDeleteTest extends BrowserTestBase {
       /**
    -   * Test views to enable
    +   * Tests views to enable
        *
    
  5. +++ b/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
    @@ -124,7 +124,7 @@ public function testEntityDisplayCRUD() {
       /**
    -   * Test sorting of components by name on basic CRUD operations
    +   * Tests sorting of components by name on basic CRUD operations
        */
    
  6. +++ b/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php
    @@ -26,7 +26,7 @@ protected function setupVfsWithTestClasses() {
     /**
    - * Test description
    + * Tests description
    
  7. +++ b/core/modules/system/tests/modules/js_ajax_test/src/Form/JsAjaxTestForm.php
    @@ -8,7 +8,7 @@
    - * Test form for js_ajax_test
    + * Tests form for js_ajax_test
    
  8. +++ b/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
    @@ -94,7 +94,7 @@ public function testReversibility() {
       /**
    -   * Test the reversibility of structured data
    +   * Tests the reversibility of structured data
        */
    
  9. +++ b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
    @@ -9,14 +9,14 @@
     /**
    - * Test DrupalCoreRecommendedBuilder
    + * Tests DrupalCoreRecommendedBuilder
      *
    
  10. +++ b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
    @@ -9,14 +9,14 @@
       /**
    -   * Test data for testBuilder
    +   * Tests data for testBuilder
        */
    
  11. +++ b/core/tests/Drupal/Tests/Composer/Generator/MetapackageUpdateTest.php
    @@ -11,14 +11,14 @@
       /**
    -   * Test data for testUpdated
    +   * Tests data for testUpdated
        */
    
  12. +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultForbiddenTest.php
    @@ -28,7 +28,7 @@ public function testConstruction() {
       /**
    -   * Test setReason()
    +   * Tests setReason()
        *
    
  13. +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultNeutralTest.php
    @@ -27,7 +27,7 @@ public function testConstruction() {
       /**
    -   * Test setReason()
    +   * Tests setReason()
        *
    
  14. +++ b/core/tests/Drupal/Tests/Core/Common/AttributesTest.php
    @@ -57,7 +57,7 @@ public function testDrupalAttributes($attributes, $expected, $message) {
       /**
    -   * Test attribute iteration
    +   * Tests attribute iteration
        */
    
  15. +++ b/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
    @@ -12,7 +12,7 @@
       /**
    -   * Test for LogMessageParserTrait::parseMessagePlaceholders()
    +   * Tests for LogMessageParserTrait::parseMessagePlaceholders()
        *
    
  16. +++ b/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php
    @@ -305,7 +305,7 @@ protected function setupVfsWithTestClasses() {
     /**
    - * Test description
    + * Tests description
      * @group example
    

3) Text longer than 80 characters (not necessarily in order).

Note that some were already too long before the patch.

  1. +++ b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
    @@ -292,7 +292,7 @@ public function testBlockDelete() {
       /**
    -   * Test that placed content blocks create a dependency in the block placement.
    +   * Tests that placed content blocks create a dependency in the block placement.
        */
    
  2. +++ b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
    @@ -96,7 +96,7 @@ protected function createEntity() {
       /**
    -   * Test that comments correctly invalidate the cache tag of their host entity.
    +   * Tests that comments correctly invalidate the cache tag of their host entity.
        */
    
  3. +++ b/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
    @@ -7,7 +7,7 @@
     /**
    - * Test implementation of a config override that provides cacheability metadata.
    + * Tests implementation of a config override that provides cacheability metadata.
      */
    
  4. +++ b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
    @@ -8,7 +8,7 @@
     /**
    - * Test implementation of a config override that provides cacheability metadata.
    + * Tests implementation of a config override that provides cacheability metadata.
      */
    
  5. +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
    @@ -635,7 +635,7 @@ public function testViewsTranslationUI() {
       /**
    -   * Test the number of source elements for plural strings in config translation forms.
    +   * Tests the number of source elements for plural strings in config translation forms.
        */
    
  6. +++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
    @@ -138,7 +138,7 @@ public function testInvalidState() {
       /**
    -   * Test validation with content that has no initial state or an invalid state.
    +   * Tests validation with content that has no initial state or an invalid state.
        */
    
  7. +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php
    @@ -58,7 +58,7 @@ protected function setUp() {
       /**
    -   * Test access to private files added via inline blocks in the layout builder.
    +   * Tests access to private files added via inline blocks in the layout builder.
    
  8. +++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
    @@ -521,7 +521,7 @@ public function testRevisionTranslationRendering() {
       /**
    -   * Test that title is not escaped (but XSS-filtered) for details form element.
    +   * Tests that title is not escaped (but XSS-filtered) for details form element.
        */
    
  9. +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
    @@ -7,7 +7,7 @@
     /**
    - * Test migrating node settings into the base_field_bundle_override config entity.
    + * Tests migrating node settings into the base_field_bundle_override config entity.
      *
    
  10. +++ b/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
    @@ -86,7 +86,7 @@ public function testNonDefaultUrl() {
       /**
    -   * Test that language unspecific aliases are shown and saved in the node form.
    +   * Tests that language unspecific aliases are shown and saved in the node form.
        */
    
  11. +++ b/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
    @@ -50,7 +50,7 @@ public function testDatatype() {
       /**
    -   * Test attribute creation for mappings which override human-readable content.
    +   * Tests attribute creation for mappings which override human-readable content.
        */
    
  12. +++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
    @@ -42,7 +42,7 @@ protected function setUp() {
       /**
    -   * Test  blocks with overridden related configuration removed when overridden.
    +   * Tests  blocks with overridden related configuration removed when overridden.
        */
    
  13. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -147,7 +147,7 @@ public function testAdvancedSelect() {
       /**
    -   * Test the whether the option checker gives an error on invalid tableselect values for checkboxes.
    +   * Tests the whether the option checker gives an error on invalid tableselect values for checkboxes.
        */
    
  14. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -170,7 +170,7 @@ public function testMultipleTrueOptionchecker() {
       /**
    -   * Test the whether the option checker gives an error on invalid tableselect values for radios.
    +   * Tests the whether the option checker gives an error on invalid tableselect values for radios.
        */
    
  15. +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
    @@ -316,7 +316,7 @@ protected function doTestThemeCallbackOptionalTheme() {
       /**
    -   * Test the theme negotiation when it is set to use a theme that does not exist.
    +   * Tests the theme negotiation when it is set to use a theme that does not exist.
        */
    
  16. +++ b/core/modules/system/tests/src/Functional/Pager/PagerTest.php
    @@ -79,7 +79,7 @@ public function testActiveClass() {
       /**
    -   * Test proper functioning of the query parameters and the pager cache context.
    +   * Tests proper functioning of the query parameters and the pager cache context.
        */
    
  17. +++ b/core/modules/user/tests/src/Functional/UserLoginTest.php
    @@ -112,7 +112,7 @@ public function testPerUserLoginFloodControl() {
       /**
    -   * Test that user password is re-hashed upon login after changing $count_log2.
    +   * Tests that user password is re-hashed upon login after changing $count_log2.
        */
    
  18. +++ b/core/modules/user/tests/src/Functional/UserSubAdminTest.php
    @@ -5,7 +5,7 @@
     /**
    - * Test 'sub-admin' account with permission to edit some users but without 'administer users' permission.
    + * Tests 'sub-admin' account with permission to edit some users but without 'administer users' permission.
      *
    
  19. +++ b/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
    @@ -158,7 +158,7 @@ public function testMultipleStatements() {
       /**
    -   * Test the escapeTable(), escapeField() and escapeAlias() methods with all possible reserved words in PostgreSQL.
    +   * Tests the escapeTable(), escapeField() and escapeAlias() methods with all possible reserved words in PostgreSQL.
        */
    
  20. +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
    @@ -93,7 +93,7 @@ public function testConditionSubquerySelect() {
       /**
    -   * Test that we can use a subquery with a relational operator in a WHERE clause.
    +   * Tests that we can use a subquery with a relational operator in a WHERE clause.
        */
    
  21. +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
    @@ -114,7 +114,7 @@ public function testConditionSubquerySelect2() {
       /**
    -   * Test that we can use 2 subqueries with a relational operator in a WHERE clause.
    +   * Tests that we can use 2 subqueries with a relational operator in a WHERE clause.
        */
    
  22. +++ b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
    @@ -192,7 +192,7 @@ public function testGetMultipleHasPropagated() {
       /**
    -   * Test that the delete all operation is propagated to all backends in the chain.
    +   * Tests that the delete all operation is propagated to all backends in the chain.
        */
    
  23. +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
    @@ -449,7 +449,7 @@ public function testBaseURLGeneration() {
       /**
    -   * Test that the 'scheme' route requirement is respected during url generation.
    +   * Tests that the 'scheme' route requirement is respected during url generation.
        */
    

4) Text with "API's"

Should change API's to APIs.

  1. +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
    @@ -39,7 +39,7 @@ protected function assertComponentNotExists($display_id, $component_id) {
    -   * Test that migrated entity display settings can be loaded using D8 API's.
    +   * Tests that migrated entity display settings can be loaded using D8 API's.
    
  2. +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
    @@ -26,7 +26,7 @@ protected function setUp() {
    -   * Test that migrated view modes can be loaded using D8 API's.
    +   * Tests that migrated view modes can be loaded using D8 API's.
    
jungle’s picture

IS:

There are many more to fix, but for this issue, just focus on replacing Test with Tests.

#4;
Some comments exceed 80 chars, a part of them exceed 80 chars originally, the rest is because of the one more char s added. I think it's out of scope here to fix it. But maybe it's good to allow method comments of tests exceeding 80 chars. In general, it's just one line. Break them into summary + blank line + description is unnecessary

@Kristen Pol, thanKKK you so much!

I'd like this issue to have one scope, that replacing Test with Tests. -- 1) Changed Test => Tests:

For the following your pointed, I'd suggest doing in separate issue(s).

  • 2) Missing periods (not necessarily in order):
  • 3) Text longer than 80 characters (not necessarily in order).
  • 4) Text with "API's"
xjm’s picture

I agree with the scope outlined in #13. The only exception would be if adding the silly s bumps a one-line summary that's exactly 80 chars to 81; then we would need to reword it to get it back under.

Thanks!

Kristen Pol’s picture

Assigned: Unassigned » Kristen Pol

Ok, sounds good. Let me assign it back to me to identify just the ones that bump it one character for now.

Kristen Pol’s picture

Assigned: Kristen Pol » Unassigned

Here are the ones that need adjusting due to being bumped by one character. Hopefully I found them all!

  1. +++ b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
    @@ -292,7 +292,7 @@ public function testBlockDelete() {
       /**
    -   * Test that placed content blocks create a dependency in the block placement.
    +   * Tests that placed content blocks create a dependency in the block placement.
        */
    

    Possible rewording:

    Tests placed content blocks create a dependency in the block placement.

  2. +++ b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
    @@ -96,7 +96,7 @@ protected function createEntity() {
       /**
    -   * Test that comments correctly invalidate the cache tag of their host entity.
    +   * Tests that comments correctly invalidate the cache tag of their host entity.
        */
    

    Possible rewording:

    Tests comments correctly invalidate the cache tag of their host entity.

  3. +++ b/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
    @@ -7,7 +7,7 @@
     /**
    - * Test implementation of a config override that provides cacheability metadata.
    + * Tests implementation of a config override that provides cacheability metadata.
      */
    

    Possible rewording:

    Tests config override that provides cacheability metadata.

  4. +++ b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
    @@ -8,7 +8,7 @@
     /**
    - * Test implementation of a config override that provides cacheability metadata.
    + * Tests implementation of a config override that provides cacheability metadata.
      */
    

    Same as above.

  5. +++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
    @@ -138,7 +138,7 @@ public function testInvalidState() {
       /**
    -   * Test validation with content that has no initial state or an invalid state.
    +   * Tests validation with content that has no initial state or an invalid state.
        */
    

    Possible rewording:

    Since the previous test uses "Test validation with an invalid state." then this could be:

    Tests validation with no initial state or an invalid state.

  6. +++ b/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
    @@ -42,7 +42,7 @@ public function testTransformLimit() {
       /**
    -   * Test if the explode process can be chained with a handles_multiple process.
    +   * Tests if the explode process can be chained with a handles_multiple process.
        */
    

    Possible rewording:

    Tests chaining of the explode process with a handles_multiple process.

  7. +++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
    @@ -521,7 +521,7 @@ public function testRevisionTranslationRendering() {
       /**
    -   * Test that title is not escaped (but XSS-filtered) for details form element.
    +   * Tests that title is not escaped (but XSS-filtered) for details form element.
        */
    

    Possible rewording:

    Tests title is not escaped (but XSS-filtered) for the details form element.

  8. +++ b/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
    @@ -86,7 +86,7 @@ public function testNonDefaultUrl() {
       /**
    -   * Test that language unspecific aliases are shown and saved in the node form.
    +   * Tests that language unspecific aliases are shown and saved in the node form.
        */
    

    Possible rewording:

    Tests language unspecific aliases are shown and saved in the node form.

  9. +++ b/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
    @@ -50,7 +50,7 @@ public function testDatatype() {
       /**
    -   * Test attribute creation for mappings which override human-readable content.
    +   * Tests attribute creation for mappings which override human-readable content.
        */
    

    Possible rewording:

    Tests attribute creation for mappings that override human-readable content.

  10. +++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
    @@ -42,7 +42,7 @@ protected function setUp() {
       /**
    -   * Test  blocks with overridden related configuration removed when overridden.
    +   * Tests  blocks with overridden related configuration removed when overridden.
        */
    

    Possible rewording (remove extra space between "Tests" and "blocks").

    Tests blocks with overridden related configuration removed when overridden.

  11. +++ b/core/modules/user/tests/src/Functional/UserLoginTest.php
    @@ -112,7 +112,7 @@ public function testPerUserLoginFloodControl() {
       /**
    -   * Test that user password is re-hashed upon login after changing $count_log2.
    +   * Tests that user password is re-hashed upon login after changing $count_log2.
        */
    

    Possible rewording:

    Tests user password is re-hashed upon login after changing $count_log2.

jungle’s picture

Thanks @xjm for confirming the scope, and thanks you @Kristen Pol for your review and suggestions!

Found more with regex: \s{3}\*\s{1}Tests.{70}\.

Explaination of the regex: 3 spaces + 1 * char + 1 space + Tests (5 chars) + 70 any chars + 1 fullstop = 81 chars.

jungle’s picture

A patch for 8.8.x

jungle’s picture

Status: Needs work » Needs review
FileSize
540.55 KB
13.49 KB

A patch for 8.9.x.

jungle’s picture

Kristen Pol’s picture

Assigned: Unassigned » Kristen Pol

Assigning to myself to review.

Kristen Pol’s picture

Assigned: Kristen Pol » Unassigned
Status: Needs review » Needs work

Thanks for the updates and for finding more that needed fixing.

1) Reviewed the interdiff from #17.

  1. +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php
    @@ -58,7 +58,7 @@ protected function setUp(): void {
    -   * Tests access to private files added via inline blocks in the layout builder.
    +   * Tests access to inline blocks added private files in the layout builder.
    

    IMO this isn't clear. How about:

    Tests access to private files added to inline blocks in the layout builder.

  2. +++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
    @@ -69,7 +69,7 @@ public function testMissingModules() {
    -   * Tests enabling a module that depends on an incompatible version of a module.
    +   * Tests enabling a module depends on an incompatible version of a module.
    

    IMO this isn't clear. How about:

    Tests enabling a module that depends on incompatible version of a module.

2) Compared interdiff-8-17.txt, interdiff-8-18.txt, and interdiff-8-19.txt and they are equivalent.

3) Back to "Needs work" based on #1.

jungle’s picture

Kristen Pol’s picture

Thanks for the update.

1) The changes in #23 interdiff look good.

2) Should there be a 9.0 patch explicitly added?

3) Patches applied cleanly to drupal-8.8.x-dev, drupal-8.9.x-dev, drupal-9.0.x-dev (had offsets), and drupal-9.1.x-dev.

4) Waiting for tests to pass :)

5) Looks RTBC if tests pass. Thanks!

jungle’s picture

@Kristen Pol, thank you, I think it's unnecessary to have a 9.0.x patch explicitly. I made the 9.x patch against 9.1.x, the committer can cheery-pick from 9.1.x to 9.0.x. But I am happy to reroll a 9.0.x patch if it's necessary.

Kristen Pol’s picture

Status: Needs review » Reviewed & tested by the community

Sounds good. Tests have pass so marking RTBC. Thanks!

xjm’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll, +Avoid commit conflicts

Oops, the 9.1.x patch fails to apply already with:

error: patch failed: core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php:41
error: core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php: patch does not apply

So it needs a reroll already... that might happen a lot as we work on this. I't suggest focusing on the 9.x patch until we get that in, then addressing 8.x once we've managed to get it committed.

xjm’s picture

Reviewed all the changes as far as path.module, just found this so far:

+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
@@ -7,7 +7,7 @@
- * Test class for a complete node migration for Drupal 6.
+ * Tests class for a complete node migration for Drupal 6.

+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
@@ -10,7 +10,7 @@
- * Test class for a complete node migration for Drupal 7.
+ * Tests class for a complete node migration for Drupal 7.

I'm not sure this one works with Tests as written, because I think "test class" was a noun in the sentence before. How about:

Tests a complete node migration for Drupal 6.

Can we double-check that that reflects what the test does? Ditto the D7 version.

jungle’s picture

Status: Needs work » Needs review
FileSize
504.17 KB
1.18 KB

Thanks @xjm.

A patch for 9.x.

Rejected file: core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php.

p       (rejected hunks)
@@ -41,7 +41,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Test upgrading the Composer Scaffold plugin.
+   * Tests upgrading the Composer Scaffold plugin.
    */
   public function testScaffoldUpgrade() {
     $this->fixturesDir = $this->fixtures->tmpDir($this->getName());
xjm’s picture

Status: Needs review » Needs work
+++ b/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
@@ -38,7 +38,7 @@ abstract class FileUploadResourceTestBase extends ResourceTestBase {
-   * Test file data.
+   * Tests file data.
    *
    * @var string

This isn't a docblock for a method; it's a docblock for a member property that contains the data of the test file. So this one should be removed from the patch.

jungle’s picture

Status: Needs work » Needs review
FileSize
503.58 KB
606 bytes

Nice catch! Thanks!

xjm’s picture

Status: Needs review » Needs work
+++ b/core/modules/block_content/tests/src/Kernel/BlockContentEntityReferenceSelectionTest.php
@@ -35,28 +35,28 @@ class BlockContentEntityReferenceSelectionTest extends KernelTestBase {
   /**
-   * Test reusable block.
+   * Tests reusable block.
    *
    * @var \Drupal\block_content\BlockContentInterface
    */
   protected $blockReusable;
 
   /**
-   * Test non-reusable block.
+   * Tests non-reusable block.
    *
    * @var \Drupal\block_content\BlockContentInterface
    */
   protected $blockNonReusable;
 
   /**
-   * Test selection handler.
+   * Tests selection handler.
    *
    * @var \Drupal\block_content_test\Plugin\EntityReferenceSelection\TestSelection
    */
   protected $selectionHandler;
 
   /**
-   * Test block expectations.
+   * Tests block expectations.
    *

All these are member properties too and also should be reverted. (Sorry, still haven't gotten through the whole thing.)

jungle’s picture

Status: Needs work » Needs review
jungle’s picture

Status: Needs review » Needs work

Ooops, cross-posting. sorry

jungle’s picture

/**
* Test administration path based conversion of entities.
* Tests administration path based conversion of entities.
*
* @group language
*/
class AdminPathEntityConverterLanguageTest

Self-reviewing! Changes to classes should be reverted too. in progress!

xjm’s picture

  1. +++ b/core/modules/field/tests/src/Kernel/FieldDisplayTest.php
    @@ -28,21 +28,21 @@ class FieldDisplayTest extends KernelTestBase {
     
       /**
    -   * Test entity type name.
    +   * Tests entity type name.
        *
        * @var string
        */
       protected $entityType;
     
       /**
    -   * Test entity bundle name.
    +   * Tests entity bundle name.
        *
        * @var string
        */
       protected $bundle;
     
       /**
    -   * Test field name.
    +   * Tests field name.
        *
        * @var string
    

    More properties here.

  2. +++ b/core/modules/field/tests/src/Kernel/Views/HandlerFieldFieldTest.php
    @@ -48,14 +48,14 @@ class HandlerFieldFieldTest extends KernelTestBase {
    -   * Test nodes.
    +   * Tests nodes.
        *
        * @var \Drupal\node\NodeInterface[]
        */
    

    And this one.

  3. +++ b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
    @@ -54,7 +54,7 @@ class FileUploadTest extends ResourceTestBase {
    -   * Test file data.
    +   * Tests file data.
        *
        * @var string
    

    And this one.

  4. +++ b/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTestBase.php
    @@ -48,35 +48,35 @@ abstract class JsonApiFunctionalTestBase extends BrowserTestBase {
       /**
    -   * Test user.
    +   * Tests user.
        *
        * @var \Drupal\user\Entity\User
        */
       protected $user;
     
       /**
    -   * Test user with access to view profiles.
    +   * Tests user with access to view profiles.
        *
        * @var \Drupal\user\Entity\User
        */
       protected $userCanViewProfiles;
     
       /**
    -   * Test nodes.
    +   * Tests nodes.
        *
        * @var \Drupal\node\Entity\Node[]
        */
       protected $nodes = [];
     
       /**
    -   * Test taxonomy terms.
    +   * Tests taxonomy terms.
        *
        * @var \Drupal\taxonomy\Entity\Term[]
        */
       protected $tags = [];
     
       /**
    -   * Test files.
    +   * Tests files.
        *
        * @var \Drupal\file\Entity\File[]
    

    Also all fixtures.

xjm’s picture

  1. +++ b/core/modules/search/tests/src/Functional/SearchCommentTest.php
    @@ -32,7 +32,7 @@ class SearchCommentTest extends BrowserTestBase {
       /**
    -   * Test subject for comments.
    +   * Tests subject for comments.
        *
        * @var string
        */
    @@ -53,7 +53,7 @@ class SearchCommentTest extends BrowserTestBase {
    
    @@ -53,7 +53,7 @@ class SearchCommentTest extends BrowserTestBase {
       protected $adminUser;
     
       /**
    -   * Test node for searching.
    +   * Tests node for searching.
        *
        * @var \Drupal\node\NodeInterface
        */
    

    More properties.

  2. +++ b/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
    @@ -22,7 +22,7 @@ class SearchPreprocessLangcodeTest extends BrowserTestBase {
       /**
    -   * Test node for searching.
    +   * Tests node for searching.
        *
        * @var \Drupal\node\NodeInterface
        */
    

    This one too.

  3. +++ b/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php
    @@ -21,7 +21,7 @@ class ComplexDataNormalizerTest extends UnitTestCase {
       /**
    -   * Test format string.
    +   * Tests format string.
        *
        * @var string
        */
    

    And this.

  4. +++ b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
    @@ -64,7 +64,7 @@ public function providerTestSupportsNormalization() {
    - * Test class for NormalizerBase.
    + * Tests class for NormalizerBase.
    

    Here also "Test class" was a noun; I suggest switching to:

    Provides a base test class for NormalizerBase.

  5. +++ b/core/modules/system/tests/modules/conneg_test/src/Controller/TestController.php
    @@ -7,7 +7,7 @@
    - * Test controller for content negotiation tests.
    + * Tests controller for content negotiation tests.
    

    Another one where it's "test controller" as a noun to describe a fixture... So change it to:

    Provides a test controller for content negotiation tests.

  6. +++ b/core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php
    @@ -5,7 +5,7 @@
    - * Test controller display modal links and content.
    + * Tests controller display modal links and content.
      */
    

    Another fixture...

    Provides a test controller that displays modal links and content.

    (?) Look at what the thing actually does and describe it; I don't understand what's there.

  7. +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php
    @@ -3,7 +3,7 @@
     /**
    - * Test entity class.
    + * Tests entity class.
    

    Another fixture. This one should be:

    Provides a test entity class.

...Dreditor pasted that accidentally so saving it so it's not lost; there's some more fixtures with the issue right after...

xjm’s picture

  1. +++ b/core/modules/content_moderation/tests/src/Functional/ModerationActionsTest.php
    @@ -98,7 +98,7 @@ public function testNodeStatusActions($action, $bundle, $warning_appears, $start
    -   * Test cases for ::testNodeStatusActions.
    +   * Tests cases for ::testNodeStatusActions.
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php
    @@ -43,7 +43,7 @@ public function testPermissions($workflow, $permissions) {
    -   * Test cases for ::testPermissions
    +   * Tests cases for ::testPermissions
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
    @@ -149,7 +149,7 @@ public function testBasicModeration($entity_type_id) {
    -   * Test cases for basic moderation test.
    +   * Tests cases for basic moderation test.
    
    @@ -457,7 +457,7 @@ public function testModerationWithSpecialLanguages($original_language, $updated_
    -   * Test cases for ::testModerationWithSpecialLanguages().
    +   * Tests cases for ::testModerationWithSpecialLanguages().
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
    @@ -355,7 +355,7 @@ public function testTransitionAccessValidation($permissions, $target_state, $mes
    -   * Test cases for ::testTransitionAccessValidation.
    +   * Tests cases for ::testTransitionAccessValidation.
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/ModerationInformationTest.php
    @@ -95,7 +95,7 @@ public function testIsDefaultRevisionPublished($initial_state, $final_state, $in
    -   * Test cases for ::testIsDefaultRevisionPublished.
    +   * Tests cases for ::testIsDefaultRevisionPublished.
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
    @@ -289,7 +289,7 @@ public function testEntityUnserialize($state, $default, $published) {
    -   * Test cases for ::testEntityUnserialize.
    +   * Tests cases for ::testEntityUnserialize.
    
    @@ -323,7 +323,7 @@ public function testModeratedEntityWithExistingId($state) {
    -   * Test cases for ::testModeratedEntityWithExistingId.
    +   * Tests cases for ::testModeratedEntityWithExistingId.
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/StateFormatterTest.php
    @@ -62,7 +62,7 @@ public function testStateFieldFormatter($field_value, $formatter_settings, $expe
    -   * Test cases for ::
    +   * Tests cases for ::
    
    +++ b/core/modules/content_moderation/tests/src/Kernel/WorkspacesContentModerationStateTest.php
    @@ -142,7 +142,7 @@ public function testContentModerationIntegrationWithWorkspaces() {
    -   * Test cases for basic moderation test.
    +   * Tests cases for basic moderation test.
    
    +++ b/core/modules/workflows/tests/src/Unit/WorkflowStateTransitionOperationsAccessCheckTest.php
    @@ -46,7 +46,7 @@ public function testAccess($route_requirement, $resulting_entity_access_check, $
    -   * Test cases for ::testAccess.
    +   * Tests cases for ::testAccess.
    
    @@ -136,7 +136,7 @@ public function testInvalidOperationName($operation_name) {
    -   * Test cases for ::testInvalidOperationName.
    +   * Tests cases for ::testInvalidOperationName.
    
    +++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
    @@ -45,7 +45,7 @@ protected function setUp(): void {
    -   * Test cases for testWorkspaceAccess().
    +   * Tests cases for testWorkspaceAccess().
    
    +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
    @@ -622,7 +622,7 @@ public function testBaseFieldDeleteWithExistingData($entity_type_id, $create_ent
    -   * Test cases for ::testBaseFieldDeleteWithExistingData.
    +   * Tests cases for ::testBaseFieldDeleteWithExistingData.
    
    @@ -1230,7 +1230,7 @@ public function testInitialValueFromField($default_initial_value, $expected_valu
    -   * Test cases for ::testInitialValueFromField.
    +   * Tests cases for ::testInitialValueFromField.
    
    +++ b/core/tests/Drupal/KernelTests/Core/Field/Entity/BaseFieldOverrideTest.php
    @@ -50,7 +50,7 @@ public function testGetClass($field_type, $base_field_class, $expected_override_
    -   * Test cases for ::testGetClass.
    +   * Tests cases for ::testGetClass.
    
    +++ b/core/tests/Drupal/Tests/Core/Field/FieldInputValueNormalizerTraitTest.php
    @@ -22,7 +22,7 @@ public function testKeyValueByDelta($input_value, $expected_value, $main_propert
    -   * Test cases for ::testKeyValueByDelta.
    +   * Tests cases for ::testKeyValueByDelta.
    

    These are a little subtle but they're data providers -- they're not testing cases, they're providing test cases. So:

    Provides test cases for...

  2. +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php
    @@ -3,7 +3,7 @@
    - * Test entity class with no bundle.
    + * Tests entity class with no bundle.
    
    +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoId.php
    @@ -3,7 +3,7 @@
    - * Test entity class.
    + * Tests entity class.
    
    +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php
    @@ -3,7 +3,7 @@
    - * Test entity class.
    + * Tests entity class.
      *
    
    +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoUuid.php
    @@ -3,7 +3,7 @@
    - * Test entity class with revisions but without UUIDs.
    + * Tests entity class with revisions but without UUIDs.
    
    +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
    @@ -3,7 +3,7 @@
    - * Test entity class for testing a view builder.
    + * Tests entity class for testing a view builder.
    
    +++ b/core/modules/system/tests/modules/entity_test/src/EntityTestDefinitionSubscriber.php
    @@ -17,7 +17,7 @@
    - * Test entity type and field storage definition event subscriber.
    + * Tests entity type and field storage definition event subscriber.
    
    +++ b/core/modules/system/tests/modules/entity_test/src/EntityTestNoLoadStorage.php
    @@ -6,7 +6,7 @@
    - * Test storage class used to verify that no load operation is triggered.
    + * Tests storage class used to verify that no load operation is triggered.
    

    Lots more fixtures. All these can read "Provides a test... [rest of the words from the docblock]".

  3. +++ b/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
    @@ -8,7 +8,7 @@
    - * Test event subscriber to add new attributes to the request.
    + * Tests event subscriber to add new attributes to the request.
    

    Another fixture.

    Provides a test event subscriber to...

  4. +++ b/core/modules/system/tests/modules/js_ajax_test/src/Ajax/JsAjaxTestCommand.php
    @@ -5,7 +5,7 @@
    - * Test Ajax command.
    + * Tests Ajax command.
    
    +++ b/core/modules/system/tests/modules/js_ajax_test/src/Form/JsAjaxTestForm.php
    @@ -8,7 +8,7 @@
    - * Test form for js_ajax_test
    + * Tests form for js_ajax_test
    
    +++ b/core/modules/system/tests/modules/js_cookie_test/src/Controller/JsCookieTestController.php
    @@ -5,7 +5,7 @@
    - * Test controller to assert js-cookie library integration.
    + * Tests controller to assert js-cookie library integration.
    
    +++ b/core/modules/system/tests/modules/js_deprecation_test/src/Controller/JsDeprecationTestController.php
    @@ -3,7 +3,7 @@
    - * Test Controller to show message links.
    + * Tests Controller to show message links.
    
    +++ b/core/modules/system/tests/modules/js_message_test/src/Controller/JSMessageTestController.php
    @@ -3,7 +3,7 @@
    - * Test Controller to show message links.
    + * Tests Controller to show message links.
    
    +++ b/core/modules/system/tests/modules/js_webassert_test/src/Form/JsWebAssertTestForm.php
    @@ -7,7 +7,7 @@
    - * Test form for JSWebAssert WebDriverTestBase.
    + * Tests form for JSWebAssert WebDriverTestBase.
    

    All fixtures. "Provides a..."

  5. +++ b/core/modules/system/tests/modules/module_test/module_test.post_update.php
    @@ -6,7 +6,7 @@
    - * Test post update function.
    + * Tests post update function.
    
    +++ b/core/modules/system/tests/modules/off_canvas_test/src/Controller/TestController.php
    @@ -6,7 +6,7 @@
    - * Test controller for 2 different responses.
    + * Tests controller for 2 different responses.
    
    +++ b/core/modules/system/tests/modules/router_test_directory/src/TestContent.php
    @@ -9,7 +9,7 @@
    - * Test controllers that are intended to be wrapped in a main controller.
    + * Tests controllers that are intended to be wrapped in a main controller.
    
    +++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
    @@ -65,7 +65,7 @@ public function test9($uid) {
    -   * Test controller for ExceptionHandlingTest::testBacktraceEscaping().
    +   * Tests controller for ExceptionHandlingTest::testBacktraceEscaping().
    
    +++ b/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
    @@ -5,7 +5,7 @@
    - * Test session container.
    + * Tests session container.
    

    Also fixtures. "Provides a..."

  6. +++ b/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
    @@ -24,7 +24,7 @@ class DrupalDateTimeTest extends BrowserTestBase {
    -   * Test setup.
    +   * Tests setup.
    

    This should actually just be {@inheritdoc}

  7. +++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
    @@ -40,7 +40,7 @@ class BreadcrumbTest extends BrowserTestBase {
       /**
    -   * Test paths in the Standard profile.
    +   * Tests paths in the Standard profile.
        *
        * @var string
    

    Property, so the change can just be reverted.

  8. +++ b/core/modules/user/tests/src/Kernel/Views/HandlerArgumentUserUidTest.php
    @@ -28,7 +28,7 @@ class HandlerArgumentUserUidTest extends KernelTestBase {
       /**
    -   * Test views.
    +   * Tests views.
        *
        * @var string[]
    

    Property; can be removed from the patch.

  9. +++ b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
    @@ -41,14 +41,14 @@ class ContextualFiltersBlockContextTest extends ViewTestBase {
       /**
    -   * Test node type.
    +   * Tests node type.
        *
        * @var \Drupal\node\NodeTypeInterface
        */
       protected $nodeType;
     
       /**
    -   * Test nodes.
    +   * Tests nodes.
        *
        * @var \Drupal\node\NodeInterface[]
    
    +++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
    @@ -35,7 +35,7 @@ class ExposedFormCheckboxesTest extends ViewTestBase {
       /**
    -   * Test terms.
    +   * Tests terms.
        *
        * @var array
    

    Properties.

  10. +++ b/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
    @@ -40,28 +40,28 @@ class FieldDropbuttonTest extends ViewsKernelTestBase {
       /**
    -   * Test node.
    +   * Tests node.
        *
        * @var \Drupal\node\NodeInterface
        */
       protected $node1;
     
       /**
    -   * Test node.
    +   * Tests node.
        *
        * @var \Drupal\node\NodeInterface
        */
       protected $node2;
     
       /**
    -   * Test node.
    +   * Tests node.
        *
        * @var \Drupal\node\NodeInterface
        */
       protected $node3;
     
       /**
    -   * Test user.
    +   * Tests user.
        *
        * @var \Drupal\user\UserInterface
    

    Properties.

  11. +++ b/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/ComplexTestType.php
    @@ -6,7 +6,7 @@
     /**
    - * Test workflow type.
    + * Tests workflow type.
    
    +++ b/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/PredefinedStatesWorkflowTestType.php
    @@ -6,7 +6,7 @@
     /**
    - * Test workflow type.
    + * Tests workflow type.
    
    +++ b/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/RequiredStateTestType.php
    @@ -6,7 +6,7 @@
     /**
    - * Test workflow type.
    + * Tests workflow type.
      *
    
    +++ b/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/TestType.php
    @@ -5,7 +5,7 @@
     /**
    - * Test workflow type.
    + * Tests workflow type.
      *
    

    Fixtures.

    Provides a test workflow type.

  12. +++ b/core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php
    @@ -38,7 +38,7 @@ class DbDumpTest extends KernelTestBase {
       /**
    -   * Test data to write into config.
    +   * Tests data to write into config.
        *
        * @var array
        */
    

    Property to remove from the patch.

xjm’s picture

Note that classes are also supposed to have a verb. But sometimes the verb is "Tests" when it's a test class. Other times the class might be a fixture and we can use "Provides a test..." or "Defines a test..."

jungle’s picture

@xjm, thanks for the detailed review, too long to follow one by one, I already replaced from file names start with A to P now. is it ok sticking with the scope of methods only? Open new issues for others?

xjm’s picture

  1. +++ b/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
    @@ -87,7 +87,7 @@ public function testExtenderHasAllTags() {
    -   * Tests extended query tagging "has at least one of these tags" functionality.
    +   * Tests extended query tagging "has at least one of these tags".
    

    I think the modified sentence here is confusing. How about:

    Tests extended query tagging for "has at least one of these tags".

  2. +++ b/core/tests/Drupal/KernelTests/Core/Session/AccountSwitcherTest.php
    @@ -6,7 +6,7 @@
    - * Test case for account switching.
    + * Tests case for account switching.
    

    This is the docblock for the whole test class. It's not testing a "case". I'd just say:

    Tests account switching.

  3. +++ b/core/tests/Drupal/KernelTests/Core/Theme/BaseThemeMissingTest.php
    @@ -82,7 +82,7 @@ public function testMissingBaseThemeException() {
    - * Test theme extension list class.
    + * Tests theme extension list class.
    

    This is another fixture. Notice how the class is added at the end of another test class. I'd make this one:

    Provides a test theme extension list class.

  4. +++ b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
    @@ -237,14 +237,14 @@ public function testAssertAllObjects() {
    -   * Test method referenced by ::testAllCallable().
    +   * Tests method referenced by ::testAllCallable().
        */
    ...
    -   * Test method referenced by ::testAllCallable().
    +   * Tests method referenced by ::testAllCallable().
    

    These are weird but I don't think they're testing a method; I think they're providing test (helper) methods. So maybe:

    Defines a test method referenced by...

  5. +++ b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
    @@ -9,14 +9,14 @@
    -   * Test data for testBuilder
    +   * Tests data for testBuilder
    
    +++ b/core/tests/Drupal/Tests/Composer/Generator/MetapackageUpdateTest.php
    @@ -11,14 +11,14 @@
    -   * Test data for testUpdated
    +   * Tests data for testUpdated
    

    "Provides test data..."

  6. +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
    @@ -255,7 +255,7 @@ public function testDrupalDrupalFileWasReplaced() {
    -   * Test values for testDrupalDrupalFileWasAppended.
    +   * Tests values for testDrupalDrupalFileWasAppended.
    

    Provides test values...

  7. +++ b/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php
    @@ -30,7 +30,7 @@
    - * Test coverage for various classes in the \Drupal\Core\Ajax namespace.
    + * Tests coverage for various classes in the \Drupal\Core\Ajax namespace.
    

    It doesn't test coverage; it provides test coverage. But that will get too long. How about:

    Tests various classes in the...

  8. +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
    @@ -33,7 +33,7 @@ class LibraryDependencyResolverTest extends UnitTestCase {
    -   * Test library data.
    +   * Tests library data.
        *
        * @var array
    
    +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
    @@ -48,7 +48,7 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase {
       /**
    -   * Test library data.
    +   * Tests library data.
        *
        * @var array
    
    +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
    @@ -33,7 +33,7 @@ class LibraryDiscoveryTest extends UnitTestCase {
    -   * Test library data.
    +   * Tests library data.
        *
        * @var array
    

    Properties, so exclude from patch.

  9. +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
    @@ -243,7 +243,7 @@ public function getExtensionDiscovery() {
    - * Test theme extension list class.
    + * Tests theme extension list class.
      */
    
    @@ -252,7 +252,7 @@ class TestThemeExtensionList extends ThemeExtensionList {
    - * Test theme engine extension list class.
    + * Tests theme engine extension list class.
    

    Having déja vu, but in case this is just similar to something I already pasted rather than exactly the same, thwaw should be

    Defines a test theme extension... (etc.)

    Or something like thar.

  10. +++ b/core/tests/Drupal/Tests/Core/Field/FieldInputValueNormalizerTraitTest.php
    @@ -22,7 +22,7 @@ public function testKeyValueByDelta($input_value, $expected_value, $main_propert
    -   * Test cases for ::testKeyValueByDelta.
    +   * Tests cases for ::testKeyValueByDelta.
    
    Provides test cases for...
  11. +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
    @@ -167,6 +167,6 @@ protected function setUpDefaultValue($default_value = NULL) {
    - * Test interface used for mocking.
    + * Tests interface used for mocking.
    
    Provides a test interface used for mocking.
  12. +++ b/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php
    @@ -305,7 +305,7 @@ protected function setupVfsWithTestClasses() {
    - * Test description
    + * Tests description
    
    @@ -379,7 +379,7 @@ public function testGetTestClasses() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -388,14 +388,14 @@ public function testGetTestClasses() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    ...
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -404,7 +404,7 @@ public function testGetTestClasses() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -450,7 +450,7 @@ public function testGetTestClassesWithSelectedTypes() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -459,7 +459,7 @@ public function testGetTestClassesWithSelectedTypes() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -468,7 +468,7 @@ public function testGetTestClassesWithSelectedTypes() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    
    @@ -497,7 +497,7 @@ public function testGetTestsInProfiles() {
    -          'description' => 'Test description',
    +          'description' => 'Tests description',
    

    Hmm, I don't think these are testing a description. I'd suggest leaving it alone here since this is an example. We could also make it "The test description" to make it clear "Test" isn't a verb anyway here.

  13. +++ b/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php
    @@ -121,7 +121,7 @@ public function testLocalTimeZone() {
    -   * Test files discovered by addTestsBySuiteNamespace().
    +   * Tests files discovered by addTestsBySuiteNamespace().
        *
    

    Property, so exclude from patch.

OK, phew, done!

Edit: Crosspost. I'll get back to you on the scoping question in a bit; have to dash now.

jungle’s picture

The first iteration focused on reverting non-method changes with 2-3 times self-review on my local.

xjm’s picture

I think doing just methods makes sense, with a followup for classes since they're more likely to be fixtures etc. With just methods, the one thing to watch out for will be the data providers.

Thanks! Let me know when you've had the chance to address all the feedback above (aside from points about properties and classes, etc.) and then I'll review again.

Kristen Pol’s picture

Wow! Sorry I didn't catch the different applications of "Tests" noted in the comments above from @xjm. Based on the comments in #42 and #43 I'm unclear if it needs review yet.

jungle’s picture

Thanks @xjm for your confirmation and reminder.

Re #44, It's not ready for review yet. When it's ready, I will let you two know and update the status to NR. Thank you @Kristen Pol!

jungle’s picture

FileSize
405.72 KB
3.74 KB

2nd iteration, fixing failed tests in #42

jungle’s picture

Status: Needs work » Needs review
FileSize
400.42 KB
12.32 KB
  1. #28, changes to classes, already reverted and double-checked them one by one.
  2. #30, change to a property, already reverted and double-checked
  3. #32, changes to properties, already reverted and double-checked them one by one.
  4. #36.1 changes to properties, already reverted and double-checked them one by one.
  5. #36.2 change to a property, already reverted and double-checked
  6. #36.3 change to a property, already reverted and double-checked
  7. #36.4 changes to properties, already reverted and double-checked them one by one.
  8. #36.0

    Also all fixtures.

    Too broad, so ignored, but I guess they were reverted already.

  9. #37.1 changes to properties, already reverted and double-checked them one by one.
  10. #37.2 change to a property, already reverted and double-checked
  11. #37.3 change to a property, already reverted and double-checked
  12. #37.4 change to a class, already reverted and double-checked

    Here also "Test class" was a noun; I suggest switching to:
    Provides a base test class for NormalizerBase.

    Ignored suggestion to stick with the scope.

  13. #37.5 Same/Similar with the above double-checked and suggestion ignored.
  14. #37.6 Same/Similar with the above double-checked and suggestion ignored.
  15. #37.7 Same/Similar with the above double-checked and suggestion ignored.
  16. #38.1 changes to data providers, already reverted besides missed ones and double-checked them one by one, and fixed missed ones. Suggestion ignored to stick with the scope.

    Note: While checking Tests cases for ::, found more similar.

  17. #38.2 Changes to classes. All good
  18. #38.3 Change to class. Already reverted
  19. #38.4 Changes to classes. Already reverted
  20. #38.5 One missed. One rejected.
    b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
    @@ -65,7 +65,7 @@ public function test9($uid) {
    -   * Test controller for ExceptionHandlingTest::testBacktraceEscaping().
    +   * Tests controller for ExceptionHandlingTest::testBacktraceEscaping().
  21. #38.6 Already reverted. Suggestion ignored to stick with the scope.
  22. +   * Tests setup.
    
    This should actually just be {@inheritdoc}
  23. #38.7 Already reverted.
  24. #38.8 Already reverted. Suggestion ignored to stick with the scope.

    Property; can be removed from the patch.

  25. #38.9 Already reverted.
  26. #38.10 Already reverted.
  27. #38.11 Already reverted. Suggestion ignored to stick with the scope.
  28. #38.12 Already reverted.
  29. #39 Suggestion ignored to stick with the scope.
  30. #41.1 Modified as suggested.
  31. #42.2 Change to class, reverted already and suggestion ignored.
  32. #42.3 Change to class, reverted already and suggestion ignored.
  33. #42.4 Changed as suggested
  34. #42.5 Changed as suggested
  35. #42.6 Changed as suggested
  36. #42.7 Change to class, already reverted. Suggested rejected.
  37. #42.8 Already reverted.
  38. #42.9 Changes to classes, reverted already and suggestion ignored.

    déja vu by C21, one of my favorite bands, https://www.youtube.com/watch?v=0Hw6ZmevZdw

    déja vu, déja vu, déja vu, haha

  39. #42.10 Changed as suggested
  40. #42.11 Change to an interface, already reverted. Out of scope, suggested rejected.
  41. #42.12 Fixed in #46
  42. #42.13 Already reverted.

(Edited, reformatting)

xjm’s picture

Issue tags: +Needs followup

Tagging for a followup for test class docblocks.

jofitz’s picture

Issue tags: -Needs reroll

Removed "Needs reroll" tag

jungle’s picture

Issue summary: View changes

Adding needs follow up for a sniff (probably) to IS

jungle’s picture

Issue summary: View changes

Quoting @xjm's comment on #50 in slack. and updated to IS

jungle’s picture

Issue tags: +Needs reroll
Kristen Pol’s picture

Status: Needs review » Needs work

Back to "Needs work" for reroll.

ravi.shankar’s picture

Assigned: Unassigned » ravi.shankar
ravi.shankar’s picture

Assigned: ravi.shankar » Unassigned
Status: Needs work » Needs review
FileSize
395.9 KB

Here I have added reroll of #47.

jungle’s picture

Status: Needs review » Needs work

Thanks @ravi.shankar for rerolling.

  1. +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
    @@ -635,7 +635,7 @@ public function testViewsTranslationUI() {
    -   * Test the number of source elements for plural strings in config translation forms.
    +   * Tests the number of source elements for plural strings in config translation forms.
    
    +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
    @@ -221,7 +221,7 @@ public function testMaintenanceModeLoginPaths() {
    -   * Test that an authenticated user hitting 'user/login' gets redirected to
    +   * Tests that an authenticated user hitting 'user/login' gets redirected to
    

    Rewrite to one line if possible

  2. +++ b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
    @@ -57,7 +57,7 @@ public function getImageCount(ImageStyleInterface $style) {
    -   * Test creating an image style with a numeric name and ensuring it can be
    +   * Tests creating an image style with a numeric name and ensuring it can be
        * applied to an image.
    

    Rewrite to one line

  3. +++ b/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
    @@ -25,7 +25,7 @@ public function testDependencyInjectedNewLanguage() {
    -   * Test dependency injected Language object against a new default language
    +   * Tests dependency injected Language object against a new default language
        * object.
    

    Rewrite to one line

  4. +++ b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
    @@ -10,7 +10,7 @@
    -   * Test that creating a stub of the given entity type results in a valid
    +   * Tests that creating a stub of the given entity type results in a valid
        * entity.
    

    Rewrite to one-line

  5. +++ b/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
    @@ -25,7 +25,7 @@ class ElementsLabelsTest extends BrowserTestBase {
    -   * Test form elements, labels, title attributes and required marks output
    +   * Tests form elements, labels, title attributes and required marks output
        * correctly and have the correct label option class if needed.
    

    Rewrite to one line

  6. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -147,7 +147,7 @@ public function testAdvancedSelect() {
    -   * Test the whether the option checker gives an error on invalid tableselect values for checkboxes.
    +   * Tests the whether the option checker gives an error on invalid tableselect values for checkboxes.
    

    Over 80 chars

  7. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -170,7 +170,7 @@ public function testMultipleTrueOptionchecker() {
    -   * Test the whether the option checker gives an error on invalid tableselect values for radios.
    +   * Tests the whether the option checker gives an error on invalid tableselect values for radios.
    

    Over 80 chars

  8. +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
    @@ -315,7 +315,7 @@ protected function doTestThemeCallbackOptionalTheme() {
    -   * Test the theme negotiation when it is set to use a theme that does not exist.
    +   * Tests the theme negotiation when it is set to use a theme that does not exist.
    

    Over 80 chars

  9. +++ b/core/modules/system/tests/src/Functional/Pager/PagerTest.php
    @@ -79,7 +79,7 @@ public function testActiveClass() {
    -   * Test proper functioning of the query parameters and the pager cache context.
    +   * Tests proper functioning of the query parameters and the pager cache context.
    

    Over 80 chars

  10. +++ b/core/modules/text/tests/src/Kernel/TextSummaryTest.php
    @@ -225,7 +225,7 @@ public function testLength() {
    +   * Tests text_summary() returns an empty string without any error when called
        * with an invalid format.
    

    Rewrite to one line

  11. +++ b/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
    @@ -151,7 +151,7 @@ public function testFilterQuery() {
    -   * Test no error message is displayed when all options are selected in an
    +   * Tests no error message is displayed when all options are selected in an
        * exposed filter.
    

    Rewrite to one line

  12. +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
    @@ -93,7 +93,7 @@ public function testConditionSubquerySelect() {
    -   * Test that we can use a subquery with a relational operator in a WHERE clause.
    +   * Tests that we can use a subquery with a relational operator in a WHERE clause.
    

    Over 80 chars

  13. +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
    @@ -114,7 +114,7 @@ public function testConditionSubquerySelect2() {
    -   * Test that we can use 2 subqueries with a relational operator in a WHERE clause.
    +   * Tests that we can use 2 subqueries with a relational operator in a WHERE clause.
    

    Over 80 chars

  14. +++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
    @@ -269,7 +269,7 @@ public function testDateTimezone($input, $timezone, $expected_timezone, $message
    -   * Test that DrupalDateTime can detect the right timezone to use when
    +   * Tests that DrupalDateTime can detect the right timezone to use when
        * constructed from a datetime object.
    

    Rewrite to one line

  15. +++ b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
    @@ -192,7 +192,7 @@ public function testGetMultipleHasPropagated() {
    -   * Test that the delete all operation is propagated to all backends in the chain.
    +   * Tests that the delete all operation is propagated to all backends in the chain.
    

    Over 80 chars

  16. +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
    @@ -452,7 +452,7 @@ public function testBaseURLGeneration() {
    -   * Test that the 'scheme' route requirement is respected during url generation.
    +   * Tests that the 'scheme' route requirement is respected during url generation.
    

    Over 80 chars

jungle’s picture

Issue tags: -Needs reroll
Deepak Goyal’s picture

I am working on it

Deepak Goyal’s picture

@jungle Made changes as you suggested but some point that you suggested for Rewrite to one line is not possible. Please review.

ravi.shankar’s picture

Added reroll of patch #59.

Version: 9.1.x-dev » 9.2.x-dev

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

jungle’s picture

alex.mazaltov’s picture

#63 Looks fine.
I will fetch it and will review it locally on Drupal 9.2.x. Hope no blockers will be in the local environment anyway I will get back to you in slack.

alex.mazaltov’s picture

That is protocol:
$make test
... perform all tests in drupal core after applying patch

ERRORS!
Tests: 27897, Assertions: 33293, Errors: 8996, Failures: 26, Skipped: 2547, Incomplete: 3.

Legacy deprecation notices (5)
make: *** [Makefile:52: test] Error 2

Also, I have tested the same command make test with raw drupal core at branch 9.2.x
It gives the same result.
so I think we can make this issue as RTBC

longwave’s picture

Status: Needs review » Needs work

Reviewed with git diff --color-words.

  1. +++ b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
    @@ -96,7 +96,7 @@ protected function createEntity() {
    -   * Test that comments correctly invalidate the cache tag of their host entity.
    +   * Tests comments correctly invalidate the cache tag of their host entity.
    

    I think that this should still be "Tests that...", we can drop "correctly" I guess to keep it under the character limit.

  2. +++ b/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderEntityViewDisplayTest.php
    @@ -75,7 +75,7 @@ public function providerTestIsLayoutBuilderEnabled() {
    -   * Tests that setting overridable enables Layout Builder only when set to TRUE.
    +   * Tests setting overridable enables Layout Builder only when set to TRUE.
    

    Again I think we need to keep "Tests that" here, we can drop "set to" to shorten it, or reword to "Tests that Layout Builder is only enabled when overridable is TRUE."

  3. +++ b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
    @@ -10,8 +10,7 @@
    -   * Test that creating a stub of the given entity type results in a valid
    -   * entity.
    +   * Tests stub of the given entity type results in a valid entity.
    

    This needs to be something like "Tests that a stub..."

  4. +++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
    @@ -69,7 +69,7 @@ public function testMissingModules() {
    -   * Tests enabling a module that depends on an incompatible version of a module.
    +   * Tests enabling a module that depends on incompatible version of a module.
    

    We can't just drop "an" here.

  5. +++ b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
    @@ -91,7 +91,7 @@ protected function assertDefaultConfig(StorageInterface $default_config_storage,
    -   * Tests that the users can log in with the admin password selected at install.
    +   * Tests the users can log in with the admin password selected at install.
    

    We need to keep "that" here.

  6. +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
    @@ -232,7 +232,7 @@ public function testDependencyChecking() {
    -   * Tests imported configuration entities with and without language information.
    +   * Tests imported configuration entities with & without language information.
    

    I don't think we should use & just so we can cut it down to 80 characters, let's just keep "and" and wrap this one.

  7. +++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
    @@ -286,8 +286,7 @@ public function testDateTimezone($input, $timezone, $expected_timezone, $message
    +   * Tests DrupalDateTime with datetime object.
    

    Should be "...with a datetime object".

  8. +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
    @@ -401,7 +401,7 @@ public function testProcessWithIdAndExtraArguments() {
    -   * Tests consumer method with priority and extra parameters in different order.
    +   * Tests consumer method with priority & extra parameters in different order.
    

    Again I find & hard to read, let's just use "and".

anmolgoyal74’s picture

Status: Needs work » Needs review
FileSize
395.99 KB
5.3 KB

Addressed #66.

jungle’s picture

jungle’s picture

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Kristen Pol’s picture

I have reviewed the interdiff in #67 and it addresses all of the items noted in #66.

Kristen Pol’s picture

Status: Needs review » Reviewed & tested by the community

Forgot to switched to RTBC.

catch’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs re-roll

Needs a re-roll.

Neslee Canil Pinto’s picture

Status: Needs work » Needs review
Issue tags: -Needs re-roll
FileSize
394.73 KB

Rerolled to latest dev, when trying to create interdiff from #67 got following error

interdiff: Error applying patch1 to reconstructed file

For info fixed in the following files which where not able to apply

error: patch failed: core/modules/block/tests/src/Functional/BlockFormInBlockTest.php:65
error: core/modules/block/tests/src/Functional/BlockFormInBlockTest.php: patch does not apply
error: patch failed: core/modules/field/tests/src/Functional/Number/NumberFieldTest.php:282
error: core/modules/field/tests/src/Functional/Number/NumberFieldTest.php: patch does not apply
error: patch failed: core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php:124
error: core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php: patch does not apply
error: patch failed: core/modules/file/tests/src/Functional/SaveUploadTest.php:92
error: core/modules/file/tests/src/Functional/SaveUploadTest.php: patch does not apply
error: patch failed: core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php:54
error: core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php: patch does not apply
error: patch failed: core/modules/migrate/tests/src/Kernel/Plugin/LogTest.php:19
error: core/modules/migrate/tests/src/Kernel/Plugin/LogTest.php: patch does not apply
error: patch failed: core/modules/migrate/tests/src/Unit/process/CallbackTest.php:34
error: core/modules/migrate/tests/src/Unit/process/CallbackTest.php: patch does not apply
error: patch failed: core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php:253
error: core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php: patch does not apply
error: patch failed: core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php:125
error: core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php: patch does not apply
error: patch failed: core/modules/user/tests/src/Kernel/UserInstallTest.php:29
error: core/modules/user/tests/src/Kernel/UserInstallTest.php: patch does not apply
error: patch failed: core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php:1003
error: core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php: patch does not apply
error: patch failed: core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php:73
error: core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php: patch does not apply
error: patch failed: core/tests/Drupal/Tests/Component/Serialization/JsonTest.php:94
error: core/tests/Drupal/Tests/Component/Serialization/JsonTest.php: patch does not apply
error: patch failed: core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php:16
error: core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php: patch does not apply
error: patch failed: core/tests/Drupal/Tests/Composer/Generator/MetapackageUpdateTest.php:18
error: core/tests/Drupal/Tests/Composer/Generator/MetapackageUpdateTest.php: patch does not apply
error: patch failed: core/tests/Drupal/Tests/Core/Common/AttributesTest.php:57
error: core/tests/Drupal/Tests/Core/Common/AttributesTest.php: patch does not apply
quietone’s picture

@Neslee Canil Pinto, When the interdiff fails, make a diff, see Creating an interdiff-#What about rerolled patches?.

Neslee Canil Pinto’s picture

FileSize
173.61 KB

@quietone this is the diff file that got generated when ran diff -u 3133162-67.patch 3133162-74.patch > reroll_diff_67-74.txt

jungle’s picture

Status: Needs review » Reviewed & tested by the community

The reroll looks good, back to RTBC.

catch’s picture

Version: 9.3.x-dev » 9.2.x-dev
Status: Reviewed & tested by the community » Fixed

Committed/pushed to 9.3.x and cherry-picked to 9.2.x, thanks!

Spokje’s picture

@catch:

*cough*
Not showing up in Git branches of 9.2 nor 9.3?
*cough*

  • catch committed f3ad068 on 9.3.x
    Issue #3133162 by jungle, ravi.shankar, Deepak Goyal, Neslee Canil Pinto...
catch’s picture

Title: Replace the start verb Test with Tests in method comments of tests » [backport] Replace the start verb Test with Tests in method comments of tests
Version: 9.2.x-dev » 9.1.x-dev
Status: Fixed » Needs work

jungle’s picture

Status: Needs work » Needs review
alexpott’s picture

Version: 9.1.x-dev » 9.2.x-dev
Status: Needs review » Fixed

The final 9.1.x release is out already - barring security releases so this one missed the boat... given it's for the 1 line documentation for test methods I think this is okay security issues don't often change that so I'd been surprised if this causes to make issues with creating security patches that apply to both 9.2.x and 9.1.x.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.

jungle’s picture

Title: [backport] Replace the start verb Test with Tests in method comments of tests » Replace the start verb Test with Tests in method comments of tests
quietone’s picture