From c7ac71bea0367db0ec3660e946d492420a29342f Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad_w@gmx.de>
Date: Tue, 25 Oct 2016 16:08:05 +0200
Subject: [PATCH] fix failing test (by mocking more functionality of nameMock)

---
 .../ldap/core/LdapTemplateLookupTest.java     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
index 2ca18974..3b2d5f16 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
@@ -16,12 +16,13 @@
 
 package org.springframework.ldap.core;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.ldap.NameNotFoundException;
-import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
-import org.springframework.ldap.support.LdapUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
 
 import javax.naming.Name;
 import javax.naming.NamingException;
@@ -30,11 +31,11 @@ import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
 import javax.naming.ldap.LdapName;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.ldap.NameNotFoundException;
+import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
+import org.springframework.ldap.support.LdapUtils;
 
 public class LdapTemplateLookupTest {
 
@@ -196,7 +197,6 @@ public class LdapTemplateLookupTest {
     }
 
     @Test
-    @Ignore("Currently throws a NPE due to the nameMock.getAll returning null")
     public void testFindByDn() throws NamingException {
         expectGetReadOnlyContext();
 
@@ -207,6 +207,7 @@ public class LdapTemplateLookupTest {
         when(dirContextMock.lookup(nameMock)).thenReturn(expectedContext);
         when(odmMock.mapFromLdapDataEntry(expectedContext, expectedClass)).thenReturn(transformed);
 
+        when(nameMock.getAll()).thenReturn(Collections.<String> enumeration(Collections.<String> emptyList()));
         // Perform test
         Object result = tested.findByDn(nameMock, expectedClass);
         assertThat(result).isSameAs(transformed);