[Libreoffice-commits] core.git: 4 commits - qadevOOo/tests

[Caolán McNamara]

 qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java |   14 +++++-----
 qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java                  |   12 ++++++--
 qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java        |    9 ------
 qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java     |    3 --
 4 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit f173e148d8f2d0600fd50bee05e536932d529643
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 30 20:48:44 2015 +0000

    coverity#1326573 Unused value
    
    Change-Id: I72f70f8f0e01cdd59c2086244f328a007563adbd

diff --git a/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java b/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java
index 68e47d2..18b6e91 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java
@@ -70,13 +70,15 @@ public class _XMimeContentTypeFactory extends MultiMethodTest {
             result = false ;
         }
 
-        try {
-            oObj.createMimeContentType("nosuchtype") ;
+        if (result == true) {
+            try {
+                oObj.createMimeContentType("nosuchtype") ;
 
-            log.println("!!! No exception was thrown on wrong MIME type !!!") ;
-            result = false ;
-        } catch (com.sun.star.lang.IllegalArgumentException e) {
-            log.println("Right exception was thrown." ) ;
+                log.println("!!! No exception was thrown on wrong MIME type !!!") ;
+                result = false ;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                log.println("Right exception was thrown." ) ;
+            }
         }
 
         tRes.tested("createMimeContentType()", result) ;
commit f1207dbd3a0b9b05746eecfd0eb4aa4e1efcbeb9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 30 20:36:03 2015 +0000

    coverity#1326230 Dereference after null check
    
    Change-Id: I463ad43a31b870e6e67720089514337336e6015e

diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
index 277ba56..77e96d7 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
@@ -51,13 +51,12 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
         requiredMethod("getLocaleList()");
 
         boolean result = true;
-        boolean locResult = false;
 
         for (int i = 0; i < locales.length; i++) {
             String[] algNames = oObj.getAlgorithmList(locales[i]);
             algorithms.put(Integer.valueOf(i), algNames);
 
-            locResult = algNames != null && algNames.length > 0;
+            boolean locResult = algNames.length > 0;
             System.out.println("Locale " + i + ": " + locales[i].Country+","+locales[i].Language);
 
             for (int j=0; j<algNames.length; j++) {
commit 3b13f1657a96c8bbd6e9b25ba0cc56c6bf7ab097
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 30 20:32:00 2015 +0000

    coverity#1327153 UrF: Unread field
    
    Change-Id: Ia5d4957b7b47ec103e2af0136ea8d40f21a0a4cf

diff --git a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
index c11b236..aa2f490 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
@@ -49,15 +49,6 @@ public class _XCharacterClassification extends MultiMethodTest {
     public String[] languages = new String[]{"de","en","es","fr","ja","ko","zh"};
     public String[] countries = new String[]{"DE","US","ES","FR","JP","KR","CN"};
 
-    public String[] charstyles_java = new String[] {"UNASSIGNED","UPPERCASE_LETTER",
-        "LOWERCASE_LETTER","TITLECASE_LETTER","MODIFIER_LETTER","OTHER_LETTER",
-        "NON_SPACING_MARK","ENCLOSING_MARK","COMBINING_SPACING_MARK",
-        "DECIMAL_DIGIT_NUMBER","LETTER_NUMBER","OTHER_NUMBER","SPACE_SEPARATOR",
-        "LINE_SEPARATOR","PARAGRAPH_SEPARATOR","CONTROL","FORMAT","none17",
-        "PRIVATE_USE","none19","DASH_PUNCTUATION","START_PUNCTUATION","END_PUNCTUATION",
-        "CONNECTOR_PUNCTUATION","OTHER_PUNCTUATION","MATH_SYMBOL","CURRENCY_SYMBOL",
-        "MODIFIER_SYMBOL","OTHER_SYMBOL"};
-
     public String[] charstyles_office = new String[] {"UNASSIGNED","UPPERCASE_LETTER",
         "LOWERCASE_LETTER","TITLECASE_LETTER","MODIFIER_LETTER","OTHER_LETTER",
         "NON_SPACING_MARK","ENCLOSING_MARK","COMBINING_SPACING_MARK",
commit 4f4c3032d3425f9757e0a27191e4f2c4fe5a4f17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 30 20:28:58 2015 +0000

    coverity#1326927 silence Suspicious use of non-short-circuit boolean operator
    
    Change-Id: I2973ab6cd021e4a36f11ae97d926faca77ea42be

diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
index dcdca9f..d33165f 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
@@ -582,15 +582,21 @@ public class _XBreakIterator extends MultiMethodTest {
         for(int i = 0; i < vCharBlockBounds.size() - 1; i++) {
             int endPos = vCharBlockBounds.get(i).endPos;
             int startPos = vCharBlockBounds.get(i + 1).startPos;
-            bCharBlockRes &= endPos == startPos;
+            if (endPos != startPos) {
+                bCharBlockRes = false;
+            }
         }
 
         log.println("Testing for no intersections : " + bCharBlockRes);
         int startPos = vCharBlockBounds.get(0).startPos;
-        bCharBlockRes &= startPos == 0;
+        if (startPos != 0) {
+            bCharBlockRes = false;
+        }
         int endPos = vCharBlockBounds.get
             (vCharBlockBounds.size() - 1).endPos;
-        bCharBlockRes &= endPos == UnicodeString.length();
+        if (endPos != UnicodeString.length()) {
+            bCharBlockRes = false;
+        }
         log.println("Regions should starts with 0 and ends with "
             + UnicodeString.length());