From 28ef21004ded9798c5c535242462bc64b8e6c1a0 Mon Sep 17 00:00:00 2001 From: Bilal Al Date: Thu, 2 May 2024 16:01:48 -0700 Subject: [PATCH] polish --- .../matchers/LessThanOrEqualToSemverMatcher.java | 4 ++-- .../matchers/LessThanOrEqualToSemverMatcherTest.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java index 73fad951..ace533d3 100644 --- a/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java +++ b/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java @@ -14,7 +14,7 @@ public LessThanOrEqualToSemverMatcher(String semVer) { @Override public boolean match(Object matchValue, String bucketingKey, Map attributes, EvaluationContext evaluationContext) { - if (matchValue == null) { + if (matchValue == null || _semVer == null) { return false; } Semver matchSemver = Semver.build(matchValue.toString()); @@ -22,7 +22,7 @@ public boolean match(Object matchValue, String bucketingKey, Map return false; } - return _semVer != null && matchSemver.Compare(_semVer) <= 0; + return matchSemver.Compare(_semVer) <= 0; } @Override diff --git a/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java index 6be2333a..ad12dc8c 100644 --- a/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java +++ b/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java @@ -3,6 +3,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; /** * Tests for EqualToSemverMatcher @@ -14,10 +15,10 @@ public class LessThanOrEqualToSemverMatcherTest { public void works() { LessThanOrEqualToSemverMatcher lessThanOrEqualToSemverMatcher = new LessThanOrEqualToSemverMatcher("2.1.8"); - assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null) == true); - assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null) == false); - assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null) == true); - assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null) == true); - assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null) == true); + assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null)); + assertFalse( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null)); + assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null)); + assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null)); + assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null)); } }