From 6faebf278d0de33e731d9dcefd79dc23d67b471f Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Tue, 20 Mar 2018 13:02:35 +0100
Subject: [PATCH] [Fix] Fixed broken tests

---
 .../strolch/privilege/handler/DefaultPrivilegeHandler.java | 4 ++--
 .../test/java/li/strolch/privilege/test/PrivilegeTest.java | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
index 9d93877a5..ee3bc17f6 100644
--- a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
+++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
@@ -549,9 +549,9 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
 
 		if (userRep.getLocale() != null)
 			locale = userRep.getLocale();
-		if (userRep.getUserState() != userState)
+		if (userRep.getUserState() != null)
 			userState = userRep.getUserState();
-		if (!userRep.getRoles().equals(roles))
+		if (userRep.getRoles() != null && !userRep.getRoles().equals(roles))
 			roles = userRep.getRoles();
 
 		// create new user
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
index 731b7db01..c76f1daaa 100644
--- a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
+++ b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
@@ -30,6 +30,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 
+import li.strolch.privilege.base.InvalidCredentialsException;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -129,8 +130,8 @@ public class PrivilegeTest extends AbstractPrivilegeTest {
 
 	@Test
 	public void testFailAuthenticationNOk() throws Exception {
-		this.exception.expect(AccessDeniedException.class);
-		this.exception.expectMessage("User admin failed to authenticate: Password is incorrect for admin");
+		this.exception.expect(InvalidCredentialsException.class);
+		this.exception.expectMessage("Password is incorrect for admin");
 		try {
 			login(ADMIN, ArraysHelper.copyOf(PASS_BAD));
 		} finally {
@@ -141,7 +142,7 @@ public class PrivilegeTest extends AbstractPrivilegeTest {
 	@Test
 	public void testFailAuthenticationPWNull() throws Exception {
 		this.exception.expect(PrivilegeException.class);
-		this.exception.expectMessage("User admin failed to authenticate: A password may not be empty!");
+		this.exception.expectMessage("A password may not be empty!");
 		try {
 			login(ADMIN, null);
 		} finally {