inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-1643

Browse Source
This commit is contained in:
eliaporciani
2019-05-30 13:44:44 +02:00
parent 97997b6ad9 7e7275c4f9
commit a5f6fe9da8
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
search-services/.gitignore → .gitignore vendored
View File

@@ -8,6 +8,8 @@ target
alf_data_dev
alfresco.log*
solr.log*
alfresco-insight-engine/bin/
packaging/bin/
# OS generated files #
######################
.DS_Store
@@ -17,6 +19,7 @@ solr.log*
.Trashes
ehthumbs.db
Thumbs.db
.git-rewrite
#############
# Test data #

18
search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
View File

@@ -19,8 +19,8 @@
package org.alfresco.solr.query.afts.qparser;
import static java.util.Arrays.stream;
import static org.alfresco.model.ContentModel.PROP_CONTENT;
import static org.alfresco.model.ContentModel.PROP_CREATED;
import static org.alfresco.model.ContentModel.PROP_DESCRIPTION;
@@ -28,21 +28,25 @@ import static org.alfresco.model.ContentModel.PROP_NAME;
import static org.alfresco.model.ContentModel.TYPE_CONTENT;
import static org.alfresco.model.ContentModel.TYPE_THUMBNAIL;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
import org.alfresco.service.namespace.QName;
import org.alfresco.solr.dataload.TestDataProvider;
import org.alfresco.util.CachingDateFormat;
import org.alfresco.util.CachingDateFormat.SimpleDateFormatAndResolution;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@SolrTestCaseJ4.SuppressSSL
public class QParserPluginTest extends AbstractQParserPluginTest implements QueryConstants
{
/** The UTC time zone. */
private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
private final long [] msecs = {
333,
20000,
@@ -571,7 +575,9 @@ public class QParserPluginTest extends AbstractQParserPluginTest implements Quer
{
stream(CachingDateFormat.getLenientFormatters())
.filter(formatter -> formatter.getResolution() < Calendar.DAY_OF_MONTH)
.map(formatter -> formatter.getSimpleDateFormat().format(FTS_TEST_DATE))
.map(SimpleDateFormatAndResolution::getSimpleDateFormat)
.peek(simpleDateFormat -> simpleDateFormat.setTimeZone(UTC))
.map(simpleDateFormat -> simpleDateFormat.format(FTS_TEST_DATE))
.filter(date -> date.length() >= 9)
.forEach(date -> assertAQuery("\\@" + escape(QName.createQName(TEST_NAMESPACE, "date-ista")) + ":\"" + date + "\"", 1));
}

4
search-services/pom.xml
View File

@@ -6,7 +6,11 @@
<artifactId>alfresco-search-and-insight-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>
<!-- The groupId and version are required by the maven pom extractor plugin on Bamboo - more details in this issue:
https://bitbucket.org/dehringer/bamboo-maven-pom-extractor-plugin/issues/18/groupid-not-populated-if-using-parent-pom -->
<groupId>org.alfresco</groupId>
<artifactId>alfresco-search-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Solr Search parent</name>
<properties>