Merge pull request #101 from rabbitmq/lukebakken/broker-version-tests

Broker version parsing - add tests

Author: acogoluegnes

.gitignore

@@ -16,3 +16,4 @@
 /.classpath
 /.project
 /.settings
+/.jqwik-database

src/main/java/com/rabbitmq/client/amqp/impl/Utils.java

@@ -212,8 +212,9 @@ static int versionCompare(String str1, String str2) {
     }
     // compare first non-equal ordinal number
     if (i < vals1.length && i < vals2.length) {
-      int diff = Integer.valueOf(vals1[i]).compareTo(Integer.valueOf(vals2[i]));
-      return Integer.signum(diff);
+      Integer val1 = Integer.valueOf(vals1[i]);
+      Integer val2 = Integer.valueOf(vals2[i]);
+      return val1.compareTo(val2);
     }
     // the strings are equal or one string is a substring of the other
     // e.g. "1.2.3" = "1.2.3" or "1.2.3" < "1.2.3.4"

src/test/java/com/rabbitmq/client/amqp/impl/UtilsTest.java

@@ -62,4 +62,40 @@ void checkAnnotationsKO() {
     assertThatThrownBy(() -> checkMessageAnnotations(of("x-foo", "bar1", "foo", "bar2")))
         .isInstanceOf(IllegalArgumentException.class);
   }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+  "3.13.6",
+  "3.13.6.2",
+  "3.13.6-alpha.0",
+  "3.13.6~beta-1",
+  "3.13.6+funky-metadata-1",
+  "4.0.6",
+  "4.0.6.9",
+  "4.0.6-alpha.0",
+  "4.0.6~beta-1",
+  "4.0.6+funky-metadata-1"
+  })
+  void validateBrokerVersionParsing4AndEarlier(String brokerVersion) {
+      assertThat(Utils.is4_1_OrMore(brokerVersion)).isFalse();
+      assertThat(Utils.supportFilterExpressions(brokerVersion)).isFalse();
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+  "4.1.6",
+  "4.1.6.9",
+  "4.1.6-alpha.0",
+  "4.1.6~beta-1",
+  "4.1.6+funky-metadata-1",
+  "4.2.6",
+  "4.2.6.9",
+  "4.2.6-alpha.0",
+  "4.2.6~beta-1",
+  "4.2.6+funky-metadata-1"
+  })
+  void validateBrokerVersionParsing41AndLater(String brokerVersion) {
+      assertThat(Utils.is4_1_OrMore(brokerVersion)).isTrue();
+      assertThat(Utils.supportFilterExpressions(brokerVersion)).isTrue();
+  }
 }