You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2024/10/03 16:11:58 UTC

(jackrabbit) branch trunk updated: JCR-5106: core tests: improve diagnostics in DBDataStoreTest

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 81491e777 JCR-5106: core tests: improve diagnostics in DBDataStoreTest
81491e777 is described below

commit 81491e777e2b2204c308a427c3cb2500966719f9
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Oct 3 17:11:48 2024 +0100

    JCR-5106: core tests: improve diagnostics in DBDataStoreTest
---
 .../java/org/apache/jackrabbit/core/data/DBDataStoreTest.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DBDataStoreTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DBDataStoreTest.java
index 8152d197a..d1b2c8352 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DBDataStoreTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DBDataStoreTest.java
@@ -74,7 +74,9 @@ public class DBDataStoreTest extends JUnitTest {
             try {
                 assertNotNull(stream);
                 for (int j = 0; j < data.length; j++) {
-                    assertEquals((data[j]) & 0xff, stream.read());
+                    int b = stream.read();
+                    assertTrue("early EOF at position " + j + " of stream #" + i, b >= 0);
+                    assertEquals("data should be equal on read of stream #" + i + " at position " + j, (data[j]) & 0xff, b);
                 }
                 assertEquals(-1, stream.read());
             } finally {
@@ -103,7 +105,7 @@ public class DBDataStoreTest extends JUnitTest {
             // test integrity of replayed bytes
             byte[] replayedBytes = new byte[data.length];
             int length = in.read(replayedBytes);
-            assertEquals(length, data.length);
+            assertEquals(data.length, length);
 
             for (int i = 0; i < data.length; i++) {
                 log.append(i + " data: " + data[i] + " replayed: " + replayedBytes[i] + "\n");
@@ -175,7 +177,9 @@ public class DBDataStoreTest extends JUnitTest {
         // verify the contents of all the streams, reading them in parallel
         for (int i = 0; i < data.length; i++) {
             for (int j = 0; j < streams.length; j++) {
-                assertEquals((data[i]) & 0xff, streams[j].read());
+                int b = streams[j].read();
+                assertTrue("early EOF at position " + i + " of stream #" + j, b >= 0);
+                assertEquals((data[i]) & 0xff, b);
             }
         }