basic: Fix broken logic in VBA's unit tests It should not be "OK" when no assertion passes. Change-Id: Ib6bab2d597a138468e96b4acf8c3be7abd112cca Reviewed-on: https://gerrit.libreoffice.org/37540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>

commit: b9d75dea30adaa53be58c112f255c9fcd3eea400 [log]
author: Takeshi Abe <tabe@fixedpoint.jp> Fri May 12 23:03:27 2017 +0900
committer: Takeshi Abe <tabe@fixedpoint.jp> Mon May 15 04:59:04 2017 +0200
tree: 9e0dfdf1b792f934827c8ea530028447776fb124
parent: f99c95c80d40431050fef655ac7ed05074768567 [diff]
diff --git a/basic/qa/vba_tests/abs.vb b/basic/qa/vba_tests/abs.vb
index e60880c..fc0c48a 100644
--- a/basic/qa/vba_tests/abs.vb
+++ b/basic/qa/vba_tests/abs.vb

@@ -7,7 +7,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testABS()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/array.vb b/basic/qa/vba_tests/array.vb
index 914cf44..78714ba 100644
--- a/basic/qa/vba_tests/array.vb
+++ b/basic/qa/vba_tests/array.vb

@@ -11,7 +11,7 @@ End Type

Function doUnitTest() As String
result = verify_testARRAY()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/asc.vb b/basic/qa/vba_tests/asc.vb
index 050d808..2d8b3bc 100644
--- a/basic/qa/vba_tests/asc.vb
+++ b/basic/qa/vba_tests/asc.vb

@@ -7,7 +7,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testASC()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/cbool.vb b/basic/qa/vba_tests/cbool.vb
index b5e7c70..43ef174 100644
--- a/basic/qa/vba_tests/cbool.vb
+++ b/basic/qa/vba_tests/cbool.vb

@@ -7,7 +7,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCBool()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/cdbl.vb b/basic/qa/vba_tests/cdbl.vb
index 34cb10a..65839f9 100644
--- a/basic/qa/vba_tests/cdbl.vb
+++ b/basic/qa/vba_tests/cdbl.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCdbl()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/choose.vb b/basic/qa/vba_tests/choose.vb
index 09ce64a..10c18f1 100644
--- a/basic/qa/vba_tests/choose.vb
+++ b/basic/qa/vba_tests/choose.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testChoose()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/chr.vb b/basic/qa/vba_tests/chr.vb
index 9c19784..3d1ca56 100644
--- a/basic/qa/vba_tests/chr.vb
+++ b/basic/qa/vba_tests/chr.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCHR()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/cint.vb b/basic/qa/vba_tests/cint.vb
index cf6ac009..0ddb689 100644
--- a/basic/qa/vba_tests/cint.vb
+++ b/basic/qa/vba_tests/cint.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCInt()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/clng.vb b/basic/qa/vba_tests/clng.vb
index 32d81f6..4ee4d5b6 100644
--- a/basic/qa/vba_tests/clng.vb
+++ b/basic/qa/vba_tests/clng.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCLng()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/csng.vb b/basic/qa/vba_tests/csng.vb
index 7d29828..bdc44f6 100644
--- a/basic/qa/vba_tests/csng.vb
+++ b/basic/qa/vba_tests/csng.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCSng()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/cstr.vb b/basic/qa/vba_tests/cstr.vb
index ae3428c..6c852df 100644
--- a/basic/qa/vba_tests/cstr.vb
+++ b/basic/qa/vba_tests/cstr.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCStr()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/cverr.vb b/basic/qa/vba_tests/cverr.vb
index 28c1792..02ba4a5 100644
--- a/basic/qa/vba_tests/cverr.vb
+++ b/basic/qa/vba_tests/cverr.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testCVErr()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/datediff.vb b/basic/qa/vba_tests/datediff.vb
index 150e892..dd5048d 100644
--- a/basic/qa/vba_tests/datediff.vb
+++ b/basic/qa/vba_tests/datediff.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testDateDiff()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/dateserial.vb b/basic/qa/vba_tests/dateserial.vb
index 0fcf564..56a973a 100644
--- a/basic/qa/vba_tests/dateserial.vb
+++ b/basic/qa/vba_tests/dateserial.vb

