Update unit tests

uglide · Jul 31, 2016 · 8e0b6ec · 8e0b6ec
1 parent 7d733e0
commit 8e0b6ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/tests/unit_tests/basetestcase.h b/tests/unit_tests/basetestcase.h
@@ -24,7 +24,7 @@ class BaseTestCase : public QObject
 
     QSharedPointer<DummyConnection> getFakeConnection(const QList<QVariant>& expectedScanResponses = QList<QVariant>(),
                                                       const QStringList& expectedResponses = QStringList(),
-                                                      double version=2.6,
+                                                      double version=2.8,
                                                       bool raise_error=false);
 
     void wait(int ms);

diff --git a/tests/unit_tests/mocks/dummyconnection.h b/tests/unit_tests/mocks/dummyconnection.h
@@ -11,7 +11,8 @@ class DummyConnection : public RedisClient::Connection
         : RedisClient::Connection(RedisClient::ConnectionConfig()),
           runCommandCalled(0), retrieveCollectionCalled(0),
           getServerVersionCalled(0), m_version(version), 
-          m_raiseExceptionOnConnect(raise_error)
+          m_raiseExceptionOnConnect(raise_error),
+          returnErrorOnCmdRun(false)
     {
     }
 
@@ -55,6 +56,12 @@ class DummyConnection : public RedisClient::Connection
     {
         RedisClient::Response resp;
 
+        if (returnErrorOnCmdRun) {
+            auto callback = cmd.getCallBack();
+            callback(resp, QString("fake error"));
+            return;
+        }
+
         if (fakeResponses.size()) {
            resp = fakeResponses.first();
            fakeResponses.removeFirst();
@@ -65,7 +72,8 @@ class DummyConnection : public RedisClient::Connection
         auto callback = cmd.getCallBack();
         callback(resp, QString());
 
-        runCommandCalled++;        
+        runCommandCalled++;
+        executedCommands.push_back(cmd);
     }
 
     uint runCommandCalled;
@@ -88,6 +96,9 @@ class DummyConnection : public RedisClient::Connection
         }
     }
 
+    QList<RedisClient::Command> executedCommands;
+    bool returnErrorOnCmdRun;
+
 private:
     double m_version;
     bool m_raiseExceptionOnConnect;