diff --git a/libs/commcare b/libs/commcare index 7b4b3a61d..b8e3a7d26 160000 --- a/libs/commcare +++ b/libs/commcare @@ -1 +1 @@ -Subproject commit 7b4b3a61dea936fa184944d96157e5025a4d6113 +Subproject commit b8e3a7d263f7192bf038329e59d2628796d5e3fd diff --git a/src/main/java/org/commcare/formplayer/beans/menus/BaseResponseBean.java b/src/main/java/org/commcare/formplayer/beans/menus/BaseResponseBean.java index 7387b067e..aa465b65d 100644 --- a/src/main/java/org/commcare/formplayer/beans/menus/BaseResponseBean.java +++ b/src/main/java/org/commcare/formplayer/beans/menus/BaseResponseBean.java @@ -27,7 +27,6 @@ public class BaseResponseBean extends LocationRelevantResponseBean { private String[] selections; private HashMap translations; private String smartLinkRedirect; - private boolean dynamicSearch; private ArrayList persistentMenu; @@ -63,14 +62,6 @@ public void setSmartLinkRedirect(String smartLinkRedirect) { this.smartLinkRedirect = smartLinkRedirect; } - public boolean getDynamicSearch() { - return dynamicSearch; - } - - public void setDynamicSearch(boolean dynamicSearch) { - this.dynamicSearch = dynamicSearch; - } - public NotificationMessage getNotification() { return notification; } diff --git a/src/main/java/org/commcare/formplayer/beans/menus/QueryResponseBean.java b/src/main/java/org/commcare/formplayer/beans/menus/QueryResponseBean.java index d0e35e182..4a77a9147 100644 --- a/src/main/java/org/commcare/formplayer/beans/menus/QueryResponseBean.java +++ b/src/main/java/org/commcare/formplayer/beans/menus/QueryResponseBean.java @@ -109,7 +109,6 @@ public QueryResponseBean(QueryScreen queryScreen) { setTitle(queryScreen.getScreenTitle()); setDescription(queryScreen.getDescriptionText()); setQueryKey(queryScreen.getQueryKey()); - setDynamicSearch(queryScreen.getDynamicSearch()); setIsSearchOnClear(queryScreen.isSearchOnClear()); } diff --git a/src/test/java/org/commcare/formplayer/tests/CaseClaimTests.java b/src/test/java/org/commcare/formplayer/tests/CaseClaimTests.java index 25c6208b9..53770f62d 100644 --- a/src/test/java/org/commcare/formplayer/tests/CaseClaimTests.java +++ b/src/test/java/org/commcare/formplayer/tests/CaseClaimTests.java @@ -9,7 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -88,33 +87,14 @@ public void testCaseSearchCacheExists() { assertTrue(cache instanceof CaffeineCache); } - @Test - public void testDynamicSearch() throws Exception { - configureQueryMock(); - // Run query with an app with dynamic_search true and verify - QueryData queryData = new QueryData(); - queryData.setForceManualSearch("search_command.m1_results", true); - QueryResponseBean queryResponseBean = runQuery(queryData); - assertTrue(queryResponseBean.getDynamicSearch()); - - // Run query with an app with dynamic_search false and verify - queryResponseBean = sessionNavigateWithQuery(new String[]{"1"}, - "case_claim_eof_navigation", - null, - QueryResponseBean.class); - assertFalse(queryResponseBean.getDynamicSearch()); - } - @Test public void testSearchOnClear() throws Exception { configureQueryMock(); - // Run query with an app with dynamic_search true and verify QueryData queryData = new QueryData(); queryData.setForceManualSearch("search_command.m1_results", true); QueryResponseBean queryResponseBean = runQuery(queryData); assertTrue(queryResponseBean.isSearchOnClear()); - // Run query with an app with dynamic_search false and verify queryResponseBean = sessionNavigateWithQuery(new String[]{"1"}, "case_claim_eof_navigation", null, @@ -238,7 +218,6 @@ public void testQueryScreen() throws Exception { // forceManualAction true when default Search on should result in query screen QueryResponseBean queryResponseBean = runQuery(queryData); assert queryResponseBean.getDisplays().length == 5; - assertTrue(queryResponseBean.getDynamicSearch()); // test default value assert queryResponseBean.getDisplays()[0].getValue().contentEquals("Formplayer"); diff --git a/src/test/resources/archives/caseclaim/suite.xml b/src/test/resources/archives/caseclaim/suite.xml index 4f1709f7f..eabbacfab 100644 --- a/src/test/resources/archives/caseclaim/suite.xml +++ b/src/test/resources/archives/caseclaim/suite.xml @@ -378,7 +378,7 @@ - + diff --git a/src/test/resources/archives/endpoint/suite.xml b/src/test/resources/archives/endpoint/suite.xml index 1a24d2aaf..3de1729b7 100644 --- a/src/test/resources/archives/endpoint/suite.xml +++ b/src/test/resources/archives/endpoint/suite.xml @@ -489,7 +489,7 @@ - + @@ -520,7 +520,7 @@ - +