mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
27908: ALF-8706: RSOLR 023: Locale is persisted for all nodes - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Added alf_node.locale_id mandatory column - sys:localizable is now spoofed and mandatory on sys:base - sys:locale property is always available - The locale set is the I18NUtil.getLocale() (thread then server) - TODO: Upgrade scripts, so drop database to take this change 27909: ALF-8706: RSOLR 023: Locale is persisted for all nodes - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Extended locale test to ensure that sys:locale can be set using properties during create 27910: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales - Part of ALF-7991:RSOLR 023: Locale support for query: Repository - Upgrade scripts for PostgreSQL and MySQL: patch.db-V4.0-Node-Locale 27912: WCM QS ML Support for creating missing intermediate directories when adding an "orphan" translation, plus tests 27913: Fixed failing JbpmEngineUnitTest. 27914: Build fix. Fixes failing test DiscussionServiceTest.testDeleteTopLevelPost 27916: WCM QS ML forms config for overrideable name, and passing the initially orphaned flag through to the behaviour 27917: Enable the WCM QS ML Manage Translations action in the folder details page, as well as the document details page as before 27919: Quick build fix. Introduction of new property sys:locale on all nodes means that FormService is seeing some off-by-one errors. 27921: WCM QS ML - Support copying parts of the section collections to the new folder when translating a section, plus tests 27925: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Upgrade scripts for DB2, Oracle and SQLServer 27927: Update FileFolderService list/paging (RINF 09) & CQ permission checking (RINF 11) - also added additional unit tests and update FileFolderPerformanceTester utility (for read / list testing) 27930: Corrected bean reference: "ServiceRegistry" 27931: Partially implemented EnvironmentImpl.getPublishingEvents(). This currently only supports searching on publishing event ids. 27933: Implemented PublishService.getPublishingEvent(String) method. 27934: WCM QS ML Pull over the locale resolver from Ian, and delegate much of the work to the main class 27941: ALF-7874 - Mime Type entries for detection and display for some Apple and Adobe formats 27947: ALF-2707 - Largely fix custom site properties that have multiple values, and custom site properties without a full definition, plus tests. 27964: ALF-7339:RSOLR 009: Index track and build from SOLR - complete ALF-7475: RSOLR 010: Index integrity check - check ACL info 27966: RINF 09: FileFolderService list - if skipCount > number of items then return empty list - related to ALF-7884 when using CMIS getChildren (via OpenCMIS - eg. http://localhost:8080/alfresco/cmisatom/...) 27968: ALF-7884 - getChildren() returns an error if skipCount > number of children 27970: WCM QS Fix issue in the webapp for sites where no port has been given yet 27972: WPUB: F150: Foundation API: Request that a node be removed from the live environment - Initial support for "unpublish" 27975: ALF-8790:RSOLR 033: Automated build produces SOLR artifacts - add configuration per core based on properties files 27976: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts - restructure, added properties files for config, track archived store 27977: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts - Solr zip included in continuous build 27978: Fixed missing policy event when sys:locale is changed. 27979: Fixed tests and checks after sys:locale became a mandatory property. 27982: ALF-8547: WPUB: F163: Foundation API: Create/update/remove a delivery channel - Code and tests for channel update and delete 28007: Implemented starting publishing workflow on schedulePublishingEvent method. Added tests for PublishingEventHelper. 28008: Updated web-publishing-context.xml to include WorkflowService and workflowEngineId for PublishingEventHelper. 28009: Added more PublishingEventHelper tests. 28012: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking 28013: Fix failing Web Publishing tests. 28015: Adding a DoNotCopy CopyBehaviourCallback for the fm:commentsRollup aspect. Part of ALF-8498. 28016: Bring over the WCM QS ML RootNavInterceptor from Ian, and productise it 28019: CMIS browser: close invalid connections 28025: Update the WCM QS ML behaviour, webscript and test to handle more things having locales by default 28026: ML-WQS: - Wired up the RootNavInterceptor to detect locale based on path - Wired up the replacement locale resolver to respect the locale determined by the RootNavInterceptor - Adjusted "Manage Translations" page to render the data table correctly - Adjusted site search box to restrict search to selected site localisation - Adjusted top nav component to select menu items only from appropriate site localisation 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 28043: Added missing JCR mapping for property type d:locale - This property type is not new, btw. 28312: RepoBM: minor cleanup - remove hardcoded JMeter install dir - add configurable user.dir (for default import of test data) - check that default zip exists - update readme - default threadfolder should be null (in case of absolute folder paths) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
207 lines
9.3 KiB
Java
207 lines
9.3 KiB
Java
/*
|
|
* Copyright (C) 2005-2011 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.publishing;
|
|
|
|
import static junit.framework.Assert.assertEquals;
|
|
import static junit.framework.Assert.assertNotNull;
|
|
import static junit.framework.Assert.assertNull;
|
|
import static org.alfresco.repo.publishing.PublishingModel.ASSOC_PUBLISHING_EVENT;
|
|
import static org.alfresco.repo.publishing.PublishingModel.PROP_PUBLISHING_EVENT_CHANNEL;
|
|
import static org.alfresco.repo.publishing.PublishingModel.PROP_PUBLISHING_EVENT_COMMENT;
|
|
import static org.alfresco.repo.publishing.PublishingModel.PROP_PUBLISHING_EVENT_TIME;
|
|
import static org.alfresco.repo.publishing.PublishingModel.PROP_PUBLISHING_EVENT_TIME_ZONE;
|
|
import static org.alfresco.repo.publishing.PublishingModel.PROP_PUBLISHING_EVENT_PAYLOAD;
|
|
import static org.alfresco.repo.publishing.PublishingModel.*;
|
|
import static org.mockito.Matchers.any;
|
|
import static org.mockito.Matchers.anyMap;
|
|
import static org.mockito.Matchers.eq;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.verify;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.io.Serializable;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import java.util.TimeZone;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import org.alfresco.service.cmr.publishing.PublishingEvent.Status;
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.service.cmr.publishing.PublishingEvent;
|
|
import org.alfresco.service.cmr.publishing.PublishingPackage;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.ContentReader;
|
|
import org.alfresco.service.cmr.repository.ContentService;
|
|
import org.alfresco.service.cmr.repository.ContentWriter;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.mockito.ArgumentCaptor;
|
|
import org.springframework.test.context.ContextConfiguration;
|
|
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
|
|
|
/**
|
|
* @author Nick Smith
|
|
* @since 4.0
|
|
*
|
|
*/
|
|
@RunWith(SpringJUnit4ClassRunner.class)
|
|
@ContextConfiguration(locations = { "classpath:test/alfresco/test-web-publishing-context.xml"})
|
|
public class PublishingEventHelperTest
|
|
{
|
|
@Resource(name="publishingEventHelper")
|
|
PublishingEventHelper helper;
|
|
|
|
@Resource(name="nodeService")
|
|
NodeService nodeService;
|
|
|
|
@Resource(name="contentService")
|
|
ContentService contentService;
|
|
|
|
@Test
|
|
public void testGetPublishingEventNode() throws Exception
|
|
{
|
|
NodeRef eventNode= helper.getPublishingEventNode(null);
|
|
assertNull("If id is null event shoudl be null!", eventNode);
|
|
|
|
eventNode= helper.getPublishingEventNode("foo");
|
|
assertNull("If id is invalid event shoudl be null!", eventNode);
|
|
|
|
String nonExistantId = "foo://bar/nonExistantId";
|
|
eventNode= helper.getPublishingEventNode(nonExistantId);
|
|
assertNull("If event node does not exist event shoudl be null!", eventNode);
|
|
|
|
String nonPublishingEventId = "foo://bar/nonPublishingEventId";
|
|
NodeRef nonPublishingEventNode = new NodeRef(nonPublishingEventId);
|
|
when(nodeService.exists(nonPublishingEventNode)).thenReturn(true);
|
|
|
|
eventNode= helper.getPublishingEventNode(nonPublishingEventId);
|
|
assertNull("Event shoudl exist!", eventNode);
|
|
|
|
String publishingEventId = "foo://bar/publishingEventId";
|
|
NodeRef publishingEventNode = new NodeRef(publishingEventId);
|
|
when(nodeService.exists(publishingEventNode)).thenReturn(true);
|
|
when(nodeService.getType(publishingEventNode)).thenReturn(TYPE_PUBLISHING_EVENT);
|
|
|
|
eventNode= helper.getPublishingEventNode(publishingEventId);
|
|
assertNotNull("Event shoudl exist!", eventNode);
|
|
}
|
|
|
|
@Test
|
|
public void testGetPublishingEvent() throws Exception
|
|
{
|
|
// Mock up ContentReader to do nothing. Not testing payload deserialization.
|
|
ContentReader reader = mock(ContentReader.class);
|
|
InputStream inputStream = mock(InputStream.class);
|
|
when(reader.getContentInputStream()).thenReturn(inputStream);
|
|
when(contentService.getReader(any(NodeRef.class), any(QName.class)))
|
|
.thenReturn(reader);
|
|
PublishingPackageSerializer serializer = mock(PublishingPackageSerializer.class);
|
|
helper.setSerializer(serializer);
|
|
|
|
PublishingEvent result = helper.getPublishingEvent((NodeRef)null);
|
|
assertNull(result);
|
|
|
|
String comment = "The comment";
|
|
Status status = Status.COMPLETE;
|
|
Date modified= new Date();
|
|
Date created = new Date(modified.getTime()-3600000);
|
|
String creatorName = "The creator";
|
|
String modifierName = "The modifier";
|
|
Calendar schedule = Calendar.getInstance();
|
|
schedule.add(Calendar.MONTH, 6);
|
|
Date scheduledTime = schedule.getTime();
|
|
String scheduledTimeZone = schedule.getTimeZone().getID();
|
|
|
|
// Mock up node properties.
|
|
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
|
|
props.put(PROP_PUBLISHING_EVENT_COMMENT, comment);
|
|
props.put(PROP_PUBLISHING_EVENT_STATUS, status);
|
|
props.put(PROP_PUBLISHING_EVENT_TIME, scheduledTime);
|
|
props.put(PROP_PUBLISHING_EVENT_TIME_ZONE, scheduledTimeZone);
|
|
props.put(ContentModel.PROP_CREATED, created);
|
|
props.put(ContentModel.PROP_CREATOR, creatorName);
|
|
props.put(ContentModel.PROP_MODIFIED, modified);
|
|
props.put(ContentModel.PROP_MODIFIER, modifierName);
|
|
|
|
NodeRef eventNode = new NodeRef("foo://bar/eventNode");
|
|
when(nodeService.getProperties(eventNode)).thenReturn(props);
|
|
|
|
result = helper.getPublishingEvent(eventNode);
|
|
assertEquals(eventNode.toString(), result.getId());
|
|
assertEquals(comment, result.getComment());
|
|
assertEquals(status, result.getStatus());
|
|
assertEquals(schedule, result.getScheduledTime());
|
|
assertEquals(created, result.getCreatedTime());
|
|
assertEquals(creatorName, result.getCreator());
|
|
assertEquals(modified, result.getModifiedTime());
|
|
assertEquals(modifierName, result.getModifier());
|
|
}
|
|
|
|
@Test
|
|
@SuppressWarnings({ "rawtypes", "unchecked" })
|
|
public void testCreateNode() throws Exception
|
|
{
|
|
// Mock serializer since this behaviour is already tested in PublishingPackageSerializerTest.
|
|
ContentWriter writer = mock(ContentWriter.class);
|
|
when(contentService.getWriter(any(NodeRef.class), eq(PROP_PUBLISHING_EVENT_PAYLOAD), eq(true)))
|
|
.thenReturn(writer);
|
|
OutputStream outputStream = mock(OutputStream.class);
|
|
when(writer.getContentOutputStream()).thenReturn(outputStream);
|
|
PublishingPackageSerializer serializer = mock(PublishingPackageSerializer.class);
|
|
helper.setSerializer(serializer);
|
|
|
|
NodeRef queue = new NodeRef("foo://bar/queue");
|
|
NodeRef event = new NodeRef("foo://bar/event");
|
|
|
|
ChildAssociationRef childAssoc = new ChildAssociationRef(ASSOC_PUBLISHING_EVENT, queue, null, event);
|
|
when(nodeService.createNode(any(NodeRef.class), any(QName.class), any(QName.class), any(QName.class), anyMap()))
|
|
.thenReturn(childAssoc);
|
|
|
|
PublishingPackage pckg = null;
|
|
String channelName = "The channel";
|
|
Calendar schedule = Calendar.getInstance();
|
|
String comment = "The comment";
|
|
|
|
NodeRef result = helper.createNode(queue, pckg, channelName, schedule, comment);
|
|
assertEquals(event, result);
|
|
|
|
ArgumentCaptor<Map> argument = ArgumentCaptor.forClass(Map.class);
|
|
verify(nodeService)
|
|
.createNode(eq(queue), eq(ASSOC_PUBLISHING_EVENT),
|
|
any(QName.class), eq(TYPE_PUBLISHING_EVENT),
|
|
argument.capture());
|
|
Map<QName, Serializable> props = argument.getValue();
|
|
|
|
assertNotNull(props.get(ContentModel.PROP_NAME));
|
|
assertEquals(channelName, props.get(PROP_PUBLISHING_EVENT_CHANNEL));
|
|
assertEquals(comment, props.get(PROP_PUBLISHING_EVENT_COMMENT));
|
|
assertEquals(schedule.getTime(), props.get(PROP_PUBLISHING_EVENT_TIME));
|
|
assertEquals(schedule.getTimeZone().getID(), props.get(PROP_PUBLISHING_EVENT_TIME_ZONE));
|
|
}
|
|
}
|