Fix test

dhis2 · Oct 13, 2023 · c688103 · c688103
1 parent 840c7ac
commit c688103
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...s-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java b/...s-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java
@@ -682,7 +682,7 @@ public void validateSearchScope(TrackedEntityQueryParams params, boolean isGridS
   }
 
   private void checkIfMaxTeiLimitIsReached(TrackedEntityQueryParams params, int maxTeiLimit) {
-    if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit )) {
+    if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit)) {
       int teCount = trackedEntityStore.getTrackedEntityCountForGridWithMaxTeiLimit(params);
 
       if (teCount > maxTeiLimit) {

diff --git a/...rvice-core/src/test/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityServiceTest.java b/...rvice-core/src/test/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityServiceTest.java
@@ -101,6 +101,7 @@ void setup() {
     params.setProgram(new Program("Test program"));
     params.getProgram().setMaxTeiCountToReturn(10);
     params.setTrackedEntityUids(Set.of("1"));
+    params.setSkipPaging(true);
   }
 
   @Test

diff --git a/...src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java b/...src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
@@ -596,7 +596,7 @@ private boolean isProgramMinAttributesViolated(TrackedEntityQueryParams params)
   }
 
   private void checkIfMaxTeiLimitIsReached(TrackedEntityQueryParams params, int maxTeiLimit) {
-    if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit )) {
+    if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit)) {
       int teCount = trackedEntityStore.getTrackedEntityCountWithMaxTrackedEntityLimit(params);
 
       if (teCount > maxTeiLimit) {