diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombine.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombine.java
index a537cd73ee481a295ed723701b8b58bb3f1d8ada..50f6c12a1e985afc397b8f8f9abdc43cc4359dd3 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombine.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombine.java
@@ -25,8 +25,8 @@ public class BiCreaterStringCombine extends AbstractBoundaryBiCreater<StringBoun
@Override
public Optional<StringBoundary> create(StringBoundary b1, StringBoundary b2) {
- if (b1.isMatchAny() || b2.isMatchAny()) {
- return Optional.of(StringBoundary.getBuilder().isMatchAny(true).build());
+ if (b1.matchesAny() || b2.matchesAny()) {
+ return Optional.of(StringBoundary.getBuilder().matchesAny(true).build());
}
if (!b1.matchesNoneOfValues() && !b2.matchesNoneOfValues()) {
return Optional.of(
@@ -42,9 +42,9 @@ public class BiCreaterStringCombine extends AbstractBoundaryBiCreater<StringBoun
}
return Optional.of(
StringBoundary.getBuilder()
- .isMatchNoneOfValues(true)
+ .matchesNoneOfValues(true)
.addValues(values)
- .isMatchAny(values.size() == 0)
+ .matchesAny(values.size() == 0)
.build());
}
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersection.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersection.java
index fa1ff05f2013e15dda50a4dfe07ef048dff939e3..71caf97701c9eccae1e2f6ce55a92ab6e88ee551 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersection.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersection.java
@@ -32,18 +32,18 @@ public class BiCreaterStringIntersection extends AbstractBoundaryBiCreater<Strin
if (b1.checkWith(IS_NOT_IN_CONTACT, b2)) {
return Optional.empty();
}
- if (b1.isMatchAny() && b2.isMatchAny()
- || b1.isMatchAny() && !b2.matchesNoneOfValues()
- || b2.isMatchAny() && !b1.matchesNoneOfValues()) {
- return Optional.of(StringBoundary.getBuilder().isMatchAny(true).build());
+ if (b1.matchesAny() && b2.matchesAny()
+ || b1.matchesAny() && !b2.matchesNoneOfValues()
+ || b2.matchesAny() && !b1.matchesNoneOfValues()) {
+ return Optional.of(StringBoundary.getBuilder().matchesAny(true).build());
}
- if (b1.isMatchAny() && b2.matchesNoneOfValues()) {
+ if (b1.matchesAny() && b2.matchesNoneOfValues()) {
return Optional.of(
- StringBoundary.getBuilder().isMatchNoneOfValues(true).addValues(b2.getValues()).build());
+ StringBoundary.getBuilder().matchesNoneOfValues(true).addValues(b2.getValues()).build());
}
- if (b2.isMatchAny() && b1.matchesNoneOfValues()) {
+ if (b2.matchesAny() && b1.matchesNoneOfValues()) {
return Optional.of(
- StringBoundary.getBuilder().isMatchNoneOfValues(true).addValues(b1.getValues()).build());
+ StringBoundary.getBuilder().matchesNoneOfValues(true).addValues(b1.getValues()).build());
}
if (b1.matchesNoneOfValues() && b2.matchesNoneOfValues()) {
Set<String> intersectionStrings = new HashSet<>();
@@ -54,7 +54,7 @@ public class BiCreaterStringIntersection extends AbstractBoundaryBiCreater<Strin
}
return Optional.of(
StringBoundary.getBuilder()
- .isMatchNoneOfValues(true)
+ .matchesNoneOfValues(true)
.addValues(b1.getValues())
.addValues(b2.getValues())
.build());
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringEqual.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringEqual.java
index 168f5b5f126d56f42aadb130ab4c0fd00d94d4d5..6bda6074c68ffdbba387af4b05781ff4a22448b4 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringEqual.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringEqual.java
@@ -25,7 +25,7 @@ public class CheckStringEqual extends AbstractBoundaryCheck<StringBoundary> {
}
public static boolean checkEqual(StringBoundary b1, StringBoundary b2) {
- if (b1 == b2 || b1.getText().equals(b2.getText()) || b1.isMatchAny() && b2.isMatchAny()) {
+ if (b1 == b2 || b1.getText().equals(b2.getText()) || b1.matchesAny() && b2.matchesAny()) {
return true;
}
if (b1.matchesNoneOfValues() != b2.matchesNoneOfValues()
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContact.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContact.java
index c578c3ef4115022ae8cd247b74f306e440c1f60d..45a7d7ed08f23c4875a8ba55907a4d363d8b9022 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContact.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContact.java
@@ -25,8 +25,8 @@ public class CheckStringInContact extends AbstractBoundaryCheck<StringBoundary>
}
public static boolean checkInContact(StringBoundary b1, StringBoundary b2) {
- if (b1.isMatchAny()
- || b2.isMatchAny()
+ if (b1.matchesAny()
+ || b2.matchesAny()
|| b1.matchesNoneOfValues() && b2.matchesNoneOfValues()) {
return true;
}
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringSubsumes.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringSubsumes.java
index cf8390c864a664d8aec75252a35b7d04fd06ee61..14f773f2e7f6b4f34cf2bdf441eb7ca166d1831a 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringSubsumes.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringSubsumes.java
@@ -25,10 +25,10 @@ public class CheckStringSubsumes extends AbstractBoundaryCheck<StringBoundary> {
}
public static boolean checkSubsumes(StringBoundary b1, StringBoundary b2) {
- if (b1.isMatchAny() && !b2.isMatchAny()) {
+ if (b1.matchesAny() && !b2.matchesAny()) {
return true;
}
- if (b2.isMatchAny()) {
+ if (b2.matchesAny()) {
return false;
}
int[] b1h = b1.getValuesHashes();
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLower.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLower.java
index 0b24bd5aa9b5084d7d9b2a4286c2188a1f1f0349..6543901acbe17bc6f2ecdf2670de93b91cc0d12b 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLower.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLower.java
@@ -24,8 +24,8 @@ public class CreaterStringLower extends AbstractBoundaryCreater<StringBoundary>
public Optional<StringBoundary> create(StringBoundary b) {
return Optional.of(StringBoundary.getBuilder()
.addValues(b.getValues())
- .isMatchNoneOfValues(!b.matchesNoneOfValues())
- .isMatchAny(b.getAmountOfElements() == 0)
+ .matchesNoneOfValues(!b.matchesNoneOfValues())
+ .matchesAny(b.getAmountOfElements() == 0)
.build());
}
}
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java
index 65ca20e6afbba790f28d5a8cd49b3e23d061764c..54c225d89813637b2d167b3181beb8a4cdeb7f42 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java
@@ -73,8 +73,8 @@ public class StringBoundary extends AbstractBoundary<String> {
biCreaterMap.put(COMBINE, BiCreaterStringCombine.getInstance());
}
- private boolean matchNoneOfValues;
- private boolean matchAny;
+ private boolean matchesNoneOfValues;
+ private boolean matchesAny;
private String[] values;
// sorted list of cached hashes of valuesHashes
private int[] valuesHashes;
@@ -93,11 +93,11 @@ public class StringBoundary extends AbstractBoundary<String> {
}
public boolean matchesNoneOfValues() {
- return matchNoneOfValues;
+ return matchesNoneOfValues;
}
- public boolean isMatchAny() {
- return matchAny;
+ public boolean matchesAny() {
+ return matchesAny;
}
public String[] getValues() {
@@ -114,16 +114,16 @@ public class StringBoundary extends AbstractBoundary<String> {
@Override
protected void parse(String text) {
- matchNoneOfValues = false;
- matchAny = false;
+ matchesNoneOfValues = false;
+ matchesAny = false;
try {
- matchAny = Validate.notNull(text).isEmpty();
- if (matchAny) {
+ matchesAny = Validate.notNull(text).isEmpty();
+ if (matchesAny) {
values = new String[0];
} else {
- matchNoneOfValues = text.toLowerCase().startsWith("not");
+ matchesNoneOfValues = text.toLowerCase().startsWith("not");
text = text.replace('(', '\0').replace(')', '\0').trim();
- if (matchNoneOfValues) {
+ if (matchesNoneOfValues) {
text = text.replaceFirst("not", "").trim();
}
values = text.split(",");
@@ -166,9 +166,9 @@ public class StringBoundary extends AbstractBoundary<String> {
@Override
public String getParsedText() {
- return (matchNoneOfValues ? "not(" : "")
+ return (matchesNoneOfValues ? "not(" : "")
+ Arrays.stream(values).map(v -> '"' + v + '"').collect(Collectors.joining(","))
- + (matchNoneOfValues ? ")" : "");
+ + (matchesNoneOfValues ? ")" : "");
}
public static Builder getBuilder() {
@@ -181,17 +181,17 @@ public class StringBoundary extends AbstractBoundary<String> {
private Builder() {
buildingValues = new HashSet<>();
- value.matchAny = false;
- value.matchNoneOfValues = false;
+ value.matchesAny = false;
+ value.matchesNoneOfValues = false;
}
- public Builder isMatchNoneOfValues(boolean matchNoneOfValues) {
- value.matchNoneOfValues = matchNoneOfValues;
+ public Builder matchesNoneOfValues(boolean matchesNoneOfValues) {
+ value.matchesNoneOfValues = matchesNoneOfValues;
return this;
}
- public Builder isMatchAny(boolean matchAny) {
- value.matchAny = matchAny;
+ public Builder matchesAny(boolean matchAny) {
+ value.matchesAny = matchAny;
return this;
}
@@ -212,8 +212,8 @@ public class StringBoundary extends AbstractBoundary<String> {
@Override
public StringBoundary build() {
value.values = buildingValues.toArray(new String[0]);
- if (value.matchAny) {
- value.matchNoneOfValues = false;
+ if (value.matchesAny) {
+ value.matchesNoneOfValues = false;
value.values = new String[0];
}
value.calcHashes();
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombineTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombineTest.java
index 259b9f6f448a52f3ce22af1c70fc7ca159a44bff..83cba9559ca1ad91efdb8c0d8760f123d1607747 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombineTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringCombineTest.java
@@ -23,55 +23,55 @@ class BiCreaterStringCombineTest {
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{"a", "b"}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
sb2 = StringBoundary.getBuilder().addValue("b").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").addValue("b").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").addValue("b").build();
sb2 = StringBoundary.getBuilder().addValue("b").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
sb1 = StringBoundary.getBuilder().addValue("b").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").addValue("b").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").addValue("b").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("b").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("b").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("b").addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("b").addValue("a").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchAny(true).build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("b").addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesAny(true).build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("b").addValue("a").build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchAny(true).build();
- sb2 = StringBoundary.getBuilder().isMatchAny(true).build();
+ sb1 = StringBoundary.getBuilder().matchesAny(true).build();
+ sb2 = StringBoundary.getBuilder().matchesAny(true).build();
sbR = (StringBoundary) sb1.createBi(COMBINE, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
}
}
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersectionTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersectionTest.java
index 00880f0a98c196bdcf165306b73632c40f70d102..b458a4870fc638aba27b1be71561c04dc78a4bbb 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersectionTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/bicreater/BiCreaterStringIntersectionTest.java
@@ -27,87 +27,87 @@ class BiCreaterStringIntersectionTest {
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchAny(true).build();
- sb2 = StringBoundary.getBuilder().isMatchAny(true).build();
+ sb1 = StringBoundary.getBuilder().matchesAny(true).build();
+ sb2 = StringBoundary.getBuilder().matchesAny(true).build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchAny(true).build();
+ sb1 = StringBoundary.getBuilder().matchesAny(true).build();
sb2 = StringBoundary.getBuilder().addValue("a").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
sb1 = StringBoundary.getBuilder().addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchAny(true).build();
+ sb2 = StringBoundary.getBuilder().matchesAny(true).build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertTrue(sbR.isMatchAny());
+ assertTrue(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchAny(true).build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesAny(true).build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchAny(true).build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesAny(true).build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").addValue("b").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").addValue("b").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a", "b"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").addValue("b").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").addValue("b").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a", "b"}, sbR.getValues());
assertTrue(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
sb1 = StringBoundary.getBuilder().addValue("a").addValue("b").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"b"}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
sb1 = StringBoundary.getBuilder().addValue("a").addValue("b").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("a").addValue("b").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("a").addValue("b").build();
assertFalse(sb1.createBi(INTERSECTION, sb2).isPresent());
sb1 = StringBoundary.getBuilder().addValue("a").addValue("b").build();
- sb2 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("c").build();
+ sb2 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("c").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a", "b"}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
- sb1 = StringBoundary.getBuilder().isMatchNoneOfValues(true).addValue("c").build();
+ sb1 = StringBoundary.getBuilder().matchesNoneOfValues(true).addValue("c").build();
sb2 = StringBoundary.getBuilder().addValue("a").addValue("b").build();
sbR = (StringBoundary) sb1.createBi(INTERSECTION, sb2).get();
assertArrayEquals(new String[]{"a", "b"}, sbR.getValues());
assertFalse(sbR.matchesNoneOfValues());
- assertFalse(sbR.isMatchAny());
+ assertFalse(sbR.matchesAny());
}
}
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLowerTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLowerTest.java
index 9a6635e9ad375c654487a09f079387200cd5b84a..2985c0aae5fbbb4ccfb029afb1c618f7d30c8682 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLowerTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/creater/CreaterStringLowerTest.java
@@ -16,13 +16,13 @@ class CreaterStringLowerTest {
public void testStringLower() {
StringBoundary sb = StringBoundary.getBuilder().addValue("a").build();
assertEquals("a", sb.getValues()[0]);
- assertFalse(sb.isMatchAny());
+ assertFalse(sb.matchesAny());
assertFalse(sb.matchesNoneOfValues());
assertEquals("\"a\"", sb.getText());
StringBoundary sb2 = (StringBoundary) sb.create(BoundaryCreaterType.LOWER).get();
assertArrayEquals(sb.getValues(), sb2.getValues());
assertTrue(sb2.matchesNoneOfValues());
- assertFalse(sb.isMatchAny());
+ assertFalse(sb.matchesAny());
}
}
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundaryTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundaryTest.java
index 5db876c0405b02304da009f8a6ec6510a95febbf..b31d28d12315dccafdc24c745ebb488e022373d3 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundaryTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundaryTest.java
@@ -11,13 +11,13 @@ class StringBoundaryTest {
public void testBuilder() {
StringBoundary sb = StringBoundary.getBuilder().addValue("a").build();
Assertions.assertEquals("a", sb.getValues()[0]);
- Assertions.assertFalse(sb.isMatchAny());
+ Assertions.assertFalse(sb.matchesAny());
Assertions.assertFalse(sb.matchesNoneOfValues());
Assertions.assertEquals("\"a\"", sb.getText());
- sb = StringBoundary.getBuilder().addValue("a").addValue("b").isMatchNoneOfValues(true).build();
+ sb = StringBoundary.getBuilder().addValue("a").addValue("b").matchesNoneOfValues(true).build();
Assertions.assertEquals("a", sb.getValues()[0]);
- Assertions.assertFalse(sb.isMatchAny());
+ Assertions.assertFalse(sb.matchesAny());
Assertions.assertTrue(sb.matchesNoneOfValues());
Assertions.assertEquals("not(\"a\",\"b\")", sb.getText());
}