From 185638885fce76129327c0228f1211a5dde23e45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2016 12:16:13 +0200 Subject: [PATCH] changed some tests (please cherry-pick) --- .../user/AddressbookAdminUserSessionBean.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java index 2bfda85..54f3b75 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java @@ -187,15 +187,15 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean } else if (user.getUserAccountStatus() == null) { // Throw NPE again throw new NullPointerException("user.userAccountStatus is null"); //NOI18N + } else if (!this.userBean.ifUserExists(user)) { + // Name already found + throw new UserNotFoundException(user); } else if (user.getUserAccountStatus() == UserAccountStatus.LOCKED) { // Account is locked throw new UserStatusLockedException(user); } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { - // Account is locked + // Account is unconfirmed throw new UserStatusUnconfirmedException(user); - } else if (!this.userBean.ifUserExists(user)) { - // Name already found - throw new UserNotFoundException(user); } else if (null == userLockReason) { // Throw NPE again throw new NullPointerException("userLockReason is null"); //NOI18N @@ -277,15 +277,15 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean } else if (user.getUserAccountStatus() == null) { // Throw NPE again throw new NullPointerException("user.userAccountStatus is null"); //NOI18N + } else if (!this.userBean.ifUserExists(user)) { + // Name already found + throw new UserNotFoundException(user); } else if (user.getUserAccountStatus() == UserAccountStatus.CONFIRMED) { - // Account is locked + // Account is confirmed throw new UserStatusConfirmedException(user); } else if (user.getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) { - // Account is locked + // Account is unconfirmed throw new UserStatusUnconfirmedException(user); - } else if (!this.userBean.ifUserExists(user)) { - // Name already found - throw new UserNotFoundException(user); } // Remove contact instance as this is not updated -- 2.39.2