Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Mockito Update

Browse Source
This commit is contained in:
Josh Cummings
2022-08-09 12:04:05 -06:00
parent b8682fc8e9
commit baf21e4782
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTest.java
View File

@@ -4,7 +4,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock;

39
core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
View File

@@ -16,13 +16,25 @@
package org.springframework.ldap.core;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import java.util.List;
import javax.naming.Binding;
import javax.naming.CompositeName;
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.LdapName;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
import org.mockito.verification.VerificationMode;
import org.springframework.LdapDataEntry;
import org.springframework.dao.EmptyResultDataAccessException;
@@ -38,26 +50,11 @@ import org.springframework.ldap.query.LdapQuery;
import org.springframework.ldap.query.LdapQueryBuilder;
import org.springframework.ldap.support.LdapUtils;
import javax.naming.Binding;
import javax.naming.CompositeName;
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import javax.naming.ldap.LdapName;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;

7
core/src/test/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategyTests.java
View File

@@ -1,13 +1,12 @@
package org.springframework.ldap.core.support;
import javax.naming.ldap.LdapContext;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import javax.naming.ldap.LdapContext;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.verify;
/**