[Engine-patches] Change in ovirt-engine[master]: core: MockEJBStrategyRule JUnit 4.10 upgrade

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: MockEJBStrategyRule JUnit 4.10 upgrade
......................................................................

core: MockEJBStrategyRule JUnit 4.10 upgrade

Extended TestWatcher instead of the deprecated TestWatchman.

Change-Id: I5100ccf9cd5237e6e46375f6f507ba2daa473ce2
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/9712/1

diff --git 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
index 74a7fa1..1aa8afa 100644
--- 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
+++ 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
@@ -15,8 +15,8 @@
 import javax.transaction.TransactionManager;
 
 import org.junit.Assert;
-import org.junit.rules.TestWatchman;
-import org.junit.runners.model.FrameworkMethod;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 import org.ovirt.engine.core.utils.ejb.BeanProxyType;
 import org.ovirt.engine.core.utils.ejb.BeanType;
 import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType;
@@ -30,7 +30,7 @@
  *
  * To use it, simple add a {@link MockEJBStrategyRule} member to your test, 
with the {@link @Rule} annotation.
  */
-public class MockEJBStrategyRule extends TestWatchman {
+public class MockEJBStrategyRule extends TestWatcher {
 
     private EJBUtilsStrategy origStrategy;
     private EJBUtilsStrategy mockStrategy;
@@ -67,7 +67,7 @@
     }
 
     @Override
-    public void starting(FrameworkMethod method) {
+    public void starting(Description description) {
         try {
             mockTransactionManagement();
             for (Map.Entry<BeanType, Object> mockBeanEntry : 
mockBeanMap.entrySet()) {
@@ -79,7 +79,7 @@
     }
 
     @Override
-    public void finished(FrameworkMethod method) {
+    public void finished(Description description) {
         EjbUtils.setStrategy(origStrategy);
     }
 }


--
To view, visit http://gerrit.ovirt.org/9712
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5100ccf9cd5237e6e46375f6f507ba2daa473ce2
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