SONARPY-1481 Rule S1244: Corrected quickfix to use not instead of ! (#1579)

Author: joke1196

python-checks/src/main/java/org/sonar/python/checks/FloatingPointEqualityCheck.java

@@ -43,7 +43,7 @@
 public class FloatingPointEqualityCheck extends PythonSubscriptionCheck {
 
   private static final String MESSAGE = "Do not perform equality checks with floating point values.";
-  private static final String QUICK_FIX_MESSAGE = "Replace with %s%s.isclose().";
+  private static final String QUICK_FIX_MESSAGE = "Replace with \"%s%s.isclose()\".";
 
   private static final String QUICK_FIX_MATH = "%s%s.isclose(%s, %s, rel_tol=1e-09, abs_tol=1e-09)";
 
@@ -117,7 +117,7 @@ private boolean isBinaryOperationWithFloat(Expression expression) {
   }
 
   private PythonQuickFix createQuickFix(BinaryExpression binaryExpression, String operator) {
-    String notToken = "!=".equals(operator) ? "!" : "";
+    String notToken = "!=".equals(operator) ? "not " : "";
     String isCloseModuleName = getModuleNameOrAliasForIsClose();
     String message = String.format(QUICK_FIX_MESSAGE, notToken, isCloseModuleName);
     Builder quickFix = PythonQuickFix.newQuickFix(message);

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

@@ -44,7 +44,7 @@ void quickfixEquality(){
       "    if math.isclose(a - 0.1, b, rel_tol=1e-09, abs_tol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with math.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"math.isclose()\".");
   }
 
   @Test
@@ -72,10 +72,10 @@ void quickfixInequality(){
     String compliant =
       "import math\n" +
       "def foo(a,b):\n" +
-      "    if !math.isclose(a - 0.1, b, rel_tol=1e-09, abs_tol=1e-09):\n" +
+      "    if not math.isclose(a - 0.1, b, rel_tol=1e-09, abs_tol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with !math.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"not math.isclose()\".");
   }
 
   @Test
@@ -121,7 +121,7 @@ void quickfixNumpyImport(){
       "    if numpy.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with numpy.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"numpy.isclose()\".");
   }
 
   @Test
@@ -137,7 +137,7 @@ void quickfixMultipleImport(){
       "    if math.isclose(a - 0.1, b, rel_tol=1e-09, abs_tol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with math.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"math.isclose()\".");
   }
 
   @Test
@@ -155,7 +155,7 @@ void quickfixPrioritizeNumpyOverMath(){
       "    if np.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with np.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"np.isclose()\".");
   }
 
   @Test
@@ -171,7 +171,7 @@ void quickfixPrioritizeTorchOverMath(){
       "    if torch.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with torch.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"torch.isclose()\".");
   }
 
   @Test
@@ -187,7 +187,7 @@ void quickfixNumpyImportAlias(){
       "    if np.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with np.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"np.isclose()\".");
   }
 
   @Test
@@ -203,7 +203,7 @@ void quickfixPyTorchImport(){
       "    if torch.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with torch.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"torch.isclose()\".");
   }
 
   @Test
@@ -221,6 +221,6 @@ void quickfixTakeFirstImport(){
       "    if torch.isclose(a - 0.1, b, rtol=1e-09, atol=1e-09):\n" +
       "        ...";
     PythonQuickFixVerifier.verify(check, noncompliant, compliant);
-    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with torch.isclose().");
+    PythonQuickFixVerifier.verifyQuickFixMessages(check, noncompliant, "Replace with \"torch.isclose()\".");
   }
 }