SONARPY-4282 Fix SonarQube issues (#1177)

GitOrigin-RevId: 403a993d82aec502754212c85c436537787a0c25

Author: guillaume-dequenne

python-checks/src/test/java/org/sonar/python/checks/FileHeaderCopyrightCheckTest.java

@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.List;
 import org.assertj.core.api.Assertions;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.sonar.plugins.python.api.PythonCheck;
 import org.sonar.plugins.python.api.PythonSubscriptionCheck;
@@ -31,6 +30,7 @@
 import org.sonar.python.checks.utils.PythonCheckVerifier;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class FileHeaderCopyrightCheckTest {
 
@@ -147,7 +147,7 @@ void test_searchPattern_exception() {
 
     Assertions.assertThatThrownBy(() -> SubscriptionVisitor.analyze(check, context)).isInstanceOf(IllegalArgumentException.class);
 
-    IllegalArgumentException e = Assert.assertThrows(IllegalArgumentException.class, () -> SubscriptionVisitor.analyze(check, context));
+    IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> SubscriptionVisitor.analyze(check, context));
     Assertions.assertThat(e.getMessage()).isEqualTo("[FileHeaderCopyrightCheck] Unable to compile the regular expression: "+fileHeaderCopyrightCheck.headerFormat);
   }
 

python-checks/src/test/java/org/sonar/python/checks/StringLiteralDuplicationCheckTest.java

@@ -17,10 +17,11 @@
 package org.sonar.python.checks;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.sonar.python.checks.utils.PythonCheckVerifier;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class StringLiteralDuplicationCheckTest {
 
   @Test
@@ -44,7 +45,7 @@ void test_custom_pattern() {
   void test_invalid_custom_pattern() {
     StringLiteralDuplicationCheck check = new StringLiteralDuplicationCheck();
     check.customExclusionRegex = "a+*(";
-    IllegalStateException e = Assert.assertThrows(IllegalStateException.class,
+    IllegalStateException e = assertThrows(IllegalStateException.class,
       () -> PythonCheckVerifier.verify("src/test/resources/checks/stringLiteralDuplicationCustom.py", check));
     Assertions.assertThat(e.getMessage()).isEqualTo("Unable to compile regular expression: a+*(");
 

python-checks/src/test/java/org/sonar/python/checks/UselessParenthesisCheckTest.java

@@ -25,7 +25,7 @@
 import org.sonar.python.checks.utils.PythonCheckVerifier;
 import org.sonar.python.types.TypeShed;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class UselessParenthesisCheckTest {
 

python-commons/src/test/java/org/sonar/plugins/python/IPynbSensorTest.java

@@ -58,7 +58,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;

python-commons/src/test/java/org/sonar/plugins/python/MultiFileProgressReportTest.java

@@ -36,7 +36,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.atIndex;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class MultiFileProgressReportTest {
 

python-commons/src/test/java/org/sonar/plugins/python/NotebookParsingDataTest.java

@@ -22,8 +22,8 @@
 import org.sonar.python.IPythonLocation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 class NotebookParsingDataTest {
   @Test

python-commons/src/test/java/org/sonar/plugins/python/xunit/TestCaseTest.java

@@ -20,7 +20,7 @@
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class TestCaseTest {
   @Test

python-frontend/src/test/java/org/sonar/plugins/python/api/PythonVersionUtilsTest.java

@@ -24,8 +24,8 @@
 import org.sonar.api.testfixtures.log.LogTesterJUnit5;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.sonar.plugins.python.api.PythonVersionUtils.Version.V_310;
 import static org.sonar.plugins.python.api.PythonVersionUtils.Version.V_311;
 import static org.sonar.plugins.python.api.PythonVersionUtils.Version.V_312;

python-frontend/src/test/java/org/sonar/python/semantic/v2/callgraph/CallGraphIterableTest.java

@@ -22,7 +22,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class CallGraphIterableTest {
   @Test