SONARPY-925 Fix bug when comparing semantic versions

Author: andreaguarino

python-frontend/src/main/java/org/sonar/plugins/python/api/PythonVersionUtils.java

@@ -38,23 +38,47 @@
 public class PythonVersionUtils {
 
   public enum Version {
-    V_27(2.7, "27"), V_35(3.5, "35"), V_36(3.6, "36"), V_37(3.7, "37"), V_38(3.8, "38"), V_39(3.9, "39"), V_310(3.10, "310");
+    V_27(2, 7, "27"),
+    V_35(3, 5, "35"),
+    V_36(3, 6, "36"),
+    V_37(3, 7, "37"),
+    V_38(3, 8, "38"),
+    V_39(3, 9, "39"),
+    V_310(3, 10, "310");
 
-    private final double value;
+    private final int major;
+    private final int minor;
     private final String serializedValue;
 
-    Version(double value, String serializedValue) {
-      this.value = value;
+    Version(int major, int minor, String serializedValue) {
+      this.major = major;
+      this.minor = minor;
       this.serializedValue = serializedValue;
     }
 
-    public double value() {
-      return value;
+    public int major() {
+      return major;
+    }
+
+    public int minor() {
+      return minor;
     }
 
     public String serializedValue() {
       return serializedValue;
     }
+
+    public int compare(int major, int minor) {
+      if (major() == major) {
+        return Integer.compare(minor(), minor);
+      }
+      return Integer.compare(major(), major);
+    }
+
+    @Override
+    public String toString() {
+      return major + "." + minor;
+    }
   }
 
   /**
@@ -112,12 +136,22 @@ public static Set<Version> allVersions() {
   }
 
   private static boolean guessPythonVersion(Set<Version> pythonVersions, String versionValue) {
+    String[] version = versionValue.split("\\.");
     try {
-      double parsedVersion = Double.parseDouble(versionValue);
-      if (parsedVersion < MIN_SUPPORTED_VERSION.value()) {
+      int major = Integer.parseInt(version[0]);
+      int minor = version.length > 1 ? Integer.parseInt(version[1]) : 0;
+      Version guessedVersion = STRING_VERSION_MAP.get(major + "." + minor);
+      if (guessedVersion != null) {
+        pythonVersions.add(guessedVersion);
+        logWarningGuessVersion(versionValue, guessedVersion);
+        return true;
+      }
+      if (MIN_SUPPORTED_VERSION.compare(major, minor) > 0) {
         pythonVersions.add(MIN_SUPPORTED_VERSION);
-      } else if (parsedVersion > MAX_SUPPORTED_VERSION.value()) {
+        logWarningGuessVersion(versionValue, MIN_SUPPORTED_VERSION);
+      } else if (MAX_SUPPORTED_VERSION.compare(major, minor) < 0) {
         pythonVersions.add(MAX_SUPPORTED_VERSION);
+        logWarningGuessVersion(versionValue, MAX_SUPPORTED_VERSION);
       } else {
         logErrorMessage(versionValue);
         return false;
@@ -133,4 +167,9 @@ private static void logErrorMessage(String propertyValue) {
     String prefix = "Error while parsing value of parameter '%s' (%s). Versions must be specified as MAJOR_VERSION.MIN.VERSION (e.g. \"3.7, 3.8\")";
     LOG.warn(String.format(Locale.ROOT, prefix, PYTHON_VERSION_KEY, propertyValue));
   }
+
+  private static void logWarningGuessVersion(String propertyValue, Version guessedVersion) {
+    String prefix = "No explicit support for version %s. Python version has been set to %s.";
+    LOG.warn(String.format(Locale.ROOT, prefix, propertyValue, guessedVersion));
+  }
 }

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

@@ -51,15 +51,24 @@ public void supportedVersions() {
 
   @Test
   public void version_out_of_range() {
-    assertThat(PythonVersionUtils.fromString("4")).containsExactlyInAnyOrder(V_39);
+    assertThat(PythonVersionUtils.fromString("4")).containsExactlyInAnyOrder(V_310);
+    assertThat(logTester.logs(LoggerLevel.WARN)).contains("No explicit support for version 4. Python version has been set to 3.10.");
     assertThat(PythonVersionUtils.fromString("1")).containsExactlyInAnyOrder(V_27);
+    assertThat(logTester.logs(LoggerLevel.WARN)).contains("No explicit support for version 1. Python version has been set to 2.7.");
+    assertThat(PythonVersionUtils.fromString("3.11")).containsExactlyInAnyOrder(V_310);
+    assertThat(logTester.logs(LoggerLevel.WARN)).contains("No explicit support for version 3.11. Python version has been set to 3.10.");
+  }
+
+  @Test
+  public void bugfix_versions() {
+    assertThat(PythonVersionUtils.fromString("3.8.1")).containsExactlyInAnyOrder(V_38);
+    assertThat(logTester.logs(LoggerLevel.WARN)).contains("No explicit support for version 3.8.1. Python version has been set to 3.8.");
+    assertThat(PythonVersionUtils.fromString("3.11.1")).containsExactlyInAnyOrder(V_310);
   }
 
   @Test
   public void error_while_parsing_version() {
     assertThat(PythonVersionUtils.fromString("foo")).containsExactlyInAnyOrder(V_27, V_35, V_36, V_37, V_38, V_39, V_310);
-    assertThat(PythonVersionUtils.fromString("3.8.1")).containsExactlyInAnyOrder(V_27, V_35, V_36, V_37, V_38, V_39, V_310);
-    assertThat(PythonVersionUtils.fromString("3.81")).containsExactlyInAnyOrder(V_27, V_35, V_36, V_37, V_38, V_39, V_310);
     assertThat(logTester.logs(LoggerLevel.WARN)).contains("Error while parsing value of parameter 'sonar.python.version' (foo). Versions must be specified as MAJOR_VERSION.MIN.VERSION (e.g. \"3.7, 3.8\")");
   }
 }