Allon Mureinik has uploaded a new change for review.
Change subject: engine: Upgrade to JUnit 4.11
......................................................................
engine: Upgrade to JUnit 4.11
Upgrades to JUnit 4.11 in order to benefit from its performance
enhancements usability features.
JUnit 4.11 is slightly stricter than JUnit 4.10, so some changes were
required in order to facilitate this change:
1. Removed static modifier from members annotated with the @Rule
annotation, as this is no longer allowed, or replaced it with
@ClassRule wherever possible.
Note that having a static @Rule, if if allowed in earlier versions of
JUnit is probably a hidden bug just waiting to happen.
2. Replaced usages of JUnitMatchers, which is now deprecated, with the
standard CoreMatchers.
3. Removed useless calls to both(Matcher) that weren't preceded by
.and(Mathcer).
4. Removed the usage of the deprected
org.junit.internal.matchers.TypeSafeMatcher and replaced it with
org.hamcrest.TypeSafeMatcher (and in any event, importing a class
with the word "internal" in its package name has a big flashing red
light all over it).
5. Fixed the matchers' signatures in ValidationResultMatchers to use
<? super String> instead of <String>.
6. Fixed the wrong usage of is(Integer.class) to
is(instanceOf(Integer.class) in
AbstractGwtDynamicHostPageServletTest.
Change-Id: I1ab9c817ac6390bd12c725b5655dbd3fdf6d0c61
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/CommonVmPoolWithVmsCommandTestAbstract.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/network/cluster/NetworkClusterValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/RemoveProviderValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ValidationResultMatchers.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommandTest.java
M
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
M pom.xml
14 files changed, 27 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/27773/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 df652ac..e4bf19e 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
@@ -59,7 +59,7 @@
public class BackwardCompatibilityTaskCreationTest {
@Rule
- public static final RandomUtilsSeedingRule rusr = new
RandomUtilsSeedingRule();
+ public final RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
@ClassRule
public static final MockConfigRule mcr = new MockConfigRule(
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
index bb4f8c5..197b190 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
@@ -54,7 +54,7 @@
public abstract class CommonVmPoolWithVmsCommandTestAbstract {
@Rule
- public static MockConfigRule mcr = new MockConfigRule(
+ public MockConfigRule mcr = new MockConfigRule(
mockConfig(ConfigValues.MaxVmNameLengthWindows, 15),
mockConfig(ConfigValues.MaxVmNameLengthNonWindows, 64),
mockConfig(ConfigValues.MaxVmsInPool, 87),
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 39a543e..fbd426e 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
@@ -45,7 +45,7 @@
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.VdcVersion, "3.1"));
@Rule
- public static RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
+ public RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
@Mock
private SnapshotDao snapshotDAO;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java
index 1a4990d..a20baae 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll.network.cluster;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.both;
-import static org.junit.matchers.JUnitMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.hasItem;
import static org.mockito.Mockito.when;
import static
org.ovirt.engine.core.bll.validator.ValidationResultMatchers.failsWith;
import static
org.ovirt.engine.core.bll.validator.ValidationResultMatchers.isValid;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
index b1c39cc..f29d9ec 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
@@ -20,7 +20,7 @@
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.junit.Rule;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -51,7 +51,7 @@
private static final String BOND_NAME = "bond0";
private static final String MANAGEMENT_NETWORK_NAME = "management";
- @Rule
+ @ClassRule
public static MockConfigRule mcr = new
MockConfigRule(mockConfig(ConfigValues.ManagementNetwork,
MANAGEMENT_NETWORK_NAME),
mockConfig(ConfigValues.MultipleGatewaysSupported,
Version.v3_3.toString(), true),
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/RemoveProviderValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/RemoveProviderValidatorTest.java
index d4b8169..f9217d9 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/RemoveProviderValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/provider/RemoveProviderValidatorTest.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll.provider;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.both;
-import static org.junit.matchers.JUnitMatchers.containsString;
-import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
index 06e76df..619794c 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskImagesValidatorTest.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll.validator;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.both;
-import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -183,8 +183,7 @@
public void diskImagesDontExist() {
doReturn(false).when(validator).isDiskExists(disk1.getId());
doReturn(false).when(validator).isDiskExists(disk2.getId());
- assertThat(validator.diskImagesNotExist(),
-
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_NOT_EXIST)));
+ assertThat(validator.diskImagesNotExist(),
failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_NOT_EXIST));
}
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
index 0ddd891..a5e1b2e 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/DiskSnapshotsValidatorTest.java
@@ -17,7 +17,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.both;
import static org.mockito.Mockito.spy;
import static
org.ovirt.engine.core.bll.validator.ValidationResultMatchers.failsWith;
import static
org.ovirt.engine.core.bll.validator.ValidationResultMatchers.isValid;
@@ -60,7 +59,7 @@
@Test
public void diskSnapshotsDontExist() {
assertThat(validator.diskSnapshotsNotExist(Arrays.asList(Guid.newGuid())),
-
both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SNAPSHOTS_NOT_EXIST)));
+
failsWith(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SNAPSHOTS_NOT_EXIST));
}
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ValidationResultMatchers.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ValidationResultMatchers.java
index a182296..abafdf3 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ValidationResultMatchers.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ValidationResultMatchers.java
@@ -3,8 +3,7 @@
import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
-import org.junit.internal.matchers.TypeSafeMatcher;
-import org.junit.matchers.JUnitMatchers;
+import org.hamcrest.TypeSafeMatcher;
import org.ovirt.engine.core.bll.ValidationResult;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
@@ -39,7 +38,6 @@
* </pre>
*
* @see org.junit.Assert#assertThat(Object, Matcher)
- * @see JUnitMatchers
* @see CoreMatchers
*/
public class ValidationResultMatchers {
@@ -65,7 +63,7 @@
* The matcher to match against {@link
ValidationResult#getVariableReplacements()}
* @return A matcher matching any {@link ValidationResult} that it's
variable replacements match the given matcher.
*/
- public static Matcher<ValidationResult>
replacements(Matcher<Iterable<String>> matcher) {
+ public static Matcher<ValidationResult> replacements(Matcher<Iterable<?
super String>> matcher) {
return new Replacements(matcher);
}
@@ -103,9 +101,9 @@
private static class Replacements extends
TypeSafeMatcher<ValidationResult> {
- private Matcher<Iterable<String>> matcher;
+ private Matcher<Iterable<? super String>> matcher;
- public Replacements(Matcher<Iterable<String>> matcher) {
+ public Replacements(Matcher<Iterable<? super String>> matcher) {
this.matcher = matcher;
}
@@ -125,7 +123,7 @@
private Matcher<ValidationResult> matcher;
public Fails(VdcBllMessages expected) {
- matcher = JUnitMatchers.both(CoreMatchers.not(isValid())).and(new
WithMessage(expected));
+ matcher = CoreMatchers.both(CoreMatchers.not(isValid())).and(new
WithMessage(expected));
}
@Override
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
index 52af93d..de96247 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll.validator;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.both;
-import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -136,7 +136,7 @@
@Test
public void e1000VmInterfaceTypeWhenNotIsCompatibleWithOs() throws
Exception {
-
isCompatibleWithOsTest(both(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_VM_INTERFACE_TYPE_IS_NOT_SUPPORTED_BY_OS)),
+
isCompatibleWithOsTest(failsWith(VdcBllMessages.ACTION_TYPE_FAILED_VM_INTERFACE_TYPE_IS_NOT_SUPPORTED_BY_OS),
VmInterfaceType.e1000.getValue());
}
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
index 2b58086..f5bdb71 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
@@ -23,7 +23,7 @@
private static final String MANAGEMENT_NETWORK = "mgmt";
@Rule
- public static RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
+ public RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
@Rule
public MockConfigRule mcr = new MockConfigRule(
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommandTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommandTest.java
index 73946a6..87d9498 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommandTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommandTest.java
@@ -19,7 +19,7 @@
public class GetDeviceListVDSCommandTest {
@Rule
- public static RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
+ public RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
@Test
public void parseLunFromXmlRpcReturnsIscsiByDefault() throws Exception {
diff --git
a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
index 13a5add..d72504c 100644
---
a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
+++
b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.ui.frontend.server.gwt;
+import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -186,7 +187,7 @@
String sessionId = "sessionId"; //$NON-NLS-1$
VdcQueryType queryType = VdcQueryType.GetConfigurationValue;
Object result = testServlet.runPublicQuery(queryType,
mockConfigQueryParams, sessionId);
- assertThat(result, is(Integer.class));
+ assertThat(result, is(instanceOf(Integer.class)));
verify(mockConfigQueryParams).setSessionId(sessionId);
verify(mockConfigQueryParams).setHttpSessionId(sessionId);
verify(mockConfigQueryParams).setFiltered(testServlet.filterQueries());
diff --git a/pom.xml b/pom.xml
index ad7f45c..8d3b2f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<!-- Dependencies Versions -->
<commons-logging.version>1.1</commons-logging.version>
- <junit.version>4.10</junit.version>
+ <junit.version>4.11</junit.version>
<commons-codec.version>1.4</commons-codec.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-compress.version>1.4.1</commons-compress.version>
--
To view, visit http://gerrit.ovirt.org/27773
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ab9c817ac6390bd12c725b5655dbd3fdf6d0c61
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
