mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
28029: Added more tests for PublishingEventHelper and PublishingQueueImpl. Also added WebPublishingTestSuite. 28034: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking - ACL and ACLTX support 28036: WCM QS ML UI tweaks for marking something as the initial translation 28038: ALF-8548: WPUB: F165: Foundation API: Cancel a scheduled publishing event - Code and initial test cases 28051: Fix for ALF-8836: No permission checks for SolrJSONResultSet 28057: WCM QS ML support for claiming intermediate non-translated folders when translating documents, with tests 28058: ML-WQS: Slight refactoring to remove RootNavInterceptor. This functionality has been brought into the ApplicationDataInterceptor. The effective root section is now made available to templates and components in the model. 28059: ALF-8499. SVC 10: Action Forms. This checkin adds an ActionFormProcessor which supports the generation and persistence of Forms based on Alfresco spring-injected action beans. The form processor produces a form field for each defined action parameter as well as the ubiquitous executeAsynchronously boolean for action execution. There is no styling of configuration of these forms and therefore NodeRef parameters will allow selection of any cm:cmobject nodes and action constraints like ac-aspects will return every aspect defined in the system. To expose these forms in the product, we would need to add form configuration for the built-in actions in order to manage and control such data. 28064: Fix for ALF-8857: Fix SOLR query caching to respect locale for ordering 28067: ALF-8846 : Intermittent: DMDeploymentTargetTest added more debug logging and throw an explicit exception on trying to create a duplicate directory. 28068: Publishing: Tidy-up (javadoc and removal of a few unnecessary operations) prior to sprint 1 demo. 28069: Implemented EnvironmentImpl.checkStatus() method. Also created an AbstractWebPublishingIntegrationTest and extended many of the web publishing tests from htis class. 28076: Publishing: More javadoc 28078: RINF 11: Canned queries - minor: rename CannedQuery "query" to "queryAndFilter" and update/fix related JavaDoc (ALF-8827) - update PagingRequest - precursor to merge with (Script) PagingDetails (ALF-8855) 28079: RINF 40: Lucene Removal: PersonService API (ALF-8805) - W.I.P. - add GetChildren CQ support for (initially string) property filtering, including unit tests - update GetChildren CQ to allow up to three filter and/or sort props - add GetChildren CQ unit test for existing DB-based filtering of child types - fix GetChildren CQ sorting, for spoofed referenceable props (including missing name) 28083: Fix for ALF-8858: Fix cache bugs (TX and ACLTX docs not tracked) 28097: Fix hard-coded checks for aspect counts following sys:localized changes 28126: Build/test fix (GetChildrenCannedQueryTest.testPropertyStringFiltering) 28147: RINF 40: Lucene Removal: PersonService API - initial impl w/ unit tests - note: separate task required to update JavaScript API (People.getPeople) 28157: RINF 40: Lucene Removal: PersonService API (ALF-8805) - fix People.getPeople - put back FTS option (pending ALF-8924) 28162: Added PublishWebContentJbpmTest to test the Jbpm publish web content process definiion. 28178: Build fix. Removing a trailing comma that my ant build objects to. 28180: Preventing a NPE within TikaCharsetFinder. Was observed as part of tests for ALF-3757. 28182: RSOLR 037: Integrate CMIS Dictionary into SOLR engine 28183: ALF-8846 - fix DMDeploymentTarget(Test) - make system auth explicit - minor: fixup debug logging 28187: Fix for ALF-7308. The imgpreview thumbnail ... scale up small images... I've exposed an ImageMagick configuration option ('>') as a new ImageRenderingEngine parameter, "allowEnlargement". It's not mandatory, defaults to true, and is set to false for doclib and imgpreview thumbnails. The net result is that doclib and imgpreview thumbnails of small graphics files (e.g. icons) will never have sizes exceeding their original size. 28191: RINF 09: Update FileFolderService (ALF-7168) - minor: clean-up debug/trace logging 28192: Fix MT for GetChildren CQ - FileFolderService -> list (ALF-7168) - PersonService -> getPeople (ALF-8805) 28194: RINF 09: CMIS getChildren sorting fixes (part of ALF-7168) - fix sorting by cmis:contentStreamMimeType and/or cmis:contentStreamLength - add warning + debug (if some orderBy sort props need to be ignored - eg. too many or unknown) - reviewed w/ Florian 28195: ALF-8910: RSOLR 037: Integrate CMIS Query Parser into SOLR engine 28211: Changes for ALF-8646: "RINF 38: Text data encryption" 28227: Changes for ALF-8646: "RINF 38: Text data encryption" o fix build issue relating to missing property definition 28232: ALF-8928 - Performance degradation when loading documents from RepoStore 28233: Attempt to resolve OOM hangs in SWIFT builds - Set mem.size.max=2048m 28234: Implementation of ALF-8986. Add support for transformation of Apple iWorks files. A new transformer transforms (pages, numbers, keynote) iWorks 09 files to image or SWF for doclib & webpreview thumbnailing. This transformer extracts an embedded JPEG or PDF file from a well-known location within the iWorks zip structure & uses that to create Alfresco thumbnails. If these zip entries are not present for whatever reason, then the transformation fails in the usual way. All of our iWorks 09 test files have an embedded JPEG and more than half have embedded PDFs. 28243: Init/refresh repo webscripts in single txn - found whilst investigating ALF-8928 28268: Started implementing PublishEventAction. Also updated mapping of nodes from source to live environment to use associations. 28308: PublishEventAction now supports updating of nodes that have already been published. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
285 lines
12 KiB
Java
285 lines
12 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 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.domain.node;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
|
|
import junit.framework.TestCase;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
|
|
import org.alfresco.repo.domain.locale.LocaleDAO;
|
|
import org.alfresco.repo.domain.qname.QNameDAO;
|
|
import org.alfresco.repo.security.encryption.EncryptionEngine;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.repo.version.VersionModel;
|
|
import org.alfresco.service.ServiceRegistry;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.repository.MLText;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.alfresco.util.ApplicationContextHelper;
|
|
import org.alfresco.util.EqualsHelper;
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
/**
|
|
* Test low-level marshalling and unmarshalling of node properties
|
|
*
|
|
* @see NodePropertyHelper
|
|
*
|
|
* @author Derek Hulley
|
|
* @since 3.4
|
|
*/
|
|
public class NodePropertyHelperTest extends TestCase
|
|
{
|
|
private static final QName QN_BOOLEAN = createQName("boolean");
|
|
private static final QName QN_INTEGER = createQName("integer");
|
|
private static final QName QN_LONG = createQName("long");
|
|
private static final QName QN_FLOAT = createQName("float");
|
|
private static final QName QN_TEXT = createQName("text");
|
|
private static final QName QN_MLTEXT = createQName("mltext");
|
|
private static final QName QN_REF = createQName("ref");
|
|
private static final QName QN_ANY = createQName("any");
|
|
|
|
/**
|
|
* @return Returns a QName that uses the localname
|
|
*/
|
|
private static QName createQName(String localName)
|
|
{
|
|
return QName.createQName("test", "local-" + localName);
|
|
}
|
|
|
|
private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
|
|
|
|
private NodePropertyHelper helper;
|
|
private TransactionService transactionService;
|
|
private RetryingTransactionHelper txnHelper;
|
|
|
|
@Override
|
|
public void setUp()
|
|
{
|
|
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
|
|
DictionaryService dictionaryService = serviceRegistry.getDictionaryService();
|
|
QNameDAO qnameDAO = (QNameDAO) ctx.getBean("qnameDAO");
|
|
LocaleDAO localeDAO = (LocaleDAO) ctx.getBean("localeDAO");
|
|
ContentDataDAO contentDataDAO = (ContentDataDAO) ctx.getBean("contentDataDAO");
|
|
EncryptionEngine encryptionEngine = (EncryptionEngine) ctx.getBean("encryptionEngine");
|
|
|
|
helper = new NodePropertyHelper(dictionaryService, qnameDAO, localeDAO, contentDataDAO, encryptionEngine);
|
|
transactionService = serviceRegistry.getTransactionService();
|
|
txnHelper = transactionService.getRetryingTransactionHelper();
|
|
txnHelper.setMinRetryWaitMs(10);
|
|
txnHelper.setRetryWaitIncrementMs(10);
|
|
txnHelper.setMaxRetryWaitMs(50);
|
|
}
|
|
|
|
/**
|
|
* Converts properties back and forth and ensures that the result is unchanged or
|
|
* at least doesn't show up in a deep equals check.
|
|
*/
|
|
private void marshallAndUnmarshall(final Map<QName, Serializable> in, final boolean exact) throws Throwable
|
|
{
|
|
RetryingTransactionCallback<Void> txnCallback = new RetryingTransactionCallback<Void>()
|
|
{
|
|
public Void execute() throws Throwable
|
|
{
|
|
String diffReport;
|
|
// Convert to raw and back
|
|
Map<NodePropertyKey, NodePropertyValue> rawProps1 = helper.convertToPersistentProperties(in);
|
|
Map<QName, Serializable> props1 = helper.convertToPublicProperties(rawProps1);
|
|
// We can't be sure that we have what we started with, because there may have been
|
|
// some mandatory conversions to the types defined by the model i.e. the values
|
|
// will get converted to the dictionary type rather than the incoming type
|
|
if (exact)
|
|
{
|
|
diffReport = EqualsHelper.getMapDifferenceReport(props1, in);
|
|
assertNull(diffReport, diffReport);
|
|
}
|
|
// Convert back to raw again
|
|
Map<NodePropertyKey, NodePropertyValue> rawProps2 = helper.convertToPersistentProperties(in);
|
|
diffReport = EqualsHelper.getMapDifferenceReport(rawProps2, rawProps1);
|
|
assertNull(diffReport, diffReport);
|
|
// But now, on the second time out, we expect to get exactly what we got before
|
|
Map<QName, Serializable> props2 = helper.convertToPublicProperties(rawProps2);
|
|
diffReport = EqualsHelper.getMapDifferenceReport(props2, props1);
|
|
assertNull(diffReport, diffReport);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
txnHelper.doInTransaction(txnCallback);
|
|
}
|
|
|
|
/**
|
|
* Tests simple, well-typed nulls
|
|
*/
|
|
public void testNullKnownValues() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
in.put(ContentModel.PROP_AUTO_VERSION, null); // d:boolean
|
|
in.put(ContentModel.PROP_HITS, null); // d:int
|
|
in.put(ContentModel.PROP_SIZE_CURRENT, null); // d:long
|
|
in.put(ContentModel.PROP_RATING_SCORE, null); // d:float
|
|
in.put(ContentModel.PROP_NAME, null); // d:text
|
|
in.put(ContentModel.PROP_TITLE, null); // d:mltext
|
|
in.put(ContentModel.PROP_REFERENCE, null); // d:noderef
|
|
in.put(VersionModel.PROP_QNAME_VALUE, null); // d:any
|
|
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests simple, well-typed values
|
|
*/
|
|
public void testSimpleKnownValues() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
in.put(ContentModel.PROP_AUTO_VERSION, Boolean.TRUE);
|
|
in.put(ContentModel.PROP_HITS, new Integer(1));
|
|
in.put(ContentModel.PROP_SIZE_CURRENT, new Long(2L));
|
|
in.put(ContentModel.PROP_RATING_SCORE, new Float(3.0));
|
|
in.put(ContentModel.PROP_NAME, "four");
|
|
in.put(ContentModel.PROP_TITLE, new MLText("five"));
|
|
in.put(ContentModel.PROP_REFERENCE, new NodeRef("protocol://identifier/six"));
|
|
in.put(VersionModel.PROP_QNAME_VALUE, Locale.CANADA);
|
|
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests simple, well-typed values that need conversion
|
|
*/
|
|
public void testConvertableKnownValues() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
in.put(ContentModel.PROP_AUTO_VERSION, "TRUE");
|
|
in.put(ContentModel.PROP_HITS, "1");
|
|
in.put(ContentModel.PROP_SIZE_CURRENT, "2");
|
|
in.put(ContentModel.PROP_RATING_SCORE, "3.0");
|
|
in.put(ContentModel.PROP_NAME, new MLText("four"));
|
|
in.put(ContentModel.PROP_TITLE, "five");
|
|
in.put(ContentModel.PROP_REFERENCE, "protocol://identifier/six");
|
|
in.put(VersionModel.PROP_QNAME_VALUE, "en_CA_");
|
|
|
|
marshallAndUnmarshall(in, false);
|
|
}
|
|
|
|
/**
|
|
* Tests simple, residual nulls
|
|
*/
|
|
public void testNullResidualValues() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
in.put(QN_TEXT, null);
|
|
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests simple, residual values
|
|
*/
|
|
public void testSimpleResidualValues() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
in.put(QN_BOOLEAN, Boolean.TRUE);
|
|
in.put(QN_INTEGER, new Integer(1));
|
|
in.put(QN_LONG, new Long(2L));
|
|
in.put(QN_FLOAT, new Float(3.0));
|
|
in.put(QN_TEXT, "four");
|
|
in.put(QN_MLTEXT, new MLText("five"));
|
|
in.put(QN_REF, new NodeRef("protocol://identifier/six"));
|
|
in.put(QN_ANY, Locale.CANADA);
|
|
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests simple multi-value type
|
|
*/
|
|
public void testSimpleMultiValue() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
|
|
in.put(ContentModel.PROP_ADDRESSEES, null);
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(ContentModel.PROP_ADDRESSEES, (Serializable) Arrays.<String>asList());
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(ContentModel.PROP_ADDRESSEES, (Serializable) Arrays.<String>asList("A"));
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(ContentModel.PROP_ADDRESSEES, (Serializable) Arrays.<String>asList("A", "B"));
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests d:any multi-value type
|
|
*/
|
|
public void testAnyMultiValue() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
|
|
in.put(VersionModel.PROP_QNAME_VALUE, null);
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(VersionModel.PROP_QNAME_VALUE, (Serializable) Arrays.<String>asList());
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(VersionModel.PROP_QNAME_VALUE, (Serializable) Arrays.<String>asList("A"));
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(VersionModel.PROP_QNAME_VALUE, (Serializable) Arrays.<String>asList("A", "B"));
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
|
|
/**
|
|
* Tests residual multi-value type
|
|
*/
|
|
public void testResidualMultiValue() throws Throwable
|
|
{
|
|
Map<QName, Serializable> in = new HashMap<QName, Serializable>(17);
|
|
|
|
in.put(QN_ANY, null);
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(QN_ANY, (Serializable) Arrays.<String>asList());
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(QN_ANY, (Serializable) Arrays.<String>asList("A"));
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
in.put(QN_ANY, (Serializable) Arrays.<String>asList("A", "B"));
|
|
marshallAndUnmarshall(in, true);
|
|
|
|
// Collection of collections
|
|
ArrayList<Serializable> arrayListVal = new ArrayList<Serializable>(2);
|
|
HashSet<Serializable> hashSetVal = new HashSet<Serializable>(2);
|
|
in.put(QN_ANY, (Serializable) Arrays.<Serializable>asList(arrayListVal, hashSetVal));
|
|
marshallAndUnmarshall(in, true);
|
|
}
|
|
} |