@@ -7,7 +7,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testDateSerial()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/datevalue.vb b/basic/qa/vba_tests/datevalue.vb
index 6ac6fe7..3863363 100644
--- a/basic/qa/vba_tests/datevalue.vb
+++ b/basic/qa/vba_tests/datevalue.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testDateValue()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/fix.vb b/basic/qa/vba_tests/fix.vb
index edb301b..db1aeda 100644
--- a/basic/qa/vba_tests/fix.vb
+++ b/basic/qa/vba_tests/fix.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testFix()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/format.vb b/basic/qa/vba_tests/format.vb
index b12596a..6d3fcba 100644
--- a/basic/qa/vba_tests/format.vb
+++ b/basic/qa/vba_tests/format.vb

@@ -7,7 +7,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_format()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/hex.vb b/basic/qa/vba_tests/hex.vb
index 7958eef..af0bb95 100644
--- a/basic/qa/vba_tests/hex.vb
+++ b/basic/qa/vba_tests/hex.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testHex()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/hour.vb b/basic/qa/vba_tests/hour.vb
index 587b36a..3383fc7 100644
--- a/basic/qa/vba_tests/hour.vb
+++ b/basic/qa/vba_tests/hour.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testHour()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/iif.vb b/basic/qa/vba_tests/iif.vb
index 4ddbef2..90891d0 100644
--- a/basic/qa/vba_tests/iif.vb
+++ b/basic/qa/vba_tests/iif.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIIf()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/instr.vb b/basic/qa/vba_tests/instr.vb
index 29f3524..0e3eb7e 100644
--- a/basic/qa/vba_tests/instr.vb
+++ b/basic/qa/vba_tests/instr.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testInStr()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/int.vb b/basic/qa/vba_tests/int.vb
index 84b4fb7..ad771a1 100644
--- a/basic/qa/vba_tests/int.vb
+++ b/basic/qa/vba_tests/int.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testInt()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isarray.vb b/basic/qa/vba_tests/isarray.vb
index 3b88db2..75b8067 100644
--- a/basic/qa/vba_tests/isarray.vb
+++ b/basic/qa/vba_tests/isarray.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsArray()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isdate.vb b/basic/qa/vba_tests/isdate.vb
index e6f446c..01687b2 100644
--- a/basic/qa/vba_tests/isdate.vb
+++ b/basic/qa/vba_tests/isdate.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsDate()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isempty.vb b/basic/qa/vba_tests/isempty.vb
index d43edd5..f5dfa58 100644
--- a/basic/qa/vba_tests/isempty.vb
+++ b/basic/qa/vba_tests/isempty.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsEmpty()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isnull.vb b/basic/qa/vba_tests/isnull.vb
index 970730b..42a3cc2 100644
--- a/basic/qa/vba_tests/isnull.vb
+++ b/basic/qa/vba_tests/isnull.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsNull()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isnumeric.vb b/basic/qa/vba_tests/isnumeric.vb
index a72f56f..0331faa 100644
--- a/basic/qa/vba_tests/isnumeric.vb
+++ b/basic/qa/vba_tests/isnumeric.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsNumeric()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/isobject.vb b/basic/qa/vba_tests/isobject.vb
index 030fea1..41c1d31 100644
--- a/basic/qa/vba_tests/isobject.vb
+++ b/basic/qa/vba_tests/isobject.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testIsObject()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/lbound.vb b/basic/qa/vba_tests/lbound.vb
index efe2a01..934fa45 100644
--- a/basic/qa/vba_tests/lbound.vb
+++ b/basic/qa/vba_tests/lbound.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testLBound()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/left.vb b/basic/qa/vba_tests/left.vb
index 72c2501..ab03fd5 100644
--- a/basic/qa/vba_tests/left.vb
+++ b/basic/qa/vba_tests/left.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testLeft()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/len.vb b/basic/qa/vba_tests/len.vb
index 424547a..600da8a 100644
--- a/basic/qa/vba_tests/len.vb
+++ b/basic/qa/vba_tests/len.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testLen()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/ltrim.vb b/basic/qa/vba_tests/ltrim.vb
index 901020e..1f95d06 100644
--- a/basic/qa/vba_tests/ltrim.vb
+++ b/basic/qa/vba_tests/ltrim.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testLTrim()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/mid.vb b/basic/qa/vba_tests/mid.vb
index 65e486d..9ec61af 100644
--- a/basic/qa/vba_tests/mid.vb
+++ b/basic/qa/vba_tests/mid.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testMid()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/minute.vb b/basic/qa/vba_tests/minute.vb
index ab19a63..049884b 100644
--- a/basic/qa/vba_tests/minute.vb
+++ b/basic/qa/vba_tests/minute.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testMinute()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/month.vb b/basic/qa/vba_tests/month.vb
index 3634373..8fedc95 100644
--- a/basic/qa/vba_tests/month.vb
+++ b/basic/qa/vba_tests/month.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testMonth()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/oct.vb b/basic/qa/vba_tests/oct.vb
index 98b4116a3..d75764e 100644
--- a/basic/qa/vba_tests/oct.vb
+++ b/basic/qa/vba_tests/oct.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testOct()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/partition.vb b/basic/qa/vba_tests/partition.vb
index 770d0b1..b8e09b7 100644
--- a/basic/qa/vba_tests/partition.vb
+++ b/basic/qa/vba_tests/partition.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testPartition()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/replace.vb b/basic/qa/vba_tests/replace.vb
index d7b48d8..bd338ab 100644
--- a/basic/qa/vba_tests/replace.vb
+++ b/basic/qa/vba_tests/replace.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testReplace()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/strconv.vb b/basic/qa/vba_tests/strconv.vb
index d34406b..35a73af 100644
--- a/basic/qa/vba_tests/strconv.vb
+++ b/basic/qa/vba_tests/strconv.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_testStrConv()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/stringplusdouble.vb b/basic/qa/vba_tests/stringplusdouble.vb
index 3f0cbd8..cfe4a5b 100644
--- a/basic/qa/vba_tests/stringplusdouble.vb
+++ b/basic/qa/vba_tests/stringplusdouble.vb

