[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdb] /: Merge remote-tracking branch 'origin/3.1'
From:       Jaroslaw Staniek <null () kde ! org>
Date:       2018-09-10 21:05:44
Message-ID: E1fzTNQ-0001bC-1G () code ! kde ! org
[Download RAW message or body]

Git commit 3fea3bafdb5a0455facb176afc431ccaf25d6f9e by Jaroslaw Staniek.
Committed on 10/09/2018 at 21:05.
Pushed by staniek into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

M  +1    -1    autotests/KDbTest.cpp
M  +1    -1    src/CMakeLists.txt

https://commits.kde.org/kdb/3fea3bafdb5a0455facb176afc431ccaf25d6f9e

diff --cc autotests/KDbTest.cpp
index fe95c134,d2b3d7a1..aea9ec76
--- a/autotests/KDbTest.cpp
+++ b/autotests/KDbTest.cpp
@@@ -1187,19 -1187,19 +1187,19 @@@ void  KDbTest::deleteRecordWithThreeCon
  void KDbTest::deleteAllRecordsTest()
  {
      QVERIFY(utils.testCreateDbWithTables("KDbTest"));
 -    QVERIFY(KDb::deleteAllRecords(utils.connection.data(), "persons"));
 +    QVERIFY(KDb::deleteAllRecords(utils.connection(), "persons"));
  
      QRegularExpression deleteAllErrorRegExp = resultRegExp(
-         "", "Error while executing SQL statement.", "DELETE FROM \\[.*\\]", 0, "no such table: .*");
+         "", "Error while executing SQL statement.", "DELETE FROM \\[.*\\]", "0", "no such table: .*");
      QTest::ignoreMessage(QtWarningMsg, deleteAllErrorRegExp);
 -    QVERIFY2(!KDb::deleteAllRecords(utils.connection.data(), QString()),
 +    QVERIFY2(!KDb::deleteAllRecords(utils.connection(), QString()),
               "Passing a null table name");
      QTest::ignoreMessage(QtWarningMsg, deleteAllErrorRegExp);
 -    QVERIFY2(!KDb::deleteAllRecords(utils.connection.data(), ""),
 +    QVERIFY2(!KDb::deleteAllRecords(utils.connection(), ""),
               "Passing an empty table name");
 -    QVERIFY(KDb::deleteAllRecords(utils.connection.data(), "cars"));
 +    QVERIFY(KDb::deleteAllRecords(utils.connection(), "cars"));
      QTest::ignoreMessage(QtWarningMsg, deleteAllErrorRegExp);
 -    QVERIFY2(!KDb::deleteAllRecords(utils.connection.data(), "NonExistingTable"),
 +    QVERIFY2(!KDb::deleteAllRecords(utils.connection(), "NonExistingTable"),
               "Passing a nonexisting table name");
      QVERIFY(utils.testDisconnectAndDropDb());
  }
[prev in list] [next in list] [prev in thread] [next in thread]