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

Merged V2.9 to HEAD

Browse Source 
8960: Stop tests running if image transformer not available
   8991: Fix AR-2099
   8993: Fix AR-2099 - fix test fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-08 10:46:36 +00:00
parent 5fe540e1cb
commit 76cea3002b
6 changed files with 205 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/repo-admin-context.xml
View File

@@ -45,7 +45,7 @@
<value>/app:company_home/app:dictionary/app:models</value> <value>/app:company_home/app:dictionary/app:models</value>
</property> </property>
<property name="queryLanguage"> <property name="queryLanguage">
<value>lucene</value> <value>xpath</value>
</property> </property>
</bean> </bean>
@@ -55,7 +55,7 @@
<value>/app:company_home/app:dictionary/app:messages</value> <value>/app:company_home/app:dictionary/app:messages</value>
</property> </property>
<property name="queryLanguage"> <property name="queryLanguage">
<value>lucene</value> <value>xpath</value>
</property> </property>
</bean> </bean>

5
source/java/org/alfresco/repo/dictionary/DictionaryComponent.java
View File

@@ -35,7 +35,6 @@ import org.alfresco.service.cmr.dictionary.AssociationDefinition;
import org.alfresco.service.cmr.dictionary.ClassDefinition; import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
import org.alfresco.service.cmr.dictionary.ModelDefinition; import org.alfresco.service.cmr.dictionary.ModelDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -199,12 +198,12 @@ public class DictionaryComponent implements DictionaryService, TenantDeployer
ClassDefinition classDef = getClass(className); ClassDefinition classDef = getClass(className);
if (classDef == null) if (classDef == null)
{ {
throw new InvalidTypeException(className); return false;
} }
ClassDefinition ofClassDef = getClass(ofClassName); ClassDefinition ofClassDef = getClass(ofClassName);
if (ofClassDef == null) if (ofClassDef == null)
{ {
throw new InvalidTypeException(ofClassName); return false;
} }
// Only check if both ends are either a type or an aspect // Only check if both ends are either a type or an aspect

21
source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java
View File

@@ -44,7 +44,6 @@ import org.alfresco.service.cmr.dictionary.Constraint;
import org.alfresco.service.cmr.dictionary.ConstraintDefinition; import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
import org.alfresco.service.cmr.dictionary.ModelDefinition; import org.alfresco.service.cmr.dictionary.ModelDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -311,19 +310,15 @@ public class DictionaryDAOTest extends TestCase
QName referenceable = QName.createQName(TEST_URL, "referenceable"); QName referenceable = QName.createQName(TEST_URL, "referenceable");
// Test invalid args // Test invalid args
try boolean testI1 = service.isSubClass(invalid, referenceable);
{
service.isSubClass(invalid, referenceable);
fail("Failed to catch invalid class parameter");
}
catch(InvalidTypeException e) {}
try assertFalse(testI1);
{
service.isSubClass(referenceable, invalid); boolean testI2 = service.isSubClass(referenceable, invalid);
fail("Failed to catch invalid class parameter"); assertFalse(testI2);
}
catch(InvalidTypeException e) {} boolean testI3 = service.isSubClass(invalid, invalid);
assertFalse(testI3);
// Test various flavours of subclassof // Test various flavours of subclassof
boolean test1 = service.isSubClass(file, referenceable); // type vs aspect boolean test1 = service.isSubClass(file, referenceable); // type vs aspect

81
source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
View File

