inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
80701: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78593: First attempt at fixing FacetRestApiTest to run in bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 16:31:22 +00:00
parent dcb3bc2934
commit cde57422fc
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/test-java/org/alfresco/repo/web/scripts/solr/facet/FacetRestApiTest.java
View File

@@ -46,7 +46,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.*;
/** /**
* This class tests the ReST API of the {@link SolrFacetService}. * This class tests the ReST API of the {@link SolrFacetService}.
* *
* @author Neil Mc Erlean * @author Neil Mc Erlean
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.0 * @since 5.0
@@ -55,14 +55,14 @@ public class FacetRestApiTest extends BaseWebScriptTest
{ {
private static final String SEARCH_ADMIN_USER = "searchAdmin"; private static final String SEARCH_ADMIN_USER = "searchAdmin";
private static final String NON_SEARCH_ADMIN_USER = "nonSearchAdmin"; private static final String NON_SEARCH_ADMIN_USER = "nonSearchAdmin";
private static final String FACETS = "facets"; private static final String FACETS = "facets";
private final static String GET_FACETS_URL = "/api/solr/facet-config"; private final static String GET_FACETS_URL = "/api/solr/facet-config";
private final static String PUT_FACET_URL_FORMAT = "/api/solr/facet-config/{0}?relativePos={1}"; private final static String PUT_FACET_URL_FORMAT = "/api/solr/facet-config/{0}?relativePos={1}";
private final static String POST_FACETS_URL = GET_FACETS_URL; private final static String POST_FACETS_URL = GET_FACETS_URL;
private final static String PUT_FACETS_URL = GET_FACETS_URL; private final static String PUT_FACETS_URL = GET_FACETS_URL;
private MutableAuthenticationService authenticationService; private MutableAuthenticationService authenticationService;
private AuthorityService authorityService; private AuthorityService authorityService;
private PersonService personService; private PersonService personService;
@@ -77,6 +77,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class); personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class);
transactionHelper = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class); transactionHelper = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
AuthenticationUtil.clearCurrentSecurityContext();
// Create test users. TODO Create these users @BeforeClass or at a testsuite scope. // Create test users. TODO Create these users @BeforeClass or at a testsuite scope.
AuthenticationUtil.runAsSystem(new RunAsWork<Void>() AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
{ {
@@ -84,7 +85,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
{ {
createUser(SEARCH_ADMIN_USER); createUser(SEARCH_ADMIN_USER);
createUser(NON_SEARCH_ADMIN_USER); createUser(NON_SEARCH_ADMIN_USER);
if ( !authorityService.getContainingAuthorities(AuthorityType.GROUP, if ( !authorityService.getContainingAuthorities(AuthorityType.GROUP,
SEARCH_ADMIN_USER, SEARCH_ADMIN_USER,
true) true)
@@ -97,7 +98,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
} }
}); });
} }
@Override public void tearDown() throws Exception @Override public void tearDown() throws Exception
{ {
super.tearDown(); super.tearDown();
@@ -128,8 +129,9 @@ public class FacetRestApiTest extends BaseWebScriptTest
return null; return null;
} }
}); });
AuthenticationUtil.clearCurrentSecurityContext();
} }
public void testNonSearchAdminUserCannotCreateUpdateSolrFacets() throws Exception public void testNonSearchAdminUserCannotCreateUpdateSolrFacets() throws Exception
{ {
// Create a filter // Create a filter
@@ -144,7 +146,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
filter.put("hitThreshold", 1); filter.put("hitThreshold", 1);
filter.put("minFilterValueLength", 4); filter.put("minFilterValueLength", 4);
filter.put("sortBy", "ALPHABETICALLY"); filter.put("sortBy", "ALPHABETICALLY");
// Non-Search-Admin tries to create a filter // Non-Search-Admin tries to create a filter
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
{ {
@@ -156,7 +158,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
return null; return null;
} }
}, NON_SEARCH_ADMIN_USER); }, NON_SEARCH_ADMIN_USER);
// Search-Admin creates a filter // Search-Admin creates a filter
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
{ {
@@ -168,7 +170,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
return null; return null;
} }
}, SEARCH_ADMIN_USER); }, SEARCH_ADMIN_USER);
// Non-Search-Admin tries to modify the filter // Non-Search-Admin tries to modify the filter
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
{ {
@@ -182,7 +184,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
// Now change the maxFilters value and try to update // Now change the maxFilters value and try to update
jsonRsp.put("maxFilters", 10); jsonRsp.put("maxFilters", 10);
sendRequest(new PutRequest(PUT_FACETS_URL, jsonRsp.toString(), "application/json"), 403); sendRequest(new PutRequest(PUT_FACETS_URL, jsonRsp.toString(), "application/json"), 403);
return null; return null;
} }
}, NON_SEARCH_ADMIN_USER); }, NON_SEARCH_ADMIN_USER);
@@ -210,14 +212,14 @@ public class FacetRestApiTest extends BaseWebScriptTest
@Override public Void doWork() throws Exception @Override public Void doWork() throws Exception
{ {
Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200); Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
String contentAsString = rsp.getContentAsString(); String contentAsString = rsp.getContentAsString();
JSONObject jsonRsp = new JSONObject(new JSONTokener(contentAsString)); JSONObject jsonRsp = new JSONObject(new JSONTokener(contentAsString));
// FIXME The JSON payload should be contained within a 'data' object. // FIXME The JSON payload should be contained within a 'data' object.
JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS); JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS);
assertNotNull("JSON 'facets' array was null", facetsArray); assertNotNull("JSON 'facets' array was null", facetsArray);
// We'll not add any further assertions on the JSON content. If we've // We'll not add any further assertions on the JSON content. If we've
// got valid JSON at this point, then that's good enough. // got valid JSON at this point, then that's good enough.
return null; return null;
@@ -233,41 +235,41 @@ public class FacetRestApiTest extends BaseWebScriptTest
{ {
// get the existing facets. // get the existing facets.
Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200); Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString())); JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
final JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS); final JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS);
assertNotNull("JSON 'facets' array was null", facetsArray); assertNotNull("JSON 'facets' array was null", facetsArray);
System.out.println("Received " + facetsArray.length() + " facets"); System.out.println("Received " + facetsArray.length() + " facets");
final List<String> idsIndexes = getListFromJsonArray(facetsArray); final List<String> idsIndexes = getListFromJsonArray(facetsArray);
System.out.println(" IDs, indexes = " + idsIndexes); System.out.println(" IDs, indexes = " + idsIndexes);
// Reorder them such that the last facet is moved left one place. // Reorder them such that the last facet is moved left one place.
assertTrue("There should be more than 1 built-in facet", facetsArray.length() > 1); assertTrue("There should be more than 1 built-in facet", facetsArray.length() > 1);
final String lastIndexId = idsIndexes.get(idsIndexes.size() - 1); final String lastIndexId = idsIndexes.get(idsIndexes.size() - 1);
final String url = PUT_FACET_URL_FORMAT.replace("{0}", lastIndexId) final String url = PUT_FACET_URL_FORMAT.replace("{0}", lastIndexId)
.replace("{1}", "-1"); .replace("{1}", "-1");
rsp = sendRequest(new PutRequest(url, "", "application/json"), 200); rsp = sendRequest(new PutRequest(url, "", "application/json"), 200);
// Now get the facets back and we should see that one has moved. // Now get the facets back and we should see that one has moved.
rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200); rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString())); jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
JSONArray newfacetsArray = (JSONArray)jsonRsp.get(FACETS); JSONArray newfacetsArray = (JSONArray)jsonRsp.get(FACETS);
assertNotNull("JSON 'facets' array was null", newfacetsArray); assertNotNull("JSON 'facets' array was null", newfacetsArray);
System.out.println("Received " + newfacetsArray.length() + " facets"); System.out.println("Received " + newfacetsArray.length() + " facets");
final List<String> newIdsIndexes = getListFromJsonArray(newfacetsArray); final List<String> newIdsIndexes = getListFromJsonArray(newfacetsArray);
System.out.println(" IDs, indexes = " + newIdsIndexes); System.out.println(" IDs, indexes = " + newIdsIndexes);
// Note here that the last Facet JSON object *is* moved one place up the list. // Note here that the last Facet JSON object *is* moved one place up the list.
assertEquals(CollectionUtils.moveLeft(1, lastIndexId, idsIndexes), newIdsIndexes); assertEquals(CollectionUtils.moveLeft(1, lastIndexId, idsIndexes), newIdsIndexes);
return null; return null;
@@ -313,7 +315,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
assertEquals("ALL", jsonRsp.getString("scope")); assertEquals("ALL", jsonRsp.getString("scope"));
assertFalse(jsonRsp.getBoolean("isEnabled")); assertFalse(jsonRsp.getBoolean("isEnabled"));
assertFalse(jsonRsp.getBoolean("isDefault")); assertFalse(jsonRsp.getBoolean("isDefault"));
// Build the Filter object with all the values // Build the Filter object with all the values
JSONObject filter_two = new JSONObject(); JSONObject filter_two = new JSONObject();
String filterNameTwo = "filterTwo" + System.currentTimeMillis(); String filterNameTwo = "filterTwo" + System.currentTimeMillis();
@@ -492,14 +494,14 @@ public class FacetRestApiTest extends BaseWebScriptTest
} }
return result; return result;
} }
private void createUser(String userName) private void createUser(String userName)
{ {
if (! authenticationService.authenticationExists(userName)) if (! authenticationService.authenticationExists(userName))
{ {
authenticationService.createAuthentication(userName, "PWD".toCharArray()); authenticationService.createAuthentication(userName, "PWD".toCharArray());
} }
if (! personService.personExists(userName)) if (! personService.personExists(userName))
{ {
PropertyMap ppOne = new PropertyMap(4); PropertyMap ppOne = new PropertyMap(4);
@@ -508,11 +510,11 @@ public class FacetRestApiTest extends BaseWebScriptTest
ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
personService.createPerson(ppOne); personService.createPerson(ppOne);
} }
} }
private void deleteUser(String userName) private void deleteUser(String userName)
{ {
if (personService.personExists(userName)) if (personService.personExists(userName))