Skip to content

Commit 2292039

Browse files
authored
Merge pull request #474 from houxiufeng/dev_v2.5.0_addtest
modify AbstractSingleSignOnTest error
2 parents e51dbe0 + 73f8da8 commit 2292039

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,4 @@ dist/
111111
dist/*
112112
kafka-manager-web/src/main/resources/templates/
113113
.DS_Store
114+
kafka-manager-console/package-lock.json

kafka-manager-extends/kafka-manager-account/src/test/java/com/xiaojukeji/kafka/manager/account/AbstractSingleSignOnTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javax.servlet.http.HttpServletRequest;
2626
import javax.servlet.http.HttpServletResponse;
2727
import java.lang.reflect.Field;
28+
import java.util.HashMap;
2829

2930
/**
3031
* @author wyc
@@ -142,7 +143,7 @@ private void loginAndGetLdap2LdapEnabledReturnFalseTest() throws NoSuchFieldExce
142143
Field accountLdapEnabled = abstractSingleSignOn.getClass().getDeclaredField("accountLdapEnabled");
143144
FieldSetter.setField(abstractSingleSignOn, accountLdapEnabled, true);
144145

145-
Mockito.when(ldapAuthentication.authenticate(Mockito.anyString(), Mockito.anyString())).thenReturn(false);
146+
Mockito.when(ldapAuthentication.authenticate(Mockito.anyString(), Mockito.anyString())).thenReturn(null);
146147
Assert.assertEquals(abstractSingleSignOn.loginAndGetLdap(request, response, dto).toString(), Result.buildFrom(ResultStatus.LDAP_AUTHENTICATION_FAILED).toString());
147148
}
148149

@@ -158,7 +159,7 @@ private void loginAndGetLdap2LdapEnabledReturnTrueTest() throws NoSuchFieldExcep
158159
Field accountLdapEnabled = abstractSingleSignOn.getClass().getDeclaredField("accountLdapEnabled");
159160
FieldSetter.setField(abstractSingleSignOn, accountLdapEnabled, true);
160161

161-
Mockito.when(ldapAuthentication.authenticate(Mockito.anyString(), Mockito.anyString())).thenReturn(true);
162+
Mockito.when(ldapAuthentication.authenticate(Mockito.anyString(), Mockito.anyString())).thenReturn(new HashMap<>());
162163

163164
// 通过反射初始化成员变量,防止出现空指针异常
164165
Field authUserRegistrationRole = abstractSingleSignOn.getClass().getDeclaredField("authUserRegistrationRole");

0 commit comments

Comments
 (0)