From 0010825b50cfc8cd71091f8bb9b00adf005b299b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 17 Feb 2022 14:20:41 +0100
Subject: [PATCH] [java] naming conventions: update default test name pattern
 (IDEA-279616)

GitOrigin-RevId: 55c6d0aede394c091693c6b0acec8852498b4581
---
 .../com/siyeh/ig/junit/TestClassNamingConvention.java    | 2 +-
 .../naming/new_class_naming_convention/Nested.java       | 9 +++++++--
 .../groovy/testdata/highlighting/JUnitConvention.groovy  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
index 95ffc4302023..d2232ae9dbd7 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
@@ -34,7 +34,7 @@ public class TestClassNamingConvention extends NamingConvention<PsiClass> {
 
   @Override
   public NamingConventionBean createDefaultBean() {
-    return new NamingConventionBean("[A-Z][A-Za-z\\d]*Test(s|Case)?|Test[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
+    return new NamingConventionBean("[A-Z][A-Za-z\\d]*Test(s|Case)?|Test[A-Z][A-Za-z\\d]*|IT(.*)|(.*)IT(Case)?", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
   }
 
   @Override
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_class_naming_convention/Nested.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_class_naming_convention/Nested.java
index 71065cebac34..20d4da13b4fd 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_class_naming_convention/Nested.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_class_naming_convention/Nested.java
@@ -2,7 +2,7 @@ package com.siyeh.igtest.naming.abstract_class_naming_convention;
 
 import org.junit.jupiter.api.*;
 
-class <warning descr="Test name 'WithNested' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*'">WithNested</warning> {
+class <warning descr="Test name 'WithNested' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*|IT(.*)|(.*)IT(Case)?'">WithNested</warning> {
   @Nested
   class WithParent {
     @Test
@@ -10,7 +10,12 @@ class <warning descr="Test name 'WithNested' doesn't match regex '[A-Z][A-Za-z\d
   }
 }
 
-class <warning descr="Test name 'Normal' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*'">Normal</warning> {
+class <warning descr="Test name 'Normal' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*|IT(.*)|(.*)IT(Case)?'">Normal</warning> {
     @Test
     public void test1() {}
 }
+
+class NormalIT {
+    @Test
+    public void test1() {}
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/highlighting/JUnitConvention.groovy b/plugins/groovy/testdata/highlighting/JUnitConvention.groovy
index d8081d0e20b4..a656e9bd995f 100644
--- a/plugins/groovy/testdata/highlighting/JUnitConvention.groovy
+++ b/plugins/groovy/testdata/highlighting/JUnitConvention.groovy
@@ -3,7 +3,7 @@ import junit.framework.TestCase
 class SpecialGoodTest extends TestCase {
   class MyVeryInner extends SpecialGoodTest {}
 }
-class <warning descr="Test name 'SpecialBad' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*'">SpecialBad</warning> extends TestCase { }
+class <warning descr="Test name 'SpecialBad' doesn't match regex '[A-Z][A-Za-z\d]*Test(s|Case)?|Test[A-Z][A-Za-z\d]*|IT(.*)|(.*)IT(Case)?'">SpecialBad</warning> extends TestCase { }
 class TestInTheBeginning extends TestCase { }
 class WithTests extends TestCase { }
 class WithTestCase extends TestCase { }