mirror of
https://github.com/Alfresco/SearchServices.git
synced 2025-09-17 14:21:20 +00:00
[ SEARCH-1861 ] Removed commented test method in SolrInformationTest
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
* Copyright (C) 2005-2019 Alfresco Software Limited.
|
||||||
*
|
*
|
||||||
* This file is part of Alfresco
|
* This file is part of Alfresco
|
||||||
*
|
*
|
||||||
@@ -19,18 +19,15 @@
|
|||||||
|
|
||||||
package org.alfresco.solr;
|
package org.alfresco.solr;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import org.alfresco.solr.client.SOLRAPIClient;
|
import org.alfresco.solr.client.SOLRAPIClient;
|
||||||
import org.alfresco.solr.content.SolrContentStore;
|
import org.alfresco.solr.content.SolrContentStore;
|
||||||
import org.apache.solr.common.SolrDocument;
|
import org.apache.solr.common.SolrDocument;
|
||||||
import org.apache.solr.common.params.CommonParams;
|
import org.apache.solr.common.params.CommonParams;
|
||||||
import org.apache.solr.common.util.NamedList;
|
|
||||||
import org.apache.solr.common.util.SimpleOrderedMap;
|
import org.apache.solr.common.util.SimpleOrderedMap;
|
||||||
import org.apache.solr.core.SolrCore;
|
import org.apache.solr.core.SolrCore;
|
||||||
import org.apache.solr.core.SolrResourceLoader;
|
import org.apache.solr.core.SolrResourceLoader;
|
||||||
import org.apache.solr.request.LocalSolrQueryRequest;
|
|
||||||
import org.apache.solr.request.SolrQueryRequest;
|
import org.apache.solr.request.SolrQueryRequest;
|
||||||
import org.apache.solr.request.SolrRequestHandler;
|
import org.apache.solr.request.SolrRequestHandler;
|
||||||
import org.apache.solr.response.SolrQueryResponse;
|
import org.apache.solr.response.SolrQueryResponse;
|
||||||
@@ -43,8 +40,6 @@ import org.mockito.junit.MockitoJUnitRunner;
|
|||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNull;
|
import static org.junit.Assert.assertNull;
|
||||||
import static org.junit.Assert.assertSame;
|
import static org.junit.Assert.assertSame;
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@@ -99,6 +94,7 @@ public class SolrInformationServerTest
|
|||||||
request = infoServer.newSolrQueryRequest();
|
request = infoServer.newSolrQueryRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Test
|
@Test
|
||||||
public void testGetStateOk()
|
public void testGetStateOk()
|
||||||
{
|
{
|
||||||
@@ -124,6 +120,7 @@ public class SolrInformationServerTest
|
|||||||
/**
|
/**
|
||||||
* GetState returns null in case the given id doesn't correspond to an existing state document.
|
* GetState returns null in case the given id doesn't correspond to an existing state document.
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Test
|
@Test
|
||||||
public void testGetStateWithStateNotFound_returnsNull()
|
public void testGetStateWithStateNotFound_returnsNull()
|
||||||
{
|
{
|
||||||
@@ -143,73 +140,4 @@ public class SolrInformationServerTest
|
|||||||
|
|
||||||
assertNull(document);
|
assertNull(document);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testIndexAcl() throws IOException
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
// Source/expected data
|
|
||||||
List<AclReaders> aclReadersList = new ArrayList<AclReaders>();
|
|
||||||
aclReadersList.add(new AclReaders(101, Arrays.asList("r1", "r2", "r3"), Arrays.asList("d1", "d2"), 999,
|
|
||||||
"example.com"));
|
|
||||||
aclReadersList.add(new AclReaders(102, Arrays.asList("r4", "r5", "r6"), Arrays.asList("d3", "d4"), 999,
|
|
||||||
"another.test"));
|
|
||||||
aclReadersList.add(new AclReaders(103, Arrays.asList("GROUP_marketing", "simpleuser", "GROUP_EVERYONE",
|
|
||||||
"ROLE_GUEST", "ROLE_ADMINISTRATOR", "ROLE_OWNER", "ROLE_RANDOM"), Arrays.asList(
|
|
||||||
"GROUP_engineering", "justauser", "GROUP_EVERYONE", "ROLE_GUEST", "ROLE_ADMINISTRATOR",
|
|
||||||
"ROLE_OWNER", "ROLE_RANDOM"), 999, "tenant.test"));
|
|
||||||
aclReadersList.add(new AclReaders(104, Arrays.asList("GROUP_marketing", "simpleuser", "GROUP_EVERYONE",
|
|
||||||
"ROLE_GUEST", "ROLE_ADMINISTRATOR", "ROLE_OWNER", "ROLE_RANDOM"), Arrays.asList(
|
|
||||||
"GROUP_engineering", "justauser", "GROUP_EVERYONE", "ROLE_GUEST", "ROLE_ADMINISTRATOR",
|
|
||||||
"ROLE_OWNER", "ROLE_RANDOM"), 999, "" Zero-length tenant == no mangling ));
|
|
||||||
|
|
||||||
//final boolean willOverwrite = true;
|
|
||||||
|
|
||||||
// Invoke the method under test
|
|
||||||
//infoServer.indexAcl(aclReadersList, willOverwrite);
|
|
||||||
|
|
||||||
|
|
||||||
// Capture the AddUpdateCommand instances for further analysis.
|
|
||||||
//ArgumentCaptor<AddUpdateCommand> cmdArg = ArgumentCaptor.forClass(AddUpdateCommand.class);
|
|
||||||
// The processor processes as many add commands as there are items in the aclReaderList.
|
|
||||||
//verify(processor, times(aclReadersList.size())).processAdd(cmdArg.capture());
|
|
||||||
|
|
||||||
// Verify that the AddUpdateCommand is as expected.
|
|
||||||
//List<AddUpdateCommand> updates = cmdArg.getAllValues();
|
|
||||||
//assertEquals("Wrong number of updates", aclReadersList.size(), updates.size());
|
|
||||||
/*
|
|
||||||
for (int docIndex = 0; docIndex < updates.size(); docIndex++)
|
|
||||||
{
|
|
||||||
AddUpdateCommand update = updates.get(docIndex);
|
|
||||||
assertEquals("Overwrite flag was not correct value.", willOverwrite, update.overwrite);
|
|
||||||
SolrInputDocument inputDoc = update.getSolrInputDocument();
|
|
||||||
// Retrieve the original AclReaders object and compare with data in submitted SolrInputDocument
|
|
||||||
final AclReaders sourceAclReaders = aclReadersList.get(docIndex);
|
|
||||||
assertEquals(
|
|
||||||
AlfrescoSolrDataModel.getTenantId(sourceAclReaders.getTenantDomain()) + "!"
|
|
||||||
+ NumericEncoder.encode(sourceAclReaders.getId()) + "!ACL",
|
|
||||||
inputDoc.getFieldValue("id").toString());
|
|
||||||
assertEquals("0", inputDoc.getFieldValue("_version_").toString());
|
|
||||||
assertEquals(sourceAclReaders.getId(), inputDoc.getFieldValue(QueryConstants.FIELD_ACLID));
|
|
||||||
assertEquals(sourceAclReaders.getAclChangeSetId(), inputDoc.getFieldValue(QueryConstants.FIELD_INACLTXID));
|
|
||||||
|
|
||||||
if (sourceAclReaders.getId() == 103)
|
|
||||||
{
|
|
||||||
// Authorities *may* (e.g. GROUP, EVERYONE, GUEST) be mangled to include tenant information
|
|
||||||
final Collection<Object> docReaders = inputDoc.getFieldValues(QueryConstants.FIELD_READER);
|
|
||||||
assertEquals(Arrays.asList("GROUP_marketing@tenant.test", "simpleuser", "GROUP_EVERYONE@tenant.test",
|
|
||||||
"ROLE_GUEST@tenant.test", "ROLE_ADMINISTRATOR", "ROLE_OWNER", "ROLE_RANDOM"), docReaders);
|
|
||||||
final Collection<Object> docDenied = inputDoc.getFieldValues(QueryConstants.FIELD_DENIED);
|
|
||||||
assertEquals(Arrays.asList("GROUP_engineering@tenant.test", "justauser", "GROUP_EVERYONE@tenant.test",
|
|
||||||
"ROLE_GUEST@tenant.test", "ROLE_ADMINISTRATOR", "ROLE_OWNER", "ROLE_RANDOM"), docDenied);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Simple case, no authority/tenant mangling.
|
|
||||||
assertEquals(sourceAclReaders.getReaders(), inputDoc.getFieldValues(QueryConstants.FIELD_READER));
|
|
||||||
assertEquals(sourceAclReaders.getDenied(), inputDoc.getFieldValues(QueryConstants.FIELD_DENIED));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user