Fix content transformer unit tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-04-07 10:19:35 +00:00
parent 8986debad5
commit 5351ed6aa3
4 changed files with 39 additions and 47 deletions

View File

@@ -22,7 +22,6 @@
* http://www.alfresco.com/legal/licensing" */
package org.alfresco.repo.content.metadata;
import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
/**
* @author Jesper Steen Møller
@@ -36,14 +35,11 @@ public class OpenOfficeMetadataExtracterTest extends AbstractMetadataExtracterTe
{
super.setUp();
OpenOfficeConnection connection = (OpenOfficeConnection) ctx.getBean("openOfficeConnection");
OpenOfficeMetadataWorker worker = (OpenOfficeMetadataWorker) ctx.getBean("extracter.worker.OpenOffice");
extracter = new OpenOfficeMetadataExtracter();
extracter.setMimetypeService(mimetypeMap);
extracter.setDictionaryService(dictionaryService);
DefaultOpenOfficeMetadataWorker worker = new DefaultOpenOfficeMetadataWorker();
worker.setConnection(connection);
worker.setMimetypeService(mimetypeMap);
extracter.setWorker(worker);
extracter.init();
}

View File

@@ -26,8 +26,6 @@ package org.alfresco.repo.content.transform;
import java.io.File;
import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.content.filestore.FileContentWriter;
@@ -45,7 +43,7 @@ public class OpenOfficeContentTransformerTest extends AbstractContentTransformer
{
private static String MIMETYPE_RUBBISH = "text/rubbish";
private OpenOfficeContentTransformerWorker worker;
private ContentTransformerWorker worker;
private ContentTransformer transformer;
@Override
@@ -53,16 +51,10 @@ public class OpenOfficeContentTransformerTest extends AbstractContentTransformer
{
super.setUp();
OpenOfficeConnection connection = (OpenOfficeConnection) ctx.getBean("openOfficeConnection");
this.worker = new OpenOfficeContentTransformerWorker();
worker.setMimetypeService(mimetypeService);
worker.setConnection(connection);
worker.setDocumentFormatsConfiguration("classpath:alfresco/mimetype/openoffice-document-formats.xml");
worker.afterPropertiesSet();
this.worker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
ProxyContentTransformer transformer = new ProxyContentTransformer();
transformer.setMimetypeService(mimetypeService);
transformer.setWorker(worker);
transformer.setWorker(this.worker);
this.transformer = transformer;
}

View File

@@ -59,6 +59,7 @@ public class ImageMagickContentTransformerTest extends AbstractContentTransforme
ProxyContentTransformer transformer = new ProxyContentTransformer();
transformer.setMimetypeService(mimetypeService);
transformer.setWorker(worker);
this.transformer = transformer;
}