perftest12:#163613# cleanups for O3 usage

6 files changed, 23 insertions, 7 deletions

diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 5f624979a64a..3d496826f5f2 100644
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@ -254,8 +254,15 @@ private void callEntry(String _sEntry, ParameterHelper _aParam)
                 for (int i=0;i<aList.size();i++)
                 {
                     String sEntry = aList.get(i);
-                    callEntry(sEntry, _aParam);
-
+                    try
+                    {
+                        callEntry(sEntry, _aParam);
+                    }
+                    catch (AssureException e)
+                    {
+                        // we only need to catch the assure()
+                        // nOkStatus += 2;
+                    }
                     // we want to know the current status of the run through
                     // if the status is greater (more bad) then the current,
                     // we will remember this. Only the very bad status will
@@ -469,9 +476,13 @@ private void callEntry(String _sEntry, ParameterHelper _aParam)
                             {
                                 String sPSFile = aList.get(i);
 
-                                // TODO: this information has to come out of the ini files
-                                String sStatusRunThrough = "";
-                                String sStatusMessage = "";
+                                // Read information out of the ini files
+                                String sIndexFile2 = FileHelper.appendPath(sPath, sPSFile + ".ini");
+                                IniFile aIniFile2 = new IniFile(sIndexFile2);
+                                String sStatusRunThrough = aIniFile2.getValue("global", "state");
+                                String sStatusMessage = ""; // aIniFile2.getValue("global", "info");
+                                aIniFile2.close();
+
 
                                 String sHTMLFile = sPSFile + ".html";
                                 aOutputter.indexLine(sHTMLFile, sPSFile, sStatusRunThrough, sStatusMessage);
diff --git a/qadevOOo/runner/graphical/JPEGEvaluator.java b/qadevOOo/runner/graphical/JPEGEvaluator.java
index 07b265b62355..049e96b15999 100644
--- a/qadevOOo/runner/graphical/JPEGEvaluator.java
+++ b/qadevOOo/runner/graphical/JPEGEvaluator.java
@@ -51,6 +51,8 @@ public class JPEGEvaluator extends EnhancedComplexTestCase
         GlobalLogWriter.set(log);
         ParameterHelper aParam = new ParameterHelper(param);
 
+        // aParam.getTestParameters().put("current_ok_status", -1);
+
         // run through all documents found in Inputpath
         foreachResultCreateHTML(aParam);
     }
diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java
index 8ecee36cc742..59eeb160f2d9 100644
--- a/qadevOOo/runner/graphical/Office.java
+++ b/qadevOOo/runner/graphical/Office.java
@@ -48,6 +48,7 @@ public class Office implements IOffice
         m_sResult = _sResult;
 
         if (_aParam.getReferenceType().toLowerCase().equals("ooo") ||
+            _aParam.getReferenceType().toLowerCase().equals("o3") ||
             _aParam.getReferenceType().toLowerCase().equals("ps") ||
             _aParam.getReferenceType().toLowerCase().equals("pdf"))
         {
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index dbe6305ca8c0..7111d5e0f794 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -102,6 +102,7 @@ public class OpenOfficePostscriptCreator implements IOffice
         {
             String sDocumentName = FileHelper.appendPath(m_sOutputURL, m_sBasename);
             if (m_aParameterHelper.getReferenceType().toLowerCase().equals("ooo") ||
+                m_aParameterHelper.getReferenceType().toLowerCase().equals("o3") ||
                 m_aParameterHelper.getReferenceType().toLowerCase().equals("ps") )
             {
                 String sPrintURL = sDocumentName + ".ps";
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index 598ee6c53007..a3608b191f63 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -267,7 +267,8 @@ public class ParameterHelper
             // check if MultiServiceFactory is given
             if (getReferenceType().toLowerCase().equals("pdf") ||
                 getReferenceType().toLowerCase().equals("ps") ||
-                getReferenceType().toLowerCase().equals("ooo"))
+                getReferenceType().toLowerCase().equals("ooo") ||
+                getReferenceType().toLowerCase().equals("o3") )
             {
                 if (xMSF == null)
                 {
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index 3023727400b3..f6397deb3e2b 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -184,7 +184,7 @@ public class Runner
 
     public static boolean run(String... args)
     {
-        System.out.println("OOoRunner Main() version from 20100913 (yyyymmdd)");
+        System.out.println("OOoRunner Main() version from 20100922 (yyyymmdd)");
 
         setStartTime(getTime());