Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 9a889c69ea
commit 386a4aca06
327 changed files with 55062 additions and 55062 deletions

View File

@@ -1,65 +1,65 @@
package org.alfresco.repo.web.scripts.content;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.ContentTransformerRegistry;
import org.alfresco.repo.content.transform.PdfBoxContentTransformer;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.springframework.context.ApplicationContext;
/**
* Tests the {@link MimetypesGet} endpoint
*/
public class MimetypesGetTest extends BaseWebScriptTest
{
private ApplicationContext ctx;
private ContentTransformerRegistry contentTransformerRegistry;
@Override
protected void setUp() throws Exception
{
super.setUp();
ctx = getServer().getApplicationContext();
contentTransformerRegistry = (ContentTransformerRegistry) ctx.getBean("contentTransformerRegistry");
}
/**
* Tests the <code>mimetypesGet.getTransformer</code> method directly for
* varefication of label text
*
* @throws Exception
*/
public void testGetTransformer() throws Exception
{
MimetypesGet mimetypesGet = new MimetypesGet();
mimetypesGet.setApplicationContext(ctx);
mimetypesGet.setContentTransformerRegistry(contentTransformerRegistry);
mimetypesGet.afterPropertiesSet();
// Test a Java transformer name
String transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_PDF, 1000, MimetypeMap.MIMETYPE_TEXT_PLAIN);
assertEquals(PdfBoxContentTransformer.class.getCanonicalName(), transformerName);
// Test a generic proxy transformer name
transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_IMAGE_JPEG, 1000, MimetypeMap.MIMETYPE_IMAGE_PNG);
assertNotNull(transformerName);
assertTrue("Expected transformerName to contain 'Proxy' but was " + transformerName,
transformerName.contains("Proxy via"));
boolean oodirectPresent = ctx.containsBean(MimetypesGet.OODIRECT_WORKER_BEAN);
boolean jodPresent = ctx.containsBean(MimetypesGet.JOD_WORKER_BEAN);
// Test the office transformer name
transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_WORD, 1000, MimetypeMap.MIMETYPE_PDF);
assertNotNull(transformerName);
if (oodirectPresent)
{
assertEquals("Using a Direct Open Office Connection", transformerName);
}
else if (jodPresent)
{
assertEquals("Using JOD Converter / Open Office", transformerName);
}
}
}
package org.alfresco.repo.web.scripts.content;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.ContentTransformerRegistry;
import org.alfresco.repo.content.transform.PdfBoxContentTransformer;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.springframework.context.ApplicationContext;
/**
* Tests the {@link MimetypesGet} endpoint
*/
public class MimetypesGetTest extends BaseWebScriptTest
{
private ApplicationContext ctx;
private ContentTransformerRegistry contentTransformerRegistry;
@Override
protected void setUp() throws Exception
{
super.setUp();
ctx = getServer().getApplicationContext();
contentTransformerRegistry = (ContentTransformerRegistry) ctx.getBean("contentTransformerRegistry");
}
/**
* Tests the <code>mimetypesGet.getTransformer</code> method directly for
* varefication of label text
*
* @throws Exception
*/
public void testGetTransformer() throws Exception
{
MimetypesGet mimetypesGet = new MimetypesGet();
mimetypesGet.setApplicationContext(ctx);
mimetypesGet.setContentTransformerRegistry(contentTransformerRegistry);
mimetypesGet.afterPropertiesSet();
// Test a Java transformer name
String transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_PDF, 1000, MimetypeMap.MIMETYPE_TEXT_PLAIN);
assertEquals(PdfBoxContentTransformer.class.getCanonicalName(), transformerName);
// Test a generic proxy transformer name
transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_IMAGE_JPEG, 1000, MimetypeMap.MIMETYPE_IMAGE_PNG);
assertNotNull(transformerName);
assertTrue("Expected transformerName to contain 'Proxy' but was " + transformerName,
transformerName.contains("Proxy via"));
boolean oodirectPresent = ctx.containsBean(MimetypesGet.OODIRECT_WORKER_BEAN);
boolean jodPresent = ctx.containsBean(MimetypesGet.JOD_WORKER_BEAN);
// Test the office transformer name
transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_WORD, 1000, MimetypeMap.MIMETYPE_PDF);
assertNotNull(transformerName);
if (oodirectPresent)
{
assertEquals("Using a Direct Open Office Connection", transformerName);
}
else if (jodPresent)
{
assertEquals("Using JOD Converter / Open Office", transformerName);
}
}
}