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

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

Browse Source 
80628: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76618: Initial commit of Java service changes for facet reordering. Part of ACE-1582.
      Facet persistence has not been changed, but a property has been added to the folder
      which contains the facet nodes. This property 'facetOrder' holds a sequence of strings
      which are the ordered facet IDs.
      Facets are now returned from the SolrFacetService in a sorted order, where this explicit
      'facetOrder' is the primary source for sort order.
      The sorting algorithm falls back to using indexes if no order is available.
      It then falls back to using alphabetic sorting if no index is available.
      These last two scenarios are likely to be corner cases.
      Still to do: some enhancements to the Java service, webscripts as REST API endpoints.
                   the REST API will provide for reordering of existing facets.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 16:12:05 +00:00
parent 3599152c64
commit 76e5df2cb7
9 changed files with 498 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/test-java/org/alfresco/AllUnitTestsSuite.java
View File

@@ -96,5 +96,6 @@ public class AllUnitTestsSuite extends TestSuite
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporaryMockOverrideTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.SolrQueryHTTPClientTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.SolrStatsResultTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.facet.SolrFacetComparatorTest.class));
}
}

62
source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparatorTest.java Normal file
View File

@@ -0,0 +1,62 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.search.impl.solr.facet;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.alfresco.util.collections.CollectionUtils;
import org.alfresco.util.collections.Function;
import org.junit.Test;
/**Some Unit tests for {@link SolrFacetComparator}. */
public class SolrFacetComparatorTest
{
@Test public void simpleSortOfSortedFacets() throws Exception
{
List<String> expectedIds = Arrays.asList(new String[] { "a", "b", "c"});
SolrFacetProperties.Builder builder = new SolrFacetProperties.Builder();
List<SolrFacetProperties> facets = Arrays.asList(new SolrFacetProperties[]
{
builder.filterID("c").index(1).build(),
builder.filterID("b").index(2).build(),
builder.filterID("a").index(3).build(),
});
Collections.sort(facets, new SolrFacetComparator(expectedIds));
assertEquals(expectedIds, toFacetIds(facets));
}
private List<String> toFacetIds(List<SolrFacetProperties> facets)
{
return CollectionUtils.transform(facets, new Function<SolrFacetProperties, String>()
{
@Override public String apply(SolrFacetProperties value)
{
return value.getFilterID();
}
});
}
}

158
source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImplTest.java Normal file
View File

@@ -0,0 +1,158 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.search.impl.solr.facet;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.alfresco.repo.search.impl.solr.facet.Exceptions.DuplicateFacetId;
import org.alfresco.repo.search.impl.solr.facet.Exceptions.MissingFacetId;
import org.alfresco.repo.search.impl.solr.facet.Exceptions.UnrecognisedFacetId;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.util.collections.CollectionUtils;
import org.alfresco.util.collections.Function;
import org.alfresco.util.test.junitrules.ApplicationContextInit;
import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
/**
* Integration tests for {@link SolrFacetServiceImpl}.
*/
public class SolrFacetServiceImplTest
{
// Rule to initialise the default Alfresco spring configuration
@ClassRule public static ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit();
@Rule public RunAsFullyAuthenticatedRule runAsRule = new RunAsFullyAuthenticatedRule(AuthenticationUtil.getAdminUserName());
// Various services
private static SolrFacetService SOLR_FACET_SERVICE;
private static RetryingTransactionHelper TRANSACTION_HELPER;
@BeforeClass public static void initStaticData() throws Exception
{
SOLR_FACET_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("solrFacetService", SolrFacetService.class);
TRANSACTION_HELPER = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
}
// TODO Ensure non-admin, non-search-admin user cannot access SolrFacetService
@Test public void getFacetsAndReorderThem() throws Exception
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
final List<String> facetIds = getExistingFacetIds();
final List<String> reorderedFacetIds = new ArrayList<>(facetIds);
Collections.reverse(reorderedFacetIds);
SOLR_FACET_SERVICE.reorderFacets(reorderedFacetIds);
final List<String> newfacetIds = getExistingFacetIds();
assertEquals(reorderedFacetIds, newfacetIds);
return null;
}
});
}
@Test(expected=NullPointerException.class)
public void reorderNullFacetIdsShouldFail() throws Exception
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
SOLR_FACET_SERVICE.reorderFacets(null);
return null;
}
});
}
@Test(expected=MissingFacetId.class)
public void reorderEmptyFacetIdsShouldFail() throws Exception
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
SOLR_FACET_SERVICE.reorderFacets(Collections.<String>emptyList());
return null;
}
});
}
@Test(expected=DuplicateFacetId.class)
public void reorderDuplicateFacetIdsShouldFail() throws Exception
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
final List<String> facetIds = getExistingFacetIds();
facetIds.add(facetIds.get(0));
SOLR_FACET_SERVICE.reorderFacets(facetIds);
return null;
}
});
}
@Test(expected=UnrecognisedFacetId.class)
public void reorderUnrecognisedFacetIdsShouldFail() throws Exception
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
final List<String> facetIds = getExistingFacetIds();
facetIds.add("unrecognisedID");
SOLR_FACET_SERVICE.reorderFacets(facetIds);
return null;
}
});
}
private List<String> getExistingFacetIds()
{
final List<SolrFacetProperties> facetProps = SOLR_FACET_SERVICE.getFacets();
final List<String> facetIds = CollectionUtils.transform(facetProps,
new Function<SolrFacetProperties, String>()
{
@Override public String apply(SolrFacetProperties value)
{
return value.getFilterID();
}
});
return facetIds;
}
}