Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-16 02:06:18 +01:00
Code Issues Packages Projects Releases Activity

Multiply floating store factories for type safety

Browse Source
This commit is contained in:
René Pfeuffer
2018-12-04 08:56:39 +01:00
parent 33f3216164
commit 3021bea65a
23 changed files with 245 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/AutoCompleteResourceTest.java
View File

@@ -67,7 +67,7 @@ public class AutoCompleteResourceTest {
xmlDB = mock(XmlDatabase.class);
when(storeConfig.get()).thenReturn(xmlDB);
when(storeFactory.getStore(any())).thenReturn(storeConfig);
when(storeFactory.withName(any())).thenCallRealMethod();
when(storeFactory.withType(any())).thenCallRealMethod();
XmlUserDAO userDao = new XmlUserDAO(storeFactory);
this.userDao = spy(userDao);
XmlGroupDAO groupDAO = new XmlGroupDAO(storeFactory);

4
scm-webapp/src/test/java/sonia/scm/security/SecureKeyResolverTest.java
View File

@@ -126,8 +126,8 @@ public class SecureKeyResolverTest
{
ConfigurationEntryStoreFactory factory = mock(ConfigurationEntryStoreFactory.class);
when(factory.withName(any())).thenCallRealMethod();
when(factory.getStore(argThat(storeParameters -> {
when(factory.withType(any())).thenCallRealMethod();
when(factory.<SecureKey>getStore(argThat(storeParameters -> {
assertThat(storeParameters.getName()).isEqualTo(SecureKeyResolver.STORE_NAME);
assertThat(storeParameters.getType()).isEqualTo(SecureKey.class);
return true;