From 23c6a120b35624a3052939d89555a80509edcb97 Mon Sep 17 00:00:00 2001 From: chandra Date: Fri, 9 Jun 2023 07:55:16 +0530 Subject: [PATCH 1/2] [TE-9727] If test-data-1 == test-data-2 >> addon if condition NLP is failing with valid data --- .../com/testsigma/addons/string_utils/web/ToCompare.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java b/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java index 5b9ab110..745a694e 100644 --- a/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java +++ b/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java @@ -41,13 +41,13 @@ public Result execute() throws NoSuchElementException { returnResult = testDataString1 < testDataString2 ? Result.SUCCESS : Result.FAILED; break; case ">=": - returnResult = testDataString1 >= testDataString2 ? Result.SUCCESS : Result.FAILED; + returnResult = testDataString1.equals(testDataString2) || testDataString1 > testDataString2 ? Result.SUCCESS : Result.FAILED; break; case "<=": - returnResult = testDataString1 <= testDataString2 ? Result.SUCCESS : Result.FAILED; + returnResult = testDataString1.equals(testDataString2) || testDataString1 < testDataString2 ? Result.SUCCESS : Result.FAILED; break; case "==": - returnResult = testDataString1 == testDataString2 ? Result.SUCCESS : Result.FAILED; + returnResult = testDataString1.equals(testDataString2) ? Result.SUCCESS : Result.FAILED; break; } if (returnResult.equals(Result.SUCCESS)) From 44581dfd0f08952decaa75afbeecd7a4ab6f430c Mon Sep 17 00:00:00 2001 From: chandra Date: Fri, 9 Jun 2023 11:19:54 +0530 Subject: [PATCH 2/2] [TE-9727] [Prod]:If test-data-1 == test-data-2 >> addon if condition NLP is failing with valid data --- .../addons/string_utils/web/ToCompare.java | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java b/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java index 745a694e..3d7d6779 100644 --- a/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java +++ b/string_data_generators/src/main/java/com/testsigma/addons/string_utils/web/ToCompare.java @@ -30,25 +30,21 @@ public class ToCompare extends WebAction { @Override public Result execute() throws NoSuchElementException { String operatorString = operator.getValue().toString(); - int testDataString1 = Integer.valueOf(testData1.getValue().toString()); - int testDataString2 = Integer.valueOf(testData2.getValue().toString()); + String testDataString1 = testData1.getValue().toString(); + String testDataString2 = testData2.getValue().toString(); Result returnResult = Result.FAILED; - switch (operatorString) { - case ">": - returnResult = testDataString1 > testDataString2 ? Result.SUCCESS : Result.FAILED; - break; - case "<": - returnResult = testDataString1 < testDataString2 ? Result.SUCCESS : Result.FAILED; - break; - case ">=": - returnResult = testDataString1.equals(testDataString2) || testDataString1 > testDataString2 ? Result.SUCCESS : Result.FAILED; - break; - case "<=": - returnResult = testDataString1.equals(testDataString2) || testDataString1 < testDataString2 ? Result.SUCCESS : Result.FAILED; - break; - case "==": - returnResult = testDataString1.equals(testDataString2) ? Result.SUCCESS : Result.FAILED; - break; + if(operatorString.equals(">")) { + returnResult = testDataString1.compareTo(testDataString2) > 0 ? Result.SUCCESS : Result.FAILED; + } else if(operatorString.equals("<")){ + returnResult = testDataString1.compareTo(testDataString2) < 0 ? Result.SUCCESS : Result.FAILED; + } else if(operatorString.equals(">=")) { + returnResult = testDataString1.equals(testDataString2) || testDataString1.compareTo(testDataString2) > 0 ? Result.SUCCESS : Result.FAILED; + } else if(operatorString.equals("<=")){ + returnResult = testDataString1.equals(testDataString2) || testDataString1.compareTo(testDataString2) < 0 ? Result.SUCCESS : Result.FAILED; + } else if(operatorString.equals("==")){ + returnResult = testDataString1.equals(testDataString2) ? Result.SUCCESS : Result.FAILED; + } else { + returnResult = Result.FAILED; } if (returnResult.equals(Result.SUCCESS)) setSuccessMessage("The TestData satisfies the expected condition"); @@ -56,5 +52,4 @@ public Result execute() throws NoSuchElementException { setErrorMessage("The TestData does not satisfy the expected condition"); return returnResult; } -} - +} \ No newline at end of file