Allon Mureinik has uploaded a new change for review. Change subject: core: Remove LdapUser ctor used in tests ......................................................................
core: Remove LdapUser ctor used in tests Removed the ctor that isn't used anywhere in production code. Change-Id: I2bb78d1e8fcbc9b9ed0f0de4b4a8d9d16a050409 Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java 3 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/18120/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java index c6e6912..71642b2 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java @@ -31,7 +31,12 @@ @Override protected LdapUser getExpectedResult() { - return new LdapUser(NAME_TO_SEARCH, "melon!", Guid.newGuid(), DOMAIN); + LdapUser user = new LdapUser(); + user.setUserName(NAME_TO_SEARCH); + user.setPassword("melon!"); + user.setUserId(Guid.newGuid()); + user.setDomainControler(DOMAIN); + return user; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java index 6e10a9a..bd8050c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java @@ -46,14 +46,6 @@ mGroups = new HashMap<String, LdapGroup>(); } - public LdapUser(String userName, String password, Guid userId, String domainControler) { - mUserName = userName; - mPassword = password; - mUserId = userId; - mDomainControler = domainControler; - mGroups = new HashMap<String, LdapGroup>(); - } - public String getUserName() { return mUserName; } diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java index 59961ce..445d9da 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java @@ -16,7 +16,11 @@ @Before public void setUp() { - adUser = new LdapUser("UserName", "password", Guid.newGuid(), "DomainController"); + adUser = new LdapUser(); + adUser.setUserName("UserName"); + adUser.setPassword("password"); + adUser.setUserId(Guid.newGuid()); + adUser.setDomainControler("DomainController"); } /** Tests {@link VdcUser#VdcUser(LdapUser)) */ -- To view, visit http://gerrit.ovirt.org/18120 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bb78d1e8fcbc9b9ed0f0de4b4a8d9d16a050409 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