Allon Mureinik has uploaded a new change for review.
Change subject: engine: Replace junit.framework with org.junit
......................................................................
engine: Replace junit.framework with org.junit
Replaced imports of deprecated junit.framework classes with their modern
org.junit counterparts.
Change-Id: Ibed4fc6738717cee4a0ac5e134e982c603ddca7e
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.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/QueriesCommandBaseTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.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/SetVmTicketCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperQueriesCommandType.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/VmHandlerTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.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/storage/GetIscsiBondsByStoragePoolIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/PairTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraintTest.java
M
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/IntegerCompatTest.java
M
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringHelperTest.java
M
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/VersionTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/IscsiBondDaoTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
M
backend/manager/modules/extensions-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java
M
backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/invocation/CurrentTest.java
M
backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/BasicAuthorizationSchemeTest.java
M
backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/ChallengerTest.java
M
backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/ReflectionHelperTest.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/SsoMapperTest.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/VersionUtilsTest.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleterTest.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/OsValueAutoCompleterTest.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/KDCLocatorTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializerTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializerTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/predicates/DisplayInterfaceEqualityPredicateTest.java
M
backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java
M
backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java
M
frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/LinqTest.java
M
frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
M
frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
57 files changed, 82 insertions(+), 107 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/27774/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java
index 9ce02ea..e0dda3c 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertNotSame;
+import static org.junit.Assert.assertNotSame;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index cc4d9f3..de026d2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
index 00fc77b..9842b60 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyList;
import static org.mockito.Mockito.doAnswer;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
index 9c9da41..b990516 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyList;
import static org.mockito.Mockito.doAnswer;
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 6b820e7..9ca2756 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
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.doReturn;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java
index b22de34..5bb1bf2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
index e833cde..458a7e1 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
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 2e0ab9d..29c94a2 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
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetVmTicketCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetVmTicketCommandTest.java
index 5a47786..62075c2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetVmTicketCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetVmTicketCommandTest.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.junit.Before;
import org.junit.Test;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java
index 1f3eb01..71468c5 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java
@@ -17,8 +17,7 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.apache.commons.collections.Transformer;
import org.apache.commons.collections.TransformerUtils;
import org.apache.commons.lang.StringUtils;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperQueriesCommandType.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperQueriesCommandType.java
index bbdac3d..96e2146 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperQueriesCommandType.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperQueriesCommandType.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.fail;
import java.lang.reflect.Field;
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 9902a70..13d8f73 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
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
index 45ad727..f795882 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
@@ -19,7 +19,7 @@
//import java.util.HashMap;
//import java.util.List;
//
-//import junit.framework.Assert;
+//import org.junit.Assert;
//
//import org.junit.Before;
//import org.junit.Test;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java
index 3f37813..7862e30 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java
@@ -2,7 +2,7 @@
import java.util.ArrayList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
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 f29d9ec..14a9fae 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
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll.network.host;
-import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
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/storage/GetIscsiBondsByStoragePoolIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetIscsiBondsByStoragePoolIdQueryTest.java
index 0915037..7fc8517 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetIscsiBondsByStoragePoolIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetIscsiBondsByStoragePoolIdQueryTest.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll.storage;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static junit.framework.Assert.assertEquals;
import java.util.Collections;
import java.util.List;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
index bb7e3d8..f8bdea2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll.storage;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
index 73d0111..0e929e9 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
@@ -9,8 +9,7 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.compat.Guid;
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
index e10a630..723b0f3 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.common.businessentities;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class StorageFormatTypeTest {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java
index ed477e8..cd94681 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java
@@ -2,7 +2,7 @@
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class StorageTypeTest {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
index 7c4e447..ff44f88 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.businessentities;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.util.Map;
import org.junit.Test;
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java
index 647982b..3a4ea08 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java
@@ -8,9 +8,8 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import junit.framework.Assert;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigCommon;
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
index 64780a1..7997b63 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
@@ -8,9 +8,8 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import junit.framework.Assert;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.ovirt.engine.core.common.config.Config;
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java
index 6191f02..4cd34f8 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java
@@ -3,8 +3,8 @@
import java.math.BigDecimal;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
public class ObjectUtilsTest {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/PairTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/PairTest.java
index 8698bd6..afca7d8 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/PairTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/PairTest.java
@@ -3,8 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class PairTest {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java
index 5d9d845..5184193 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.common.validation;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class NFSMountPointConstraintTest {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraintTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraintTest.java
index 2672e7f..c0ca4c7 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraintTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraintTest.java
@@ -7,8 +7,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/IntegerCompatTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/IntegerCompatTest.java
index 9d3803a..1b51051 100644
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/IntegerCompatTest.java
+++
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/IntegerCompatTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.compat;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class IntegerCompatTest {
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringHelperTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringHelperTest.java
index 3441947..129c8c3 100644
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringHelperTest.java
+++
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringHelperTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.compat;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class StringHelperTest {
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/VersionTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/VersionTest.java
index 86e8036..889f778 100644
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/VersionTest.java
+++
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/VersionTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.compat;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class VersionTest {
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
index 05769f8..366fe51 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
@@ -13,8 +13,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/IscsiBondDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/IscsiBondDaoTest.java
index bd6d1ab..86820e0 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/IscsiBondDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/IscsiBondDaoTest.java
@@ -2,11 +2,11 @@
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.IscsiBond;
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
index 2fcdda0..241741c 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java
@@ -9,9 +9,8 @@
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
-
import org.apache.commons.lang.StringUtils;
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.VmDevice;
import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType;
diff --git
a/backend/manager/modules/extensions-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java
b/backend/manager/modules/extensions-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java
index 98334ae..f323a61 100644
---
a/backend/manager/modules/extensions-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java
+++
b/backend/manager/modules/extensions-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.core.extensions.mgr;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/invocation/CurrentTest.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/invocation/CurrentTest.java
index 08f1e9c..8892572 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/invocation/CurrentTest.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/invocation/CurrentTest.java
@@ -16,10 +16,9 @@
package org.ovirt.engine.api.common.invocation;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
-import junit.framework.Assert;
public class CurrentTest extends Assert {
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/BasicAuthorizationSchemeTest.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/BasicAuthorizationSchemeTest.java
index 9d6dc36..55053f6 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/BasicAuthorizationSchemeTest.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/BasicAuthorizationSchemeTest.java
@@ -27,7 +27,7 @@
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
import static org.easymock.classextension.EasyMock.expect;
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/ChallengerTest.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/ChallengerTest.java
index 4f69296..7508c4f 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/ChallengerTest.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/security/auth/ChallengerTest.java
@@ -36,13 +36,12 @@
import org.jboss.resteasy.core.ResourceMethod;
import org.jboss.resteasy.core.ServerResponse;
import org.jboss.resteasy.spi.HttpRequest;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.mockito.Matchers.anyBoolean;
import org.ovirt.engine.api.common.invocation.Current;
-
-import junit.framework.Assert;
public class ChallengerTest extends Assert {
diff --git
a/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/ReflectionHelperTest.java
b/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/ReflectionHelperTest.java
index a10a3d4..048f85e 100644
---
a/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/ReflectionHelperTest.java
+++
b/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/ReflectionHelperTest.java
@@ -7,8 +7,7 @@
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class ReflectionHelperTest {
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/SsoMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/SsoMapperTest.java
index deba67f..7e98158 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/SsoMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/SsoMapperTest.java
@@ -7,9 +7,9 @@
import org.ovirt.engine.core.common.businessentities.SsoMethod;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class SsoMapperTest {
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
index a63e2a4..4562d4b 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.api.restapi.types;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.ovirt.engine.api.model.Boot;
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/VersionUtilsTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/VersionUtilsTest.java
index 7030735..9192d3c 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/VersionUtilsTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/VersionUtilsTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.api.restapi.utils;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.compat.Version;
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleterTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleterTest.java
index 315592d..f2b9e96 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleterTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleterTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.searchbackend;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class BaseConditionFieldAutoCompleterTest {
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/OsValueAutoCompleterTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/OsValueAutoCompleterTest.java
index ee4d62b..b580049 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/OsValueAutoCompleterTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/OsValueAutoCompleterTest.java
@@ -6,8 +6,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.theories.DataPoints;
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java
index 4c16820..410cbc7 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.searchbackend;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
index 575ba44..dfdb03d 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
@@ -4,7 +4,7 @@
import java.util.Arrays;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/KDCLocatorTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/KDCLocatorTest.java
index 141974e..f79bb16 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/KDCLocatorTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/KDCLocatorTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.utils;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.utils.dns.DnsSRVLocator.DnsSRVResult;
import org.ovirt.engine.core.utils.kerberos.KDCLocator;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
index 94de094..e32d16d 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
@@ -1,5 +1,5 @@
package org.ovirt.engine.core.utils;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.VmPool;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
index dd66445..aa413cf 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
@@ -10,7 +10,7 @@
import java.util.List;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializerTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializerTest.java
index b50e15e..a64fe75 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializerTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializerTest.java
@@ -4,9 +4,8 @@
import java.util.HashMap;
-import junit.framework.Assert;
-
import org.apache.commons.lang.SerializationException;
+import org.junit.Assert;
import org.junit.Test;
/**
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializerTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializerTest.java
index b845b19..524af8f 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializerTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializerTest.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.utils.serialization.json;
import static org.junit.Assert.assertEquals;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
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 5575e1a..c36ef92 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
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.vdsbroker;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -12,7 +12,7 @@
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/predicates/DisplayInterfaceEqualityPredicateTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/predicates/DisplayInterfaceEqualityPredicateTest.java
index 722c703..477a935 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/predicates/DisplayInterfaceEqualityPredicateTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/predicates/DisplayInterfaceEqualityPredicateTest.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.vdsbroker.vdsbroker.predicates;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java
index c944678..dc638f4 100644
---
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java
+++
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigLogicTest.java
@@ -2,9 +2,9 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import junit.framework.Assert;
import org.apache.log4j.Logger;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.ovirt.engine.core.config.entity.ConfigKey;
diff --git
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java
index c226d80..7615b71 100644
---
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java
+++
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/config/EngineConfigTest.java
@@ -4,9 +4,8 @@
import java.net.URLDecoder;
import java.util.List;
-import junit.framework.Assert;
-
import org.apache.log4j.Logger;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.ovirt.engine.core.config.entity.ConfigKey;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/LinqTest.java
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/LinqTest.java
index db5601d..2a32705 100644
---
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/LinqTest.java
+++
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/LinqTest.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.Arrays;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
index f001e43..e1bfb97 100644
---
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
+++
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.ui.uicommonweb.validation;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
public class HostWithProtocolAndPortAddressValidationTest {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
index 6877013..24c3ad4 100644
---
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
+++
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.ui.uicommonweb.validation;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.VmPool;
--
To view, visit http://gerrit.ovirt.org/27774
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibed4fc6738717cee4a0ac5e134e982c603ddca7e
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
