ofri masad has uploaded a new change for review. Change subject: core: Fix tests for Fast Quota Cache ......................................................................
core: Fix tests for Fast Quota Cache Fix failing tests for Fast Quota Caching. Change-Id: Ic08d357ab48ba3399b4071a39b817102e38d0a62 Signed-off-by: Ofri Masad <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/10438/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java index 6ce5e4a..8dc3930 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java @@ -44,7 +44,8 @@ public static MockConfigRule mcr = new MockConfigRule( mockConfig(ConfigValues.SearchResultsLimit, 100), mockConfig(ConfigValues.DBSearchTemplate, - "SELECT * FROM (SELECT *, ROW_NUMBER() OVER(%1$s) as RowNum FROM (%2$s)) as T1 ) as T2 %3$s") + "SELECT * FROM (SELECT *, ROW_NUMBER() OVER(%1$s) as RowNum FROM (%2$s)) as T1 ) as T2 %3$s"), + mockConfig(ConfigValues.MinimumPercentageToUpdateQuotaCache, 60) ); List<Disk> diskImageResultList = new ArrayList<Disk>(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java index a2bba54..951cd6b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll.quota; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -14,9 +15,11 @@ import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.Quota; +import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.QuotaDAO; +import org.ovirt.engine.core.utils.MockConfigRule; import java.util.ArrayList; import java.util.List; @@ -27,6 +30,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; +import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig; @RunWith(MockitoJUnitRunner.class) public class QuotaManagerTest { @@ -71,6 +75,11 @@ @Mock private QuotaDAO quotaDAO; + @ClassRule + public static MockConfigRule mcr = new MockConfigRule( + mockConfig(ConfigValues.MinimumPercentageToUpdateQuotaCache, 60) + ); + @Spy private QuotaManager quotaManager = QuotaManager.getInstance(); @Spy -- To view, visit http://gerrit.ovirt.org/10438 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic08d357ab48ba3399b4071a39b817102e38d0a62 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
