Allon Mureinik has uploaded a new change for review.
Change subject: core: MockConfigRule: Use @ClassRule
......................................................................
core: MockConfigRule: Use @ClassRule
Use @ClassRule instead of @Rule for MockConfigRule wherever possible, so
that the rule will only be run once, enhancing the tests' performance.
Change-Id: Ie5130616766288e83518687547bb32903ea4713c
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractSysprepQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetConfigurationValueQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
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/SetupNetworksParametersTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/VersionSupportTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java
28 files changed, 60 insertions(+), 54 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/9714/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractSysprepQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractSysprepQueryTest.java
index f4131e2..b638f6a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractSysprepQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractSysprepQueryTest.java
@@ -2,7 +2,7 @@
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -13,6 +13,6 @@
*/
public abstract class AbstractSysprepQueryTest<P extends
VdcQueryParametersBase, Q extends QueriesCommandBase<? extends P>> extends
AbstractUserQueryTest<P, Q> {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.AdUserName, ""));
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
index 8a6fc44..7e09e90 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
@@ -5,9 +5,9 @@
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.mock;
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
import java.util.ArrayList;
@@ -16,7 +16,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -61,7 +61,7 @@
private static int FREE_SPACE_LOW = 10;
private static int FREE_SPACE_CRITICAL_LOW_IN_GB = 5;
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.MaxBlockDiskSize, MAX_BLOCK_SIZE),
mockConfig(ConfigValues.FreeSpaceLow, FREE_SPACE_LOW),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
index c659f84..e438de5 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
@@ -17,7 +17,7 @@
import java.util.Map;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -39,7 +39,7 @@
public class AutoRecoveryManagerTest {
private AutoRecoveryManager manager;
- @Rule
+ @ClassRule
public static MockConfigRule mcr =
new MockConfigRule(mockConfig(ConfigValues.AutoRecoveryAllowedTypes, new
HashMap<String, String>()));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
index 594068c..faeeedd 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
@@ -5,6 +5,7 @@
import static org.mockito.Mockito.mock;
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.theories.DataPoints;
@@ -48,7 +49,7 @@
@Rule
public static final RandomUtilsSeedingRule rusr = new
RandomUtilsSeedingRule();
- @Rule
+ @ClassRule
public static final MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.AsyncTaskPollingRate, 10),
mockConfig(ConfigValues.AsyncTaskStatusCacheRefreshRateInSeconds,
10),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
index 9b53ce5..d830073 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
@@ -16,6 +16,7 @@
import org.apache.commons.lang.RandomStringUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.ovirt.engine.core.bll.session.SessionDataContainer;
@@ -33,7 +34,7 @@
/** A test case for {@link CommandBase} */
public class CommandBaseTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.IsMultilevelAdministrationOn, false));
@Rule
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetConfigurationValueQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetConfigurationValueQueryTest.java
index 79585c1..d2ba1fd 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetConfigurationValueQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetConfigurationValueQueryTest.java
@@ -4,7 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.when;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
@@ -14,7 +14,7 @@
public class GetConfigurationValueQueryTest extends
AbstractUserQueryTest<GetConfigurationValueParameters,
GetConfigurationValueQuery<GetConfigurationValueParameters>> {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule();
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java
index 7f4d561..107660d 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java
@@ -36,7 +36,7 @@
private static final Version EXISTING_CLUSTER_VERSION = new Version("3.1");
@Rule
- public static MockConfigRule mcr = new MockConfigRule(
+ public MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.oVirtISOsRepositoryPath,
OVIRT_ISOS_REPOSITORY_PATH),
mockConfig(ConfigValues.DataDir, OVIRT_ISOS_DATA_DIR),
mockConfig(ConfigValues.OvirtIsoPrefix, OVIRT_ISO_PREFIX),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
index ee40044..3fcee0f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
@@ -13,7 +13,7 @@
import java.util.List;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -48,7 +48,7 @@
protected Guid diskImageGuid = Guid.NewGuid();
protected Guid vmId = Guid.NewGuid();
- @Rule
+ @ClassRule
public static final MockConfigRule mcr = new MockConfigRule(
mockConfig
(ConfigValues.HotPlugUnsupportedOsList,
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
index a47f493..4d12acf 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
@@ -10,8 +10,8 @@
import javax.validation.ConstraintViolation;
+import org.junit.ClassRule;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
import org.ovirt.engine.core.common.action.ImportVmParameters;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
@@ -25,7 +25,7 @@
public class ImportVmCommandTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule();
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java
index 1c29168..1e83fbe 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java
@@ -9,7 +9,7 @@
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -33,7 +33,7 @@
private static final String VALID_OVIRT_VERSION = "6.2";
private static final String INVALID_OVIRT_VERSION = "5.8";
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.OvirtIsoPrefix, OVIRT_ISO_PREFIX),
mockConfig(ConfigValues.DataDir, "."),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
index 53a7ed7..0e8dd5d 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
@@ -13,7 +13,7 @@
import java.util.List;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.ovirt.engine.core.bll.adbroker.AdActionType;
@@ -32,7 +32,7 @@
protected static final String NAME_TO_SEARCH = "gandalf";
- @Rule
+ @ClassRule
public static final MockConfigRule mcr =
new MockConfigRule(
mockConfig(ConfigValues.LDAPSecurityAuthentication,
"SIMPLE"),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
index 3f99c56..9afdf39 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java
@@ -10,6 +10,7 @@
import java.util.Arrays;
import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +38,7 @@
@RunWith(MockitoJUnitRunner.class)
public class RemoveImageCommandTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.VdcVersion, "3.1"));
@Rule
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
index 2940282..853d465 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
@@ -13,7 +13,7 @@
import java.util.List;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -45,7 +45,7 @@
@RunWith(MockitoJUnitRunner.class)
public class RestoreAllSnapshotCommandTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr =
new MockConfigRule(
mockConfig(ConfigValues.FreeSpaceLow, 5),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
index 5c620b3..9fc8df7 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
@@ -22,7 +22,7 @@
import java.util.List;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -64,7 +64,7 @@
@RunWith(MockitoJUnitRunner.class)
public class RunVmCommandTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.VdsSelectionAlgorithm, "General", "0"),
mockConfig(ConfigValues.PredefinedVMProperties, "3.0", "0"),
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 6a5e7fa..6ce5e4a 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
@@ -8,8 +8,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.junit.ClassRule;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
@@ -40,7 +40,7 @@
public class SearchQueryTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.SearchResultsLimit, 100),
mockConfig(ConfigValues.DBSearchTemplate,
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
index e70f495..c843204 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
@@ -9,7 +9,7 @@
import javax.validation.Validator;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.action.SetupNetworksParameters;
import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface;
@@ -19,7 +19,7 @@
public class SetupNetworksParametersTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.ManagementNetwork, "ovirtmgmt"),
mockConfig(ConfigValues.NetworkConnectivityCheckTimeoutInSeconds,
100));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
index dc6f544..806c08a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java
@@ -16,7 +16,7 @@
import java.util.List;
import java.util.Set;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher;
@@ -50,7 +50,7 @@
@RunWith(MockitoJUnitRunner.class)
public class UpdateVdsGroupCommandTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule();
private static final Version VERSION_1_0 = new Version(1, 0);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
index 02ef88e..a2023eb 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
@@ -14,7 +14,7 @@
import java.util.HashSet;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -56,7 +56,7 @@
@Mock
private VdsDAO vdsDAO;
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.MaxVmNameLengthWindows, 15),
mockConfig(ConfigValues.MaxVmNameLengthNonWindows, 64),
@@ -94,6 +94,7 @@
params.setVmStaticData(vmStatic);
command = spy(new UpdateVmCommand<VmManagementParametersBase>(params) {
+ @Override
protected VDSGroup getVdsGroup() {
return group;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
index c17bd71..a3b804a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
@@ -12,7 +12,7 @@
import java.util.List;
import java.util.Map;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -63,7 +63,7 @@
@Mock
private DbFacade dbFacade;
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.ShareableDiskEnabled,
Version.v3_1.toString(), true)
);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java
index 28fef91..92fd8c9 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java
@@ -23,7 +23,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -36,7 +36,7 @@
*/
public class DirectorySearcherTest extends AbstractLdapTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.LDAPQueryTimeout, 2),
mockConfig(ConfigValues.LDAPConnectTimeout,10),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
index ad8c6a3..43eff04 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
@@ -3,7 +3,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
import org.ovirt.engine.core.common.businessentities.storage_domains;
@@ -12,7 +12,7 @@
public class StorageDomainSpaceCheckerTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule();
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQueryTest.java
index 9b92b32..b0f1c56 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQueryTest.java
@@ -11,7 +11,7 @@
import java.util.Map;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.bll.AbstractQueryTest;
import org.ovirt.engine.core.common.config.ConfigValues;
@@ -35,7 +35,7 @@
+
"<peer><uuid>85c42b0d-c2b7-424a-ae72-5174c25da40b</uuid><hostname>testserver2</hostname><connected>1</connected><state>3</state></peer></peerStatus></cliOutput>";
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.ConnectToServerTimeoutInSeconds,
CONNECT_TO_SERVER_TIMEOUT),
mockConfig(ConfigValues.GlusterPeerStatusCommand,
GLUSTER_PEER_STATUS_CMD));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
index c562bc4..79c0cdd 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
@@ -18,6 +18,7 @@
import org.hamcrest.Matcher;
import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -75,8 +76,8 @@
@Mock
private ClusterUtils clusterUtils;
- @Rule
- public MockConfigRule mcr = new MockConfigRule(
+ @ClassRule
+ public static MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.GlusterRefreshRateLight, 5),
mockConfig(ConfigValues.GlusterRefreshRateHeavy, 300));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
index 8a57a4f..88c1547 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
@@ -12,7 +12,7 @@
import java.util.List;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.bll.AbstractQueryTest;
import org.ovirt.engine.core.common.businessentities.LUNs;
@@ -35,7 +35,7 @@
public class GetDeviceListQueryTest extends
AbstractQueryTest<GetDeviceListQueryParameters,
GetDeviceListQuery<GetDeviceListQueryParameters>> {
- @Rule
+ @ClassRule
public static final MockConfigRule mcr = new MockConfigRule();
private DbFacade dbFacadeMock;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
index 067c80b..2ba0593 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
@@ -12,6 +12,7 @@
import java.util.ArrayList;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,7 +56,7 @@
public class RemoveStorageDomainTest {
private static final Version VDS_COMPATIBILITY_VERSION = new Version(2, 2);
- @Rule
+ @ClassRule
public static MockConfigRule mcr =
new MockConfigRule(
MockConfigRule.mockConfig(ConfigValues.IsNeedSupportForOldVgAPI,
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
index 6598e5a..e61a9ae 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
@@ -7,7 +7,7 @@
import static org.mockito.Mockito.when;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.action.StoragePoolManagementParameter;
import org.ovirt.engine.core.common.businessentities.storage_pool;
@@ -20,7 +20,7 @@
public class StorageHandlingCommandBaseTest {
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new MockConfigRule();
StorageHandlingCommandBase<StoragePoolManagementParameter> cmd;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/VersionSupportTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/VersionSupportTest.java
index ddb6fc8..bd58a7c 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/VersionSupportTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/VersionSupportTest.java
@@ -6,7 +6,7 @@
import java.util.Collections;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Version;
@@ -16,7 +16,7 @@
private static final Version VALID_VERSION = new Version(1, 0);
- @Rule
+ @ClassRule
public static final MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.SupportedClusterLevels,
Collections.singleton(VALID_VERSION))
);
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java
index 6fead75..4f54f3a 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import org.junit.Assert;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.OriginType;
@@ -16,9 +16,9 @@
public class OvfVmWriterTest {
- @Rule
- public MockConfigRule mockConfigRule = new
MockConfigRule(MockConfigRule.mockConfig(ConfigValues.VdcVersion,
- "1.0.0.0"));
+ @ClassRule
+ public static MockConfigRule mockConfigRule =
+ new
MockConfigRule(MockConfigRule.mockConfig(ConfigValues.VdcVersion, "1.0.0.0"));
@Test
public void test() {
--
To view, visit http://gerrit.ovirt.org/9714
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5130616766288e83518687547bb32903ea4713c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
