mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
131465 cturlica: REPO-1417: Allow Discovery to be disabled - add -ve test(s) - added test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -75,6 +75,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
|
||||
private Descriptor serverDescriptor;
|
||||
@Mock
|
||||
private LicenseDescriptor licenseDescriptorMock;
|
||||
private DiscoveryApiWebscript discoveryApiWebscript;
|
||||
|
||||
private Date licenseIssuedAt;
|
||||
private Date licenseExpiresAt;
|
||||
@@ -112,9 +113,10 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
|
||||
when(licenseDescriptorMock.isClusterEnabled()).thenReturn(true);
|
||||
|
||||
// Override the descriptor service
|
||||
DiscoveryApiWebscript discoveryApiWebscript = applicationContext
|
||||
discoveryApiWebscript = applicationContext
|
||||
.getBean("webscript.org.alfresco.api.DiscoveryApiWebscript.get", DiscoveryApiWebscript.class);
|
||||
discoveryApiWebscript.setDescriptorService(descriptorServiceMock);
|
||||
discoveryApiWebscript.setEnabled(true);
|
||||
}
|
||||
|
||||
@After
|
||||
@@ -311,5 +313,21 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
|
||||
assertFalse(entitlements.getIsClusterEnabled());
|
||||
assertTrue(entitlements.getIsCryptodocEnabled());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDiscoveryDisabled() throws Exception
|
||||
{
|
||||
try
|
||||
{
|
||||
discoveryApiWebscript.setEnabled(false);
|
||||
|
||||
setRequestContext(null, user1, null);
|
||||
get("discovery", null, 501);
|
||||
}
|
||||
finally
|
||||
{
|
||||
discoveryApiWebscript.setEnabled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user