[engine] Add 'at most' and 'at least' aliases for comparison rules (#5726)

Author: vkepin

docs/modules/parameters/pages/comparison-rule.adoc

@@ -6,37 +6,44 @@ Shows how parameters should be compared.
 
 == Possible values
 
-[cols="1,1,1", options="header"]
+[cols="1,1,1,1", options="header"]
 |===
 
 |Plain
 |Readable
 |Mathematical
+|Alias
 
 |LESS_THAN
 |less than
 |<
+|
 
 |LESS_THAN_OR_EQUAL_TO
 |less than or equal to
 |
 +++
 <=
 +++
+|at most
 
 |GREATER_THAN
 |greater than
 |>
+|
 
 |GREATER_THAN_OR_EQUAL_TO
 |greater than or equal to
 |>=
+|at least
 
 |EQUAL_TO
 |equal to
 |=
+|
 
 |NOT_EQUAL_TO
 |not equal to
 |!=
+|
 |===

vividus-engine/src/main/java/org/vividus/steps/ComparisonRule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.vividus.steps;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.hamcrest.Matcher;
@@ -32,7 +34,7 @@ public <T extends Comparable<T>> Matcher<T> getComparisonRule(T variable)
             return Matchers.lessThan(variable);
         }
     },
-    LESS_THAN_OR_EQUAL_TO("<=")
+    LESS_THAN_OR_EQUAL_TO("<=", "at most")
     {
         @Override
         public <T extends Comparable<T>> Matcher<T> getComparisonRule(T variable)
@@ -48,7 +50,7 @@ public <T extends Comparable<T>> Matcher<T> getComparisonRule(T variable)
             return Matchers.greaterThan(variable);
         }
     },
-    GREATER_THAN_OR_EQUAL_TO(">=")
+    GREATER_THAN_OR_EQUAL_TO(">=", "at least")
     {
         @Override
         public <T extends Comparable<T>> Matcher<T> getComparisonRule(T variable)
@@ -75,16 +77,19 @@ public <T extends Comparable<T>> Matcher<T> getComparisonRule(T variable)
     };
 
     private final String sign;
+    private final List<String> aliases;
 
-    ComparisonRule(String sign)
+    ComparisonRule(String sign, String... aliases)
     {
         this.sign = sign;
+        this.aliases = Arrays.asList(aliases);
     }
 
     public static ComparisonRule fromString(String sign)
     {
         return Stream.of(values())
-                     .filter(comparisonRule -> sign.equalsIgnoreCase(comparisonRule.sign))
+                     .filter(comparisonRule -> sign.equalsIgnoreCase(comparisonRule.sign)
+                             || comparisonRule.aliases.contains(sign.toLowerCase().replace('_', ' ')))
                      .findFirst()
                      .orElse(null);
     }

vividus-engine/src/test/java/org/vividus/steps/ComparisonRuleTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class ComparisonRuleTests
 {
@@ -80,13 +81,37 @@ static Stream<Arguments> getVariableMatcher()
         // @formatter:on
     }
 
+    static Stream<Arguments> getAliases()
+    {
+        // @formatter:off
+        return Stream.of(
+                Arguments.of("at most", ComparisonRule.LESS_THAN_OR_EQUAL_TO),
+                Arguments.of("at least", ComparisonRule.GREATER_THAN_OR_EQUAL_TO)
+        );
+        // @formatter:on
+    }
+
     @ParameterizedTest
     @MethodSource("getComparisonRule")
     void comparisonRuleBySignTest(String sign, ComparisonRule rule)
     {
         assertEquals(rule, ComparisonRule.fromString(sign));
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {"At Most", "AT_MOST", "AT MOST"})
+    void comparisonRuleByAliasFormatTest(String alias)
+    {
+        assertEquals(ComparisonRule.LESS_THAN_OR_EQUAL_TO, ComparisonRule.fromString(alias));
+    }
+
+    @ParameterizedTest
+    @MethodSource("getAliases")
+    void comparisonRuleByAliasTest(String alias, ComparisonRule rule)
+    {
+        assertEquals(rule, ComparisonRule.fromString(alias));
+    }
+
     @Test
     void comparisonRuleBySignEmptyOptionalTest()
     {
@@ -110,8 +135,8 @@ void shouldReturnEqualToMatcherForStringVariables()
 
     @ParameterizedTest
     @MethodSource("getComparisonRuleAsString")
-    void shouldReturnComparisonRulesInPlainText(String expecred, ComparisonRule toCheck)
+    void shouldReturnComparisonRulesInPlainText(String expected, ComparisonRule toCheck)
     {
-        assertEquals(expecred, toCheck.toString());
+        assertEquals(expected, toCheck.toString());
     }
 }

vividus-tests/src/main/resources/story/integration/DynamicVariablesTests.story

@@ -26,8 +26,8 @@ Then `${rect.height}`            is = `400`
 Then `${rect.width}`             is = `400`
 !-- Browser window has borders of 8px size on Windows OS, that's why x == 192 on Windows and x == 200 on Linux and MacOS
 !-- https://stackoverflow.com/a/42491227/2067574
-Then `${rect.x}`                 is >= `192`
-Then `${rect.x}`                 is <= `200`
+Then `${rect.x}`                 is at least `192`
+Then `${rect.x}`                 is at most `200`
 Then `${rect.y}`                 is = `8`
 
 Scenario: Verify `source-code` dynamic variable