[Libreoffice-commits] core.git: dbaccess/qa

Stephan Bergmann sbergman at redhat.com
Mon Jun 1 02:08:18 PDT 2015


 dbaccess/qa/complex/dbaccess/RowSet.java |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit e9d055bf67d2ad600d2efa58a4c8b8bbcedf348c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 1 11:07:31 2015 +0200

    Do not lose AssertionError from sub-threads
    
    Change-Id: I8ca7194be6d22b72b73e76e5067273090b087b96

diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 5ee5ea2..2763ac3 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -69,6 +69,8 @@ public class RowSet extends TestCase
     XPropertySet m_rowSetProperties;
     XParametersSupplier m_paramsSupplier;
 
+    private final Object failedResultSetMovementStressGuard = new Object();
+    private String failedResultSetMovementStressMessages = "";
 
     private class ResultSetMovementStress implements Runnable
     {
@@ -100,7 +102,12 @@ public class RowSet extends TestCase
             }
             catch (Exception e)
             {
-                fail("ResultSetMovementStress(" + m_id + ") failed at i=" + i + ": " + e);
+                synchronized (failedResultSetMovementStressGuard) {
+                    failedResultSetMovementStressMessages
+                        = failedResultSetMovementStressMessages
+                        + "ResultSetMovementStress(" + m_id + ") failed at i="
+                        + i + ": " + e + "\n";
+                }
             }
         }
     }
@@ -383,6 +390,9 @@ public class RowSet extends TestCase
             {
                 threads[i].join();
             }
+            synchronized (failedResultSetMovementStressGuard) {
+                assertEquals("", failedResultSetMovementStressMessages);
+            }
         }
         catch (Exception e)
         {


More information about the Libreoffice-commits mailing list