From 94a7b12235f5add266871e02db3ad2911b930389 Mon Sep 17 00:00:00 2001 From: Diego Zambelli Sessona Date: Thu, 21 Mar 2024 17:29:24 +0100 Subject: Run tests in FakeQueryChangesTest for paginationType NONE The tests in FakeQueryChangesTest were executed only for the default pagination (OFFSET) and SEARCH_AFTER Release-Notes: skip Change-Id: Ic5c84bdc28fccbf0a4c931d7137ce8f232907622 --- java/com/google/gerrit/index/QueryOptions.java | 4 ++++ java/com/google/gerrit/index/testing/AbstractFakeIndex.java | 8 ++++++-- .../query/change/FakeQueryChangesLatestIndexVersionTest.java | 7 +++++++ .../query/change/FakeQueryChangesPreviousIndexVersionTest.java | 7 +++++++ .../google/gerrit/server/query/change/FakeQueryChangesTest.java | 4 ++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/index/QueryOptions.java b/java/com/google/gerrit/index/QueryOptions.java index 29ab6d0119..40677a18da 100644 --- a/java/com/google/gerrit/index/QueryOptions.java +++ b/java/com/google/gerrit/index/QueryOptions.java @@ -128,4 +128,8 @@ public abstract class QueryOptions { limit(), filter.apply(this)); } + + public int getLimitBasedOnPaginationType() { + return PaginationType.NONE == config().paginationType() ? limit() : pageSize(); + } } diff --git a/java/com/google/gerrit/index/testing/AbstractFakeIndex.java b/java/com/google/gerrit/index/testing/AbstractFakeIndex.java index 4197c64011..9101ae5ff8 100644 --- a/java/com/google/gerrit/index/testing/AbstractFakeIndex.java +++ b/java/com/google/gerrit/index/testing/AbstractFakeIndex.java @@ -135,10 +135,14 @@ public abstract class AbstractFakeIndex implements Index { .findFirst() .orElse(-1) + 1; - int toIndex = Math.min(fromIndex + opts.pageSize(), valueList.size()); + int toIndex = Math.min(fromIndex + opts.getLimitBasedOnPaginationType(), valueList.size()); results = valueList.subList(fromIndex, toIndex); } else { - results = valueStream.skip(opts.start()).limit(opts.pageSize()).collect(toImmutableList()); + results = + valueStream + .skip(opts.start()) + .limit(opts.getLimitBasedOnPaginationType()) + .collect(toImmutableList()); } queryCount++; } diff --git a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesLatestIndexVersionTest.java b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesLatestIndexVersionTest.java index 4dde452dc9..df6ff5a15e 100644 --- a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesLatestIndexVersionTest.java +++ b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesLatestIndexVersionTest.java @@ -33,4 +33,11 @@ public class FakeQueryChangesLatestIndexVersionTest extends FakeQueryChangesTest config.setString("index", null, "paginationType", "SEARCH_AFTER"); return config; } + + @ConfigSuite.Config + public static Config nonePaginationType() { + Config config = defaultConfig(); + config.setString("index", null, "paginationType", "NONE"); + return config; + } } diff --git a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesPreviousIndexVersionTest.java b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesPreviousIndexVersionTest.java index 95896dc991..805c99abdb 100644 --- a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesPreviousIndexVersionTest.java +++ b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesPreviousIndexVersionTest.java @@ -43,4 +43,11 @@ public class FakeQueryChangesPreviousIndexVersionTest extends FakeQueryChangesTe config.setString("index", null, "paginationType", "SEARCH_AFTER"); return config; } + + @ConfigSuite.Config + public static Config nonePaginationType() { + Config config = againstPreviousIndexVersion(); + config.setString("index", null, "paginationType", "NONE"); + return config; + } } diff --git a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesTest.java index 3968a33707..af14683e8b 100644 --- a/javatests/com/google/gerrit/server/query/change/FakeQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/FakeQueryChangesTest.java @@ -19,10 +19,12 @@ import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.a import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block; import static com.google.gerrit.common.data.GlobalCapability.QUERY_LIMIT; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; +import static org.junit.Assume.assumeFalse; import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; +import com.google.gerrit.index.PaginationType; import com.google.gerrit.index.testing.AbstractFakeIndex; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.index.change.ChangeIndexCollection; @@ -83,6 +85,7 @@ public abstract class FakeQueryChangesTest extends AbstractQueryChangesTest { @UseClockStep @SuppressWarnings("unchecked") public void noLimitQueryPaginates() throws Exception { + assumeFalse(PaginationType.NONE == getCurrentPaginationType()); TestRepository testRepo = createProject("repo"); // create 4 changes insert(testRepo, newChange(testRepo)); @@ -110,6 +113,7 @@ public abstract class FakeQueryChangesTest extends AbstractQueryChangesTest { @UseClockStep @SuppressWarnings("unchecked") public void internalQueriesPaginate() throws Exception { + assumeFalse(PaginationType.NONE == getCurrentPaginationType()); // create 4 changes TestRepository testRepo = createProject("repo"); insert(testRepo, newChange(testRepo)); -- cgit v1.2.3