@@ -6,7 +6,7 @@ Dim result As String

Function doUnitTest() As String
result = verify_stringplusdouble()
If failCount <> 0 And passCount > 0 Then
If failCount <> 0 Or passCount = 0 Then
    doUnitTest = result
Else
    doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/win32compat.vb b/basic/qa/vba_tests/win32compat.vb
index 681d330..58a8e4e 100644
--- a/basic/qa/vba_tests/win32compat.vb
+++ b/basic/qa/vba_tests/win32compat.vb

@@ -25,7 +25,7 @@ Private Declare Function QueryPerformanceFrequency Lib "kernel32" (ByRef lpFrequ

Function doUnitTest() As String
    result = verify_win32compat()
    If failCount <> 0 Then
    If failCount <> 0 Or passCount = 0 Then
        doUnitTest = result
    Else
        doUnitTest = "OK"

diff --git a/basic/qa/vba_tests/win32compatb.vb b/basic/qa/vba_tests/win32compatb.vb
index d6819fa..56335c6 100644
--- a/basic/qa/vba_tests/win32compatb.vb
+++ b/basic/qa/vba_tests/win32compatb.vb

@@ -32,7 +32,7 @@ Private Declare Function QueryPerformanceFrequency Lib "kernel32" (lpFrequency A

Function doUnitTest() As String
    result = verify_win32compat()
    If failCount <> 0 Then
    If failCount <> 0 Or passCount = 0 Then
        doUnitTest = result
    Else
        doUnitTest = "OK"
commit	b9d75dea30adaa53be58c112f255c9fcd3eea400	[log]
author	Takeshi Abe <tabe@fixedpoint.jp>	Fri May 12 23:03:27 2017 +0900
committer	Takeshi Abe <tabe@fixedpoint.jp>	Mon May 15 04:59:04 2017 +0200
tree	9e0dfdf1b792f934827c8ea530028447776fb124
parent	f99c95c80d40431050fef655ac7ed05074768567 [diff]