Allon Mureinik has submitted this change and it was merged. 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 <amureini@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(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/27774 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibed4fc6738717cee4a0ac5e134e982c603ddca7e Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Kobi Ianko <kobi@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Ori Liel <oliel@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server