From 71f544e35953214914e5dfce601adb82cd43ae20 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 11 Aug 2016 12:11:22 +0200
Subject: [PATCH] Fixed wrong tests: (please cherry-pick) - locking/unlocking
an existing user account always have a valid user id set
---
.../user/AddressbookAdminUserSessionBean.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
index f42f013..2bfda85 100644
--- a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
@@ -169,9 +169,12 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
if (null == user) {
// Abort here
throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() instanceof Long) {
+ } else if (user.getUserId() == null) {
// Id is set
- throw new IllegalArgumentException("user.userId is not null"); //NOI18N
+ throw new NullPointerException("user.userId is null"); //NOI18N
+ } else if (user.getUserId() < 1) {
+ // Id is set
+ throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is null", user.getUserId())); //NOI18N
} else if (user.getUserContact() == null) {
// Throw NPE again
throw new NullPointerException("user.userContact is null"); //NOI18N
@@ -256,9 +259,12 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
if (null == user) {
// Abort here
throw new NullPointerException("user is null"); //NOI18N
- } else if (user.getUserId() instanceof Long) {
+ } else if (user.getUserId() == null) {
// Id is set
- throw new IllegalArgumentException("user.userId is not null"); //NOI18N
+ throw new NullPointerException("user.userId is null"); //NOI18N
+ } else if (user.getUserId() < 1) {
+ // Id is set
+ throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is null", user.getUserId())); //NOI18N
} else if (user.getUserContact() == null) {
// Throw NPE again
throw new NullPointerException("user.userContact is null"); //NOI18N
--
2.39.5