MXS-1461 Modify some mock-classes

This commit is contained in:
Johan Wikman
2017-11-15 14:28:16 +02:00
parent 843c9b0ce1
commit edb271fa8e
5 changed files with 29 additions and 2 deletions

View File

@ -43,6 +43,11 @@ public:
const char* zHost);
~Dcb();
private:
int32_t write(GWBUF* pData);
static int32_t write(DCB* pDcb, GWBUF* pData);
private:
std::string m_user;
std::string m_host;

View File

@ -14,6 +14,7 @@
#include "mock.hh"
#include <maxscale/session.h>
#include <maxscale/protocol/mysql.h>
#include "dcb.hh"
namespace maxscale
@ -43,7 +44,8 @@ public:
~Session();
private:
Dcb m_client_dcb;
Dcb m_client_dcb;
MYSQL_session m_mysql_session;
};
}

View File

@ -73,7 +73,6 @@ bool BufferBackend::idle(const RouterSession* pSession) const
bool rv = true;
SessionResponses::const_iterator i = m_session_responses.find(pSession);
ss_dassert(i != m_session_responses.end());
if (i != m_session_responses.end())
{

View File

@ -47,12 +47,27 @@ Dcb::Dcb(MXS_SESSION* pSession,
pDcb->session = pSession;
pDcb->remote = const_cast<char*>(zHost);
pDcb->user = const_cast<char*>(zUser);
pDcb->func.write = &Dcb::write;
}
Dcb::~Dcb()
{
}
int32_t Dcb::write(GWBUF* pData)
{
// TODO: Should be routed somewhere
gwbuf_free(pData);
return 1;
}
//static
int32_t Dcb::write(DCB* pDcb, GWBUF* pData)
{
return static_cast<Dcb*>(pDcb)->write(pData);
}
}
}

View File

@ -32,6 +32,12 @@ Session::Session(const char* zUser,
pSession->ses_chk_tail = CHK_NUM_SESSION;
pSession->client_dcb = &m_client_dcb;
memset(&m_mysql_session, 0, sizeof(m_mysql_session));
strcpy(m_mysql_session.db, "dummy");
m_client_dcb.data = &m_mysql_session;
}
Session::~Session()