svn commit: r1420033 - in /openoffice/trunk/test: testcommon/source/org/openoffice/test/common/FileProvider.java testuno/source/fvt/uno/sd/animation/TextAnimation.java testuno/source/pvt/uno/Conversion.java

[liliny]

Author: liliny
Date: Tue Dec 11 08:33:52 2012
New Revision: 1420033

URL: http://svn.apache.org/viewvc?rev=1420033&view=rev
Log:
Conversion.java: modified timeout time to 10 minutes. added -enableautomation 
option.
TextAnimation.java: fixed compile error.

Modified:
    
openoffice/trunk/test/testcommon/source/org/openoffice/test/common/FileProvider.java
    openoffice/trunk/test/testuno/source/fvt/uno/sd/animation/TextAnimation.java
    openoffice/trunk/test/testuno/source/pvt/uno/Conversion.java

Modified: 
openoffice/trunk/test/testcommon/source/org/openoffice/test/common/FileProvider.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/test/testcommon/source/org/openoffice/test/common/FileProvider.java?rev=1420033&r1=1420032&r2=1420033&view=diff
==============================================================================
--- 
openoffice/trunk/test/testcommon/source/org/openoffice/test/common/FileProvider.java
 (original)
+++ 
openoffice/trunk/test/testcommon/source/org/openoffice/test/common/FileProvider.java
 Tue Dec 11 08:33:52 2012
@@ -138,7 +138,7 @@ public class FileProvider extends Suite 
                        if (a != null) {
                                Object v = f.get(null);
                                if (v != null && !(v instanceof Integer))
-                                       throw new 
InitializationError(String.format("Field annotated FileFilter '%s' must be 
String.", f.getName()));
+                                       throw new 
InitializationError(String.format("Field annotated FileFilter '%s' must be 
Integer.", f.getName()));
                                repeat = (Integer) v;
                        }
                        

Modified: 
openoffice/trunk/test/testuno/source/fvt/uno/sd/animation/TextAnimation.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/test/testuno/source/fvt/uno/sd/animation/TextAnimation.java?rev=1420033&r1=1420032&r2=1420033&view=diff
==============================================================================
--- 
openoffice/trunk/test/testuno/source/fvt/uno/sd/animation/TextAnimation.java 
(original)
+++ 
openoffice/trunk/test/testuno/source/fvt/uno/sd/animation/TextAnimation.java 
Tue Dec 11 08:33:52 2012
@@ -197,7 +197,7 @@ public class TextAnimation {
                                XStorable.class, presentationDocument);
                xStorable.storeToURL(FileUtil.getUrl(filePath), 
aStoreProperties);
 
-               return UnoRuntime.queryInterface(XComponent.class,
+               return (XComponent)UnoRuntime.queryInterface(XComponent.class,
                                unoApp.loadDocument(filePath));
        }
 }

Modified: openoffice/trunk/test/testuno/source/pvt/uno/Conversion.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/test/testuno/source/pvt/uno/Conversion.java?rev=1420033&r1=1420032&r2=1420033&view=diff
==============================================================================
--- openoffice/trunk/test/testuno/source/pvt/uno/Conversion.java (original)
+++ openoffice/trunk/test/testuno/source/pvt/uno/Conversion.java Tue Dec 11 
08:33:52 2012
@@ -77,7 +77,7 @@ public class Conversion {
        
        public static int nLevelInfo = 
Integer.parseInt(System.getProperty("conversion.limitationcheck", "0")); // 
Level info: starts from 1, 0 means no need for limitation check
 
-       public static long nSleep = 
Long.parseLong(System.getProperty("conversion.sleep", "0"));        // Sleep 
before loadComponentFromURL and storeToURL
+       public static long nSleep = 
Long.parseLong(System.getProperty("conversion.sleep", "0"));        // Sleep 
before loadComponentFromURL and storeToURL, millisecond
        
        private static OpenOffice aoo = new OpenOffice();
        
@@ -90,7 +90,7 @@ public class Conversion {
        @BeforeClass
        public static void beforeClass() throws Exception {
                aoo.setUnoUrl(OpenOffice.DEFAULT_UNO_URL);
-               aoo.addArgs("-invisible", "-conversionmode", "-hidemenu", 
"-nofirststartwizard", "-headless");
+               aoo.addArgs("-invisible", "-conversionmode", "-hidemenu", 
"-nofirststartwizard", "-headless", "-enableautomation");
            app = new UnoApp(aoo);
            Testspace.prepareDataFile("limit_cfg.ini", 
aoo.getHome().toString()+"/program");    // Move limitation check file to 
installation dir
                result = new DataSheet(getFile("output/" + 
Conversion.class.getName()+ ".xml"));
@@ -159,7 +159,7 @@ public class Conversion {
        }
 
        
-       @Test(timeout=5 * 60000)
+       @Test(timeout=10 * 60000)
        public void testConversion() throws Exception {
                try {
                        if (nSleep > 0)
@@ -185,12 +185,18 @@ public class Conversion {
                        closeTime = System.currentTimeMillis() - start - nSleep;
                } catch (com.sun.star.task.ErrorCodeIOException e){
                        int errCode = e.ErrCode;
-                       if( 296 == errCode ) {
+                       if( 296 == errCode ) {  // limitation check file
                                loadTime = -2;
                                saveTime = -2;
                                closeTime = -2;
                        }
                        
+                       if( 3878 == errCode ) { // file is corrupt
+                               loadTime = -3;
+                               saveTime = -3;
+                               closeTime = -3;
+                       }
+                       
                        throw e;
                }
        }