1 files changed, 20 insertions, 9 deletions
diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 77fc6ad6ae..2695e6238c 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -39,11 +39,11 @@ class tst_QRingBuffer : public QObject
 {
     Q_OBJECT
 private slots:
+    void constructing();
     void readPointerAtPositionWriteRead();
     void readPointerAtPositionEmptyRead();
     void readPointerAtPositionWithHead();
     void readPointerAtPositionReadTooMuch();
-    void sizeWhenEmpty();
     void sizeWhenReservedAndChopped();
     void sizeWhenReserved();
     void free();
@@ -57,6 +57,23 @@ private slots:
     void readLine();
 };
 
+void tst_QRingBuffer::constructing()
+{
+    QRingBuffer ringBuffer;
+
+    QCOMPARE(ringBuffer.size(), Q_INT64_C(0));
+    QVERIFY(ringBuffer.isEmpty());
+    QCOMPARE(ringBuffer.nextDataBlockSize(), Q_INT64_C(0));
+    QVERIFY(ringBuffer.readPointer() == Q_NULLPTR);
+    QCOMPARE(ringBuffer.skip(5), Q_INT64_C(0));
+    QCOMPARE(ringBuffer.read(), QByteArray());
+    QCOMPARE(ringBuffer.getChar(), -1);
+    QVERIFY(!ringBuffer.canReadLine());
+
+    char buf[5];
+    QCOMPARE(ringBuffer.peek(buf, sizeof(buf)), Q_INT64_C(0));
+}
+
 void tst_QRingBuffer::sizeWhenReserved()
 {
     QRingBuffer ringBuffer;
@@ -74,13 +91,6 @@ void tst_QRingBuffer::sizeWhenReservedAndChopped()
     QCOMPARE(ringBuffer.size(), Q_INT64_C(0));
 }
 
-void tst_QRingBuffer::sizeWhenEmpty()
-{
-    QRingBuffer ringBuffer;
-
-    QCOMPARE(ringBuffer.size(), Q_INT64_C(0));
-}
-
 void tst_QRingBuffer::readPointerAtPositionReadTooMuch()
 {
     QRingBuffer ringBuffer;
@@ -284,7 +294,8 @@ void tst_QRingBuffer::indexOf()
     for (int i = 1; i < 256; ++i) {
         qint64 index = ringBuffer.indexOf(char(i));
         QCOMPARE(index, qint64(i - 1));
-        QCOMPARE(ringBuffer.indexOf(char(i), i), index);
+        QCOMPARE(ringBuffer.indexOf(char(i), i, i >> 1), index);
+        QCOMPARE(ringBuffer.indexOf(char(i), 256, i), Q_INT64_C(-1));
         QCOMPARE(ringBuffer.indexOf(char(i), i - 1), -1); // test for absent char
     }
 }