fix JRubyVersion language comparison

Author: abelsromero

ruby-tools/src/main/java/de/saumya/mojo/ruby/script/JRubyVersion.java

@@ -21,13 +21,14 @@ public String getLanguage() {
     public boolean isLanguageLowerThan(int major, int minor) {
         final String[] parts = getLanguage().split("\\.");
 
-        if (major < Integer.parseInt(parts[0]))
-            return true;
-
-        if (minor < Integer.parseInt(parts[1]))
-            return true;
-
-        return false;
+        int majorLanguageVersion = Integer.parseInt(parts[0]);
+        int minorLanguageVersion = Integer.parseInt(parts[1]);
+
+        if (major == majorLanguageVersion) {
+            return minorLanguageVersion < minor;
+        } else {
+            return majorLanguageVersion < major;
+        }
     }
 
 }

ruby-tools/src/test/java/de/saumya/mojo/ruby/script/JRubyVersionTest.java

@@ -7,46 +7,82 @@
 public class JRubyVersionTest {
 
     @Test
-    public void should_return_true_when_compared_language_version_is_lower_than_major() {
-        final JRubyVersion version = new JRubyVersion("2.5.7", "2.5.7");
+    public void should_return_false_when_compared_language_major_is_equal_and_minor_version_is_equal() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
 
-        boolean result = version.isLanguageLowerThan(1, 5);
+        boolean result = version.isLanguageLowerThan(2, 5);
 
-        assertThat(result).isTrue();
+        assertThat(result).isFalse();
     }
 
     @Test
-    public void should_return_true_when_compared_language_version_is_lower_than_minor() {
-        final JRubyVersion version = new JRubyVersion("2.5.7", "2.5.7");
+    public void should_return_false_when_compared_language_major_is_equal_and_minor_version_is_lower() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
 
         boolean result = version.isLanguageLowerThan(2, 4);
 
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    public void should_return_true_when_compared_language_major_is_equal_and_minor_version_is_higher() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
+
+        boolean result = version.isLanguageLowerThan(2, 6);
+
         assertThat(result).isTrue();
     }
 
     @Test
-    public void should_return_true_when_compared_language_version_is_equal() {
-        final JRubyVersion version = new JRubyVersion("2.5.7", "2.5.7");
+    public void should_return_true_when_compared_language_major_is_higher_and_minor_is_equal() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
 
-        boolean result = version.isLanguageLowerThan(2, 5);
+        boolean result = version.isLanguageLowerThan(3, 5);
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void should_return_true_when_compared_language_major_is_higher_and_minor_is_lower() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
+
+        boolean result = version.isLanguageLowerThan(3, 3);
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void should_return_true_when_compared_language_major_is_higher_and_minor_is_higher() {
+        final JRubyVersion version = new JRubyVersion("jruby", "2.5.7");
+
+        boolean result = version.isLanguageLowerThan(3, 6);
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void should_return_false_when_compared_language_major_is_lower_and_minor_is_equal() {
+        final JRubyVersion version = new JRubyVersion("jruby", "3.5.7");
+
+        boolean result = version.isLanguageLowerThan(1, 5);
 
         assertThat(result).isFalse();
     }
 
     @Test
-    public void should_return_false_when_compared_language_version_is_higher_than_major() {
-        final JRubyVersion version = new JRubyVersion("2.5.7", "2.5.7");
+    public void should_return_false_when_compared_language_major_is_lower_and_minor_is_lower() {
+        final JRubyVersion version = new JRubyVersion("jruby", "3.5.7");
 
-        boolean result = version.isLanguageLowerThan(3, 5);
+        boolean result = version.isLanguageLowerThan(1, 2);
 
         assertThat(result).isFalse();
     }
 
     @Test
-    public void should_return_false_when_compared_language_version_is_higher_than_minor() {
-        final JRubyVersion version = new JRubyVersion("2.5.7", "2.5.7");
+    public void should_return_false_when_compared_language_major_is_lower_and_minor_is_higher() {
+        final JRubyVersion version = new JRubyVersion("jruby", "3.5.7");
 
-        boolean result = version.isLanguageLowerThan(2, 6);
+        boolean result = version.isLanguageLowerThan(1, 10);
 
         assertThat(result).isFalse();
     }