From dc647c95049ce3392f02f8b25b0f1ff31c9d44e3 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Fri, 8 Feb 2019 10:26:24 +0100
Subject: [PATCH] Removed unnecessary duplication from switch statements within
rdbms::ConnTest
---
rdbms/ConnTest.cpp | 40 ++--------------------------------------
1 file changed, 2 insertions(+), 38 deletions(-)
diff --git a/rdbms/ConnTest.cpp b/rdbms/ConnTest.cpp
index 6fec2ce85b..a5ce0ac53a 100644
--- a/rdbms/ConnTest.cpp
+++ b/rdbms/ConnTest.cpp
@@ -70,19 +70,13 @@ TEST_P(cta_rdbms_ConnTest, setAutocommitMode_AUTOCOMMIT_OFF) {
ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
switch(m_login.dbType) {
- case Login::DBTYPE_IN_MEMORY:
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- break;
case Login::DBTYPE_ORACLE:
conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF);
ASSERT_EQ(AutocommitMode::AUTOCOMMIT_OFF, conn.getAutocommitMode());
break;
+ case Login::DBTYPE_IN_MEMORY:
case Login::DBTYPE_SQLITE:
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- break;
case Login::DBTYPE_MYSQL:
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- break;
case Login::DBTYPE_POSTGRESQL:
ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
break;
@@ -101,17 +95,6 @@ TEST_P(cta_rdbms_ConnTest, loan_return_loan_conn_setAutocommitMode_AUTOCOMMIT_OF
ConnPool connPool(m_login, maxNbConn);
switch(m_login.dbType) {
- case Login::DBTYPE_IN_MEMORY:
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- }
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- }
- break;
case Login::DBTYPE_ORACLE:
{
auto conn = connPool.getConn();
@@ -124,28 +107,9 @@ TEST_P(cta_rdbms_ConnTest, loan_return_loan_conn_setAutocommitMode_AUTOCOMMIT_OF
ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
}
break;
+ case Login::DBTYPE_IN_MEMORY:
case Login::DBTYPE_SQLITE:
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- }
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- }
- break;
case Login::DBTYPE_MYSQL:
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- ASSERT_THROW(conn.setAutocommitMode(AutocommitMode::AUTOCOMMIT_OFF), Conn::AutocommitModeNotSupported);
- }
- {
- auto conn = connPool.getConn();
- ASSERT_EQ(AutocommitMode::AUTOCOMMIT_ON, conn.getAutocommitMode());
- }
- break;
case Login::DBTYPE_POSTGRESQL:
{
auto conn = connPool.getConn();
--
GitLab