summaryrefslogtreecommitdiffstats
path: root/qadevOOo/runner
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-10-04 13:04:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-10-05 09:50:53 +0200
commita25868231adba6a3be30f9aedb71315de0c79acd (patch)
treeacfb43592fe19d84102d5d389a15b4b0d53760db /qadevOOo/runner
parentloplugin:finalclasses in vcl (diff)
downloadcore-a25868231adba6a3be30f9aedb71315de0c79acd.tar.gz
core-a25868231adba6a3be30f9aedb71315de0c79acd.zip
coverity#1399440 Dm: Dubious method used
Change-Id: Ied0a5218b4f95a300d09483315d577b5bdf01bae Reviewed-on: https://gerrit.libreoffice.org/43135 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r--qadevOOo/runner/base/java_complex.java5
-rw-r--r--qadevOOo/runner/base/java_fat.java3
-rw-r--r--qadevOOo/runner/helper/AppProvider.java4
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java3
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java8
-rw-r--r--qadevOOo/runner/util/dbg.java6
6 files changed, 21 insertions, 8 deletions
diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java
index 212c9337778f..9e61c5c5f9ae 100644
--- a/qadevOOo/runner/base/java_complex.java
+++ b/qadevOOo/runner/base/java_complex.java
@@ -29,6 +29,7 @@ import share.LogWriter;
import stats.Summarizer;
import lib.TestParameters;
import util.PropertyName;
+import java.io.UnsupportedEncodingException;
/**
* Test base for executing a java complex test.
@@ -110,6 +111,10 @@ public class java_complex implements TestBase
{
office = null;
}
+ catch (UnsupportedEncodingException e)
+ {
+ office = null;
+ }
}
log.initialize(entries[i], param.getBool(PropertyName.LOGGING_IS_ACTIVE));
entries[i].Logger = log;
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java
index 4ed28f2c3652..c85103508cbe 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -24,6 +24,7 @@ import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import lib.MultiMethodTest;
import lib.TestCase;
@@ -446,7 +447,7 @@ public class java_fat implements TestBase {
return ifc.run(entry, tEnv, param);
}
- private AppProvider startOffice(lib.TestParameters param) {
+ private AppProvider startOffice(lib.TestParameters param) throws UnsupportedEncodingException {
if (m_aDynamicClassLoader == null) {
m_aDynamicClassLoader = new DynamicClassLoader();
}
diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/runner/helper/AppProvider.java
index e8f77d1f059a..a42411ac6589 100644
--- a/qadevOOo/runner/helper/AppProvider.java
+++ b/qadevOOo/runner/helper/AppProvider.java
@@ -18,6 +18,8 @@
package helper;
+import java.io.UnsupportedEncodingException;
+
/**
*
* Interface to get a Manager to access the application to check
@@ -27,7 +29,7 @@ public interface AppProvider {
/**
* Method to get the desired Manager
*/
- Object getManager(lib.TestParameters param);
+ Object getManager(lib.TestParameters param) throws UnsupportedEncodingException;
/**
* Method to dispose the desired Manager
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 880565896443..01599cd3ff15 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -31,6 +31,7 @@ import com.sun.star.util.XStringSubstitution;
import java.io.File;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import lib.TestParameters;
@@ -146,7 +147,7 @@ public class OfficeProvider implements AppProvider
/**
* Method to get the ServiceManager of an Office
*/
- public Object getManager(lib.TestParameters param)
+ public Object getManager(lib.TestParameters param) throws UnsupportedEncodingException
{
String errorMessage = null;
boolean bAppExecutionHasWarning = false;
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 2b2e94efed38..7098db7d2590 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -19,6 +19,8 @@ package helper;
import java.io.InputStream;
import java.io.File;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.io.PrintWriter;
import java.io.PrintStream;
import java.io.LineNumberReader;
@@ -128,7 +130,7 @@ public class ProcessHandler
* log stream where debug info and output
* of external command is printed out.
*/
- public ProcessHandler(String cmdLine, PrintWriter log)
+ public ProcessHandler(String cmdLine, PrintWriter log) throws UnsupportedEncodingException
{
this(cmdLine, log, null, null);
}
@@ -157,7 +159,7 @@ public class ProcessHandler
* Waits for the process to end regulary
*
*/
- private ProcessHandler(String cmdLine, PrintWriter log, File workDir, String[] envVars)
+ private ProcessHandler(String cmdLine, PrintWriter log, File workDir, String[] envVars) throws UnsupportedEncodingException
{
this.cmdLine = cmdLine;
this.workDir = workDir;
@@ -165,7 +167,7 @@ public class ProcessHandler
this.envVars = envVars;
if (log == null)
{
- this.log = new PrintWriter(System.out);
+ this.log = new PrintWriter(new OutputStreamWriter(System.out, "UTF-8"));
}
else
{
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index ba06f3c714ff..3a0035cde079 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -29,6 +29,8 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.lang.XTypeProvider;
import com.sun.star.lang.XServiceInfo;
import java.io.PrintWriter;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.Method;
/**
@@ -125,8 +127,8 @@ public class dbg {
* @param name The name of the property.
* @see com.sun.star.beans.XPropertySet
*/
- public static void printPropertyInfo(XPropertySet PS, String name) {
- printPropertyInfo(PS, name, new PrintWriter(System.out)) ;
+ public static void printPropertyInfo(XPropertySet PS, String name) throws UnsupportedEncodingException {
+ printPropertyInfo(PS, name, new PrintWriter(new OutputStreamWriter(System.out, "UTF-8")));
}
/**