Allon Mureinik has uploaded a new change for review.
Change subject: core: MockEJBStrategyRule: Use @ClassRule
......................................................................
core: MockEJBStrategyRule: Use @ClassRule
Use @ClassRule instead of @Rule for MockEJBStrategyRule wherever
possible, so that the rule will only be run once, enhancing the tests'
performance.
Change-Id: I03f0e6e71caaab87c1dc0f730a715cc25efc88d7
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
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/gluster/GlusterManagerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java
7 files changed, 17 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/9715/1
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 faeeedd..1fd2859 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
@@ -56,8 +56,8 @@
mockConfig(ConfigValues.AsyncTaskStatusCachingTimeInMinutes, 10)
);
- @Rule
- public MockEJBStrategyRule ejbRule = new
MockEJBStrategyRule(BeanType.SCHEDULER, mock(SchedulerUtil.class));
+ @ClassRule
+ public static MockEJBStrategyRule ejbRule = new
MockEJBStrategyRule(BeanType.SCHEDULER, mock(SchedulerUtil.class));
@SuppressWarnings({ "unchecked", "rawtypes", "serial" })
@DataPoints
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 d830073..7b0823a 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
@@ -17,7 +17,6 @@
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;
import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler;
@@ -37,8 +36,8 @@
@ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.IsMultilevelAdministrationOn, false));
- @Rule
- public MockEJBStrategyRule ejbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule ejbRule = new MockEJBStrategyRule();
/** The session to use */
private String session = "";
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 79c0cdd..712a024 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
@@ -19,7 +19,6 @@
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;
import org.mockito.ArgumentMatcher;
@@ -81,8 +80,8 @@
mockConfig(ConfigValues.GlusterRefreshRateLight, 5),
mockConfig(ConfigValues.GlusterRefreshRateHeavy, 300));
- @Rule
- public MockEJBStrategyRule ejbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule ejbRule = new MockEJBStrategyRule();
private GlusterManager glusterManager;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
index bf714a3..35aa861 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
@@ -11,7 +11,7 @@
import java.util.ArrayList;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -69,8 +69,8 @@
private VDS vds;
storage_pool_iso_map map = null;
- @Rule
- public MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
@Test
public void statusSetInMap() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
index 1c92a38..1917200 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
@@ -9,7 +9,7 @@
import java.util.ArrayList;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -60,8 +60,8 @@
private VDS vds;
storage_pool_iso_map map = new storage_pool_iso_map();
- @Rule
- public MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
@Test
public void statusSetInMap() {
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 2ba0593..f3f157c 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
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import org.junit.ClassRule;
-import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -64,8 +63,8 @@
true)
);
- @Rule
- public MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
private final Guid STORAGE_DOMAIN_ID = Guid.NewGuid();
private final Guid STORAGE_POOL_ID = Guid.NewGuid();
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java
index c7f0eab..db89c84 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.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.junit.runner.RunWith;
import org.mockito.Mock;
@@ -36,8 +36,8 @@
@RunWith(MockitoJUnitRunner.class)
public class VdsUpdateRunTimeInfoTest {
- @Rule
- public MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
+ @ClassRule
+ public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule();
private VDS vds;
XmlRpcStruct[] vmInfo;
--
To view, visit http://gerrit.ovirt.org/9715
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03f0e6e71caaab87c1dc0f730a715cc25efc88d7
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
