From 0ffa19ad190dbbd58eb9009b18929bfd2b8e11e4 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Mon, 17 Oct 2016 09:14:09 +0000 Subject: [PATCH] REPO-1417: Allow Discovery to be disabled - add -ve test(s) - added test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/tests/DiscoveryApiTest.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java b/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java index db6770039d..94036a2c22 100644 --- a/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java @@ -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); + } + } }