mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-09-17 14:21:39 +00:00
MNT-24883 test case fix
This commit is contained in:
@@ -157,7 +157,12 @@ public class LocalTransformImpl extends AbstractLocalTransform
|
|||||||
transformOptions.put(SOURCE_NODE_REF, sourceNodeRef.toString());
|
transformOptions.put(SOURCE_NODE_REF, sourceNodeRef.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
String filename = sourceNodeRef != null ? (String) nodeService.getProperty(sourceNodeRef, ContentModel.PROP_NAME) : null;
|
String filename = null;
|
||||||
|
if (sourceNodeRef != null && nodeService.exists(sourceNodeRef))
|
||||||
|
{
|
||||||
|
filename = (String) nodeService.getProperty(sourceNodeRef, ContentModel.PROP_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
if (StringUtils.isNotEmpty(filename))
|
if (StringUtils.isNotEmpty(filename))
|
||||||
{
|
{
|
||||||
transformOptions.put(SOURCE_FILENAME, filename);
|
transformOptions.put(SOURCE_FILENAME, filename);
|
||||||
|
@@ -64,6 +64,7 @@ import org.alfresco.repo.content.transform.LocalPipelineTransform;
|
|||||||
import org.alfresco.repo.content.transform.LocalTransformImpl;
|
import org.alfresco.repo.content.transform.LocalTransformImpl;
|
||||||
import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
|
import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
|
||||||
import org.alfresco.repo.content.transform.TransformerDebug;
|
import org.alfresco.repo.content.transform.TransformerDebug;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
import org.alfresco.transform.config.SupportedSourceAndTarget;
|
import org.alfresco.transform.config.SupportedSourceAndTarget;
|
||||||
import org.alfresco.transform.config.TransformConfig;
|
import org.alfresco.transform.config.TransformConfig;
|
||||||
import org.alfresco.transform.config.TransformOption;
|
import org.alfresco.transform.config.TransformOption;
|
||||||
@@ -205,6 +206,9 @@ public class LocalTransformServiceRegistryConfigTest extends TransformRegistryMo
|
|||||||
@Mock
|
@Mock
|
||||||
private MimetypeMap mimetypeMap;
|
private MimetypeMap mimetypeMap;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private NodeService nodeService;
|
||||||
|
|
||||||
private Map<String, List<String>> imagemagickSupportedTransformation;
|
private Map<String, List<String>> imagemagickSupportedTransformation;
|
||||||
private Map<String, List<String>> tikaSupportedTransformation;
|
private Map<String, List<String>> tikaSupportedTransformation;
|
||||||
private Map<String, List<String>> pdfRendererSupportedTransformation;
|
private Map<String, List<String>> pdfRendererSupportedTransformation;
|
||||||
@@ -232,6 +236,7 @@ public class LocalTransformServiceRegistryConfigTest extends TransformRegistryMo
|
|||||||
registry.setProperties(properties);
|
registry.setProperties(properties);
|
||||||
registry.setTransformerDebug(transformerDebug);
|
registry.setTransformerDebug(transformerDebug);
|
||||||
registry.setMimetypeService(mimetypeMap);
|
registry.setMimetypeService(mimetypeMap);
|
||||||
|
registry.setNodeService(nodeService);
|
||||||
registry.setPipelineConfigDir("");
|
registry.setPipelineConfigDir("");
|
||||||
registry.setCronExpression(null); // just read it once
|
registry.setCronExpression(null); // just read it once
|
||||||
registry.afterPropertiesSet();
|
registry.afterPropertiesSet();
|
||||||
|
@@ -28,6 +28,7 @@
|
|||||||
<property name="strictMimeTypeCheck" value="${transformer.strict.mimetype.check}"/>
|
<property name="strictMimeTypeCheck" value="${transformer.strict.mimetype.check}"/>
|
||||||
<property name="retryTransformOnDifferentMimeType" value="false"/>
|
<property name="retryTransformOnDifferentMimeType" value="false"/>
|
||||||
<property name="httpClientConfig" ref="httpClientConfigTransform" />
|
<property name="httpClientConfig" ref="httpClientConfigTransform" />
|
||||||
|
<property name="nodeService" ref="NodeService" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
Reference in New Issue
Block a user