From 61286cf013ebd683581dfc231cc72aa07796af30 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Wed, 15 Mar 2023 16:21:44 -0500 Subject: [PATCH] added test to confirm cache use case exclusions support OR boolean operation --- .../backend/core/actions/tables/GetActionTest.java | 6 +++++- .../kingsrook/qqq/backend/core/utils/TestUtils.java | 12 +++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/tables/GetActionTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/tables/GetActionTest.java index 10f8ac07..9fb07ece 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/tables/GetActionTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/tables/GetActionTest.java @@ -102,7 +102,8 @@ class GetActionTest extends BaseTest new QRecord().withValue("id", 1).withValue("firstName", "George").withValue("lastName", "Washington").withValue("noOfShoes", 5), new QRecord().withValue("id", 2).withValue("firstName", "John").withValue("lastName", "Adams"), new QRecord().withValue("id", 3).withValue("firstName", "Thomas").withValue("lastName", "Jefferson"), - new QRecord().withValue("id", 3).withValue("firstName", "Thomas 503").withValue("lastName", "Jefferson") + new QRecord().withValue("id", 3).withValue("firstName", "Thomas 503").withValue("lastName", "Jefferson"), + new QRecord().withValue("id", 3).withValue("firstName", "Thomas 999").withValue("lastName", "Jefferson") )); ///////////////////////////////////////////////////////////////////////////// @@ -127,6 +128,9 @@ class GetActionTest extends BaseTest getInput.setUniqueKey(Map.of("firstName", "Thomas 503", "lastName", "Jefferson")); GetOutput getOutput = new GetAction().execute(getInput); assertNull(getOutput.getRecord()); + getInput.setUniqueKey(Map.of("firstName", "Thomas 999", "lastName", "Jefferson")); + getOutput = new GetAction().execute(getInput); + assertNull(getOutput.getRecord()); } /////////////////////////////////////////////////////////////////////////// diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java index c87fa80a..726cf2c9 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java @@ -740,15 +740,13 @@ public class TestUtils .withCacheUniqueKey(uniqueKey) .withCacheSourceMisses(false) .withExcludeRecordsMatching(List.of( - new QQueryFilter( - new QFilterCriteria( - "firstName", - QCriteriaOperator.CONTAINS, - List.of("503") - ) + new QQueryFilter( + new QFilterCriteria("firstName", QCriteriaOperator.CONTAINS, "503"), + new QFilterCriteria("firstName", QCriteriaOperator.CONTAINS, "999") + ).withBooleanOperator(QQueryFilter.BooleanOperator.OR) ) )) - )); + ); }