Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ public LessThanOrEqualToSemverMatcher(String semVer) {

@Override
public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
if (matchValue == null) {
if (matchValue == null || _semVer == null) {
return false;
}
Semver matchSemver = Semver.build(matchValue.toString());
if (matchSemver == null) {
return false;
}

return _semVer != null && matchSemver.Compare(_semVer) <= 0;
return matchSemver.Compare(_semVer) <= 0;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class GreaterThanOrEqualToSemverMatcherTest {
@Test
public void works() {
GreaterThanOrEqualToSemverMatcher greaterThanOrEqualToSemverMatcher = new GreaterThanOrEqualToSemverMatcher("2.1.8");

assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.8", null, null, null));
assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.9", null, null, null));
assertFalse( greaterThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.junit.Test;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

/**
* Tests for EqualToSemverMatcher
Expand All @@ -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));
}
}