@@ -43,7 +43,6 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
@@ -236,28 +235,31 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
continue; // skip this location continue; // skip this location
} }
if (repositoryLocation.getQueryLanguage().equals(SearchService.LANGUAGE_LUCENE)) if (repositoryLocation.getQueryLanguage().equals(SearchService.LANGUAGE_XPATH))
{ {
ResultSet rs = searchService.query(storeRef, NodeRef rootNode = nodeService.getRootNode(storeRef);
SearchService.LANGUAGE_LUCENE,
repositoryLocation.getLuceneQueryStatement(ContentModel.TYPE_DICTIONARY_MODEL.getPrefixedQName(namespaceService))); List<NodeRef> nodeRefs = searchService.selectNodes(rootNode,
if (rs.length() > 0) repositoryLocation.getXPathQueryStatement(ContentModel.TYPE_DICTIONARY_MODEL.getPrefixedQName(namespaceService)),
null,
namespaceService,
false);
for (NodeRef dictionaryModel : nodeRefs)
{ {
for (NodeRef dictionaryModel : rs.getNodeRefs()) // Ignore if the node is a working copy or if its inactive
if (nodeService.hasAspect(dictionaryModel, ContentModel.ASPECT_WORKING_COPY) == false)
{ {
// Ignore if the node is a working copy or if its inactive Boolean isActive = (Boolean)nodeService.getProperty(dictionaryModel, ContentModel.PROP_MODEL_ACTIVE);
if (nodeService.hasAspect(dictionaryModel, ContentModel.ASPECT_WORKING_COPY) == false)
if ((isActive != null) && (isActive.booleanValue() == true))
{ {
Boolean isActive = (Boolean)nodeService.getProperty(dictionaryModel, ContentModel.PROP_MODEL_ACTIVE); M2Model model = createM2Model(dictionaryModel);
if ((isActive != null) && (isActive.booleanValue() == true)) if (model != null)
{ {
M2Model model = createM2Model(dictionaryModel); for (M2Namespace namespace : model.getNamespaces())
if (model != null)
{ {
for (M2Namespace namespace : model.getNamespaces()) modelMap.put(namespace.getUri(), model);
{
modelMap.put(namespace.getUri(), model);
}
} }
} }
} }
@@ -287,7 +289,6 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
for (RepositoryLocation repositoryLocation : this.repositoryMessagesLocations) for (RepositoryLocation repositoryLocation : this.repositoryMessagesLocations)
{ {
StoreRef storeRef = repositoryLocation.getStoreRef(); StoreRef storeRef = repositoryLocation.getStoreRef();
String path = repositoryLocation.getPath();
if (! nodeService.exists(storeRef)) if (! nodeService.exists(storeRef))
{ {
@@ -295,34 +296,28 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
continue; // skip this location continue; // skip this location
} }
if (repositoryLocation.getQueryLanguage().equals(SearchService.LANGUAGE_LUCENE)) if (repositoryLocation.getQueryLanguage().equals(SearchService.LANGUAGE_XPATH))
{ {
ResultSet rs = searchService.query(storeRef, NodeRef rootNode = nodeService.getRootNode(storeRef);
SearchService.LANGUAGE_LUCENE,
repositoryLocation.getLuceneQueryStatement(ContentModel.TYPE_CONTENT.getPrefixedQName(namespaceService))); List<NodeRef> nodeRefs = searchService.selectNodes(rootNode,
if (rs.length() > 0) repositoryLocation.getXPathQueryStatement(ContentModel.TYPE_CONTENT.getPrefixedQName(namespaceService)),
null,
namespaceService,
false);
List<String> resourceBundleBaseNames = new ArrayList<String>();
for (NodeRef messageResource : nodeRefs)
{ {
List<String> resourceBundleBaseNames = new ArrayList<String>(); String resourceName = (String) nodeService.getProperty(
for (NodeRef messageResource : rs.getNodeRefs()) messageResource, ContentModel.PROP_NAME);
String bundleBaseName = messageService.getBaseBundleName(resourceName);
if (!resourceBundleBaseNames.contains(bundleBaseName))
{ {
String resourceName = (String) nodeService.getProperty( resourceBundleBaseNames.add(bundleBaseName);
messageResource, ContentModel.PROP_NAME);
String bundleBaseName = messageService.getBaseBundleName(resourceName);
if (!resourceBundleBaseNames.contains(bundleBaseName))
{
resourceBundleBaseNames.add(bundleBaseName);
}
}
// Only need to register resource bundle names
for (String resourceBundleBaseName : resourceBundleBaseNames)
{
logger.info("Register bundle: " + resourceBundleBaseName);
messageService.registerResourceBundle(storeRef.toString() + path + "/cm:" + resourceBundleBaseName);
} }
} }
} }

2
source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
View File

@@ -110,7 +110,7 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
RepositoryLocation location = new RepositoryLocation(); RepositoryLocation location = new RepositoryLocation();
location.setStoreProtocol(this.storeRef.getProtocol()); location.setStoreProtocol(this.storeRef.getProtocol());
location.setStoreId(this.storeRef.getIdentifier()); location.setStoreId(this.storeRef.getIdentifier());
location.setQueryLanguage(SearchService.LANGUAGE_LUCENE); location.setQueryLanguage(SearchService.LANGUAGE_XPATH);
// NOTE: we are not setting the path for now .. in doing so we are searching the whole dictionary // NOTE: we are not setting the path for now .. in doing so we are searching the whole dictionary
List<RepositoryLocation> locations = new ArrayList<RepositoryLocation>(); List<RepositoryLocation> locations = new ArrayList<RepositoryLocation>();

264
source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
View File

@@ -83,164 +83,176 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
public void testCreateThumbnailFromImage() throws Exception public void testCreateThumbnailFromImage() throws Exception
{ {
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG); // Check that the image transformations are available
NodeRef gifOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_GIF); if (this.contentService.getImageTransformer() != null)
{
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG);
NodeRef gifOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_GIF);
// ===== small: 64x64, marked as thumbnail ==== // ===== small: 64x64, marked as thumbnail ====
ImageResizeOptions imageResizeOptions = new ImageResizeOptions(); ImageResizeOptions imageResizeOptions = new ImageResizeOptions();
imageResizeOptions.setWidth(64); imageResizeOptions.setWidth(64);
imageResizeOptions.setHeight(64); imageResizeOptions.setHeight(64);
imageResizeOptions.setResizeToThumbnail(true); imageResizeOptions.setResizeToThumbnail(true);
ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions(); ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions();
imageTransformationOptions.setResizeOptions(imageResizeOptions); imageTransformationOptions.setResizeOptions(imageResizeOptions);
CreateOptions createOptions = new CreateOptions( CreateOptions createOptions = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG, MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions, imageTransformationOptions,
"small"); "small");
NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
assertNotNull(thumbnail1);
checkThumbnailed(jpgOrig, "small");
checkThumbnail(thumbnail1, imageTransformationOptions);
outputThumbnailTempContentLocation(thumbnail1, "jpg", "small - 64x64, marked as thumbnail");
// ===== small2: 64x64, aspect not maintained ==== NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
assertNotNull(thumbnail1);
checkThumbnailed(jpgOrig, "small");
checkThumbnail(thumbnail1, imageTransformationOptions);
outputThumbnailTempContentLocation(thumbnail1, "jpg", "small - 64x64, marked as thumbnail");
ImageResizeOptions imageResizeOptions2 = new ImageResizeOptions(); // ===== small2: 64x64, aspect not maintained ====
imageResizeOptions2.setWidth(64);
imageResizeOptions2.setHeight(64);
imageResizeOptions2.setMaintainAspectRatio(false);
ImageTransformationOptions imageTransformationOptions2 = new ImageTransformationOptions();
imageTransformationOptions2.setResizeOptions(imageResizeOptions2);
CreateOptions createOptions2 = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions2,
"small2");
NodeRef thumbnail2 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions2);
checkThumbnailed(jpgOrig, "small2");
checkThumbnail(thumbnail2, imageTransformationOptions2);
outputThumbnailTempContentLocation(thumbnail2, "jpg", "small2 - 64x64, aspect not maintained");
// ===== half: 50%x50 ===== ImageResizeOptions imageResizeOptions2 = new ImageResizeOptions();
imageResizeOptions2.setWidth(64);
imageResizeOptions2.setHeight(64);
imageResizeOptions2.setMaintainAspectRatio(false);
ImageTransformationOptions imageTransformationOptions2 = new ImageTransformationOptions();
imageTransformationOptions2.setResizeOptions(imageResizeOptions2);
CreateOptions createOptions2 = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions2,
"small2");
NodeRef thumbnail2 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions2);
checkThumbnailed(jpgOrig, "small2");
checkThumbnail(thumbnail2, imageTransformationOptions2);
outputThumbnailTempContentLocation(thumbnail2, "jpg", "small2 - 64x64, aspect not maintained");
ImageResizeOptions imageResizeOptions3 = new ImageResizeOptions(); // ===== half: 50%x50 =====
imageResizeOptions3.setWidth(50);
imageResizeOptions3.setHeight(50); ImageResizeOptions imageResizeOptions3 = new ImageResizeOptions();
imageResizeOptions3.setPercentResize(true); imageResizeOptions3.setWidth(50);
ImageTransformationOptions imageTransformationOptions3 = new ImageTransformationOptions(); imageResizeOptions3.setHeight(50);
imageTransformationOptions3.setResizeOptions(imageResizeOptions3); imageResizeOptions3.setPercentResize(true);
CreateOptions createOptions3 = new CreateOptions( ImageTransformationOptions imageTransformationOptions3 = new ImageTransformationOptions();
MimetypeMap.MIMETYPE_IMAGE_JPEG, imageTransformationOptions3.setResizeOptions(imageResizeOptions3);
imageTransformationOptions3, CreateOptions createOptions3 = new CreateOptions(
"half"); MimetypeMap.MIMETYPE_IMAGE_JPEG,
NodeRef thumbnail3 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions3); imageTransformationOptions3,
checkThumbnailed(jpgOrig, "half"); "half");
checkThumbnail(thumbnail3, imageTransformationOptions3); NodeRef thumbnail3 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions3);
outputThumbnailTempContentLocation(thumbnail3, "jpg", "half - 50%x50%"); checkThumbnailed(jpgOrig, "half");
checkThumbnail(thumbnail3, imageTransformationOptions3);
outputThumbnailTempContentLocation(thumbnail3, "jpg", "half - 50%x50%");
// ===== half2: 50%x50 from gif ===== // ===== half2: 50%x50 from gif =====
ImageResizeOptions imageResizeOptions4 = new ImageResizeOptions();
imageResizeOptions4.setWidth(50);
imageResizeOptions4.setHeight(50);
imageResizeOptions4.setPercentResize(true);
ImageTransformationOptions imageTransformationOptions4 = new ImageTransformationOptions();
imageTransformationOptions4.setResizeOptions(imageResizeOptions4);
CreateOptions createOptions4 = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions4,
"half2");
NodeRef thumbnail4 = this.thumbnailService.createThumbnail(gifOrig, ContentModel.PROP_CONTENT, createOptions4);
checkThumbnailed(gifOrig, "half2");
checkThumbnail(thumbnail4, imageTransformationOptions4);
outputThumbnailTempContentLocation(thumbnail4, "jpg", "half2 - 50%x50%, from gif");
ImageResizeOptions imageResizeOptions4 = new ImageResizeOptions();
imageResizeOptions4.setWidth(50);
imageResizeOptions4.setHeight(50);
imageResizeOptions4.setPercentResize(true);
ImageTransformationOptions imageTransformationOptions4 = new ImageTransformationOptions();
imageTransformationOptions4.setResizeOptions(imageResizeOptions4);
CreateOptions createOptions4 = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions4,
"half2");
NodeRef thumbnail4 = this.thumbnailService.createThumbnail(gifOrig, ContentModel.PROP_CONTENT, createOptions4);
checkThumbnailed(gifOrig, "half2");
checkThumbnail(thumbnail4, imageTransformationOptions4);
outputThumbnailTempContentLocation(thumbnail4, "jpg", "half2 - 50%x50%, from gif");
}
} }
public void testDuplicationNames() public void testDuplicationNames()
throws Exception throws Exception
{ {
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG); if (contentService.getImageTransformer() != null)
ImageResizeOptions imageResizeOptions = new ImageResizeOptions(); {
imageResizeOptions.setWidth(64); NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG);
imageResizeOptions.setHeight(64); ImageResizeOptions imageResizeOptions = new ImageResizeOptions();
imageResizeOptions.setResizeToThumbnail(true); imageResizeOptions.setWidth(64);
ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions(); imageResizeOptions.setHeight(64);
imageTransformationOptions.setResizeOptions(imageResizeOptions); imageResizeOptions.setResizeToThumbnail(true);
CreateOptions createOptions = new CreateOptions( ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions();
MimetypeMap.MIMETYPE_IMAGE_JPEG, imageTransformationOptions.setResizeOptions(imageResizeOptions);
imageTransformationOptions, CreateOptions createOptions = new CreateOptions(
"small"); MimetypeMap.MIMETYPE_IMAGE_JPEG,
NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions); imageTransformationOptions,
assertNotNull(thumbnail1); "small");
checkThumbnailed(jpgOrig, "small"); NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
checkThumbnail(thumbnail1, imageTransformationOptions); assertNotNull(thumbnail1);
checkThumbnailed(jpgOrig, "small");
checkThumbnail(thumbnail1, imageTransformationOptions);
try try
{ {
this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions); this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
fail("A duplicate exception should have been raised"); fail("A duplicate exception should have been raised");
} }
catch (ThumbnailException exception) catch (ThumbnailException exception)
{ {
// OK since this should have been thrown // OK since this should have been thrown
}
} }
} }
public void testThumbnailUpdate() public void testThumbnailUpdate()
throws Exception throws Exception
{ {
// First create a thumbnail if (contentService.getImageTransformer() != null)
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG); {
ImageResizeOptions imageResizeOptions = new ImageResizeOptions(); // First create a thumbnail
imageResizeOptions.setWidth(64); NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG);
imageResizeOptions.setHeight(64); ImageResizeOptions imageResizeOptions = new ImageResizeOptions();
imageResizeOptions.setResizeToThumbnail(true); imageResizeOptions.setWidth(64);
ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions(); imageResizeOptions.setHeight(64);
imageTransformationOptions.setResizeOptions(imageResizeOptions); imageResizeOptions.setResizeToThumbnail(true);
CreateOptions createOptions = new CreateOptions( ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions();
MimetypeMap.MIMETYPE_IMAGE_JPEG, imageTransformationOptions.setResizeOptions(imageResizeOptions);
imageTransformationOptions, CreateOptions createOptions = new CreateOptions(
"small"); MimetypeMap.MIMETYPE_IMAGE_JPEG,
NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions); imageTransformationOptions,
"small");
// Update the thumbnail NodeRef thumbnail1 = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
this.thumbnailService.updateThumbnail(thumbnail1);
// Update the thumbnail
this.thumbnailService.updateThumbnail(thumbnail1);
}
} }
public void testGetThumbnailByName() public void testGetThumbnailByName()
throws Exception throws Exception
{ {
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG); if (contentService.getImageTransformer() != null)
{
NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG);
// Check for missing thumbnail // Check for missing thumbnail
NodeRef result1 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small"); NodeRef result1 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small");
assertNull("The thumbnail 'small' should have been missing", result1); assertNull("The thumbnail 'small' should have been missing", result1);
// Create the thumbnail // Create the thumbnail
ImageResizeOptions imageResizeOptions = new ImageResizeOptions(); ImageResizeOptions imageResizeOptions = new ImageResizeOptions();
imageResizeOptions.setWidth(64); imageResizeOptions.setWidth(64);
imageResizeOptions.setHeight(64); imageResizeOptions.setHeight(64);
imageResizeOptions.setResizeToThumbnail(true); imageResizeOptions.setResizeToThumbnail(true);
ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions(); ImageTransformationOptions imageTransformationOptions = new ImageTransformationOptions();
imageTransformationOptions.setResizeOptions(imageResizeOptions); imageTransformationOptions.setResizeOptions(imageResizeOptions);
CreateOptions createOptions = new CreateOptions( CreateOptions createOptions = new CreateOptions(
MimetypeMap.MIMETYPE_IMAGE_JPEG, MimetypeMap.MIMETYPE_IMAGE_JPEG,
imageTransformationOptions, imageTransformationOptions,
"small"); "small");
this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions); this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, createOptions);
// Try and retrieve the thumbnail // Try and retrieve the thumbnail
NodeRef result2 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small"); NodeRef result2 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small");
assertNotNull(result2); assertNotNull(result2);
checkThumbnail(result2, imageTransformationOptions); checkThumbnail(result2, imageTransformationOptions);
// Check for an other thumbnail that doesn't exist // Check for an other thumbnail that doesn't exist
NodeRef result3 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "anotherone"); NodeRef result3 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "anotherone");
assertNull("The thumbnail 'anotherone' should have been missing", result3); assertNull("The thumbnail 'anotherone' should have been missing", result3);
}
} }
// TODO test getThumbnails // TODO test getThumbnails