SONARJAVA-4427 add andExpect to assertions methods patterns to suppor…

…t Spring test methods (#4607)
SonarSource · Dec 7, 2023 · 8f7ae0f · 8f7ae0f
1 parent ebac5e9
commit 8f7ae0f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/java-checks-test-sources/default/pom.xml b/java-checks-test-sources/default/pom.xml
@@ -304,6 +304,12 @@
       <version>4.1.2.RELEASE</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ws</groupId>
+      <artifactId>spring-ws-test</artifactId>
+      <version>4.0.7</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>

diff --git a/...checks-test-sources/default/src/test/java/checks/tests/AssertionsInTestsCheck/Spring.java b/...checks-test-sources/default/src/test/java/checks/tests/AssertionsInTestsCheck/Spring.java
@@ -4,6 +4,7 @@
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.ws.test.server.MockWebServiceClient;
 
 class SpringTest {
 
@@ -35,6 +36,14 @@ public void fakeTest2() throws Exception { // Compliant
   public void andExpectAllTest() throws Exception { // Compliant
     getResultActions().andDo(getResultHandler()).andExpectAll(getResultMatcher(), getResultMatcher()).andReturn();
   }
+
+  @Test
+  public void mockWebServiceClient(){ // Compliant
+    MockWebServiceClient server = null;
+    server.sendRequest(null)
+      .andExpect(null)
+      .andExpect(null);
+ }
 
   private ResultActions getResultActions() {
     return null;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/helpers/UnitTestUtils.java b/java-checks/src/main/java/org/sonar/java/checks/helpers/UnitTestUtils.java
@@ -39,7 +39,7 @@
 public final class UnitTestUtils {
 
   private static final String ORG_JUNIT_TEST = "org.junit.Test";
-  public static final Pattern ASSERTION_METHODS_PATTERN = Pattern.compile("(assert|verify|fail|should|check|expect|validate).*");
+  public static final Pattern ASSERTION_METHODS_PATTERN = Pattern.compile("(assert|verify|fail|should|check|expect|validate|andExpect).*");
   public static final Pattern TEST_METHODS_PATTERN = Pattern.compile("test.*|.*Test");
 
   public static final MethodMatchers ASSERTION_INVOCATION_MATCHERS = MethodMatchers.or(