From e507f9ea55d51dedc312447e33839c20076c144a Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 25 Sep 2014 06:14:01 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 85648: MNT-12422: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 85647: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 85646: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability - Need to reduce the timeout (50ms -> 30ms) of the test as it failed on HEAD-BUG-FIX after a new version of POI was merged from V4.2-BUG-FIX as it completed the transform in 52ms which then tripped over the check that its should not have completed. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85678 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/content/transform/PoiOOXMLContentTransformerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java b/source/test-java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java index db957bb980..3270f90e49 100644 --- a/source/test-java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java +++ b/source/test-java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions; */ public class PoiOOXMLContentTransformerTest extends AbstractContentTransformerTest { - private static final int SMALL_TIMEOUT = 50; + private static final int SMALL_TIMEOUT = 30; private static final int ADDITIONAL_PROCESSING_TIME = 1500; @@ -133,6 +133,7 @@ public class PoiOOXMLContentTransformerTest extends AbstractContentTransformerTe try { transformer.transform(sourceReader, tempWriter); + // should not get here unless transform is too fast long transformationTime = System.currentTimeMillis() - startTime; fail("Content transformation took " + transformationTime + " ms, but should have failed with a timeout at " + SMALL_TIMEOUT + " ms"); }