From 03726a5f250ebead23258f9579570b9497d74bcb Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Mon, 6 Apr 2020 18:08:20 +0300
Subject: [PATCH] MXS-2900 Rename maxtest files

Many of the headers were not renamed to avoid changing every test.
---
 .../{appexception.h => appexception.hh}       |  0
 .../maxtest/include/maxtest/{env.h => env.hh} |  0
 .../include/maxtest/{envv.h => envv.hh}       |  0
 .../maxtest/{execute_cmd.h => execute_cmd.hh} |  0
 .../maxtest/include/maxtest/mariadb_nodes.h   |  2 +-
 .../maxtest/{maxscales.h => maxscales.hh}     |  2 +-
 .../include/maxtest/{nodes.h => nodes.hh}     |  0
 .../maxtest/{stopwatch.h => stopwatch.hh}     |  0
 .../{tcp_connection.h => tcp_connection.hh}   |  0
 .../maxtest/include/maxtest/testconnections.h |  2 +-
 .../maxtest/src/CMakeLists.txt                | 46 +++++++++----------
 .../maxtest/src/{big_load.cpp => big_load.cc} |  0
 ...big_transaction.cpp => big_transaction.cc} |  0
 .../src/{blob_test.cpp => blob_test.cc}       |  0
 ...ig_operations.cpp => config_operations.cc} |  0
 .../{different_size.cpp => different_size.cc} |  0
 .../maxtest/src/{envv.cpp => envv.cc}         |  2 +-
 .../src/{execute_cmd.cpp => execute_cmd.cc}   |  2 +-
 .../{fw_copy_rules.cpp => fw_copy_rules.cc}   |  0
 ...ct_insert.cpp => get_com_select_insert.cc} |  0
 .../src/{get_my_ip.cpp => get_my_ip.cc}       |  0
 ...keepalived_func.cpp => keepalived_func.cc} |  0
 .../src/{mariadb_func.cpp => mariadb_func.cc} |  0
 .../{mariadb_nodes.cpp => mariadb_nodes.cc}   |  2 +-
 ..._operations.cpp => maxadmin_operations.cc} |  0
 .../src/{maxinfo_func.cpp => maxinfo_func.cc} |  0
 .../src/{maxscales.cpp => maxscales.cc}       |  4 +-
 .../maxtest/src/{nodes.cpp => nodes.cc}       |  4 +-
 .../maxtest/src/{rds_vpc.cpp => rds_vpc.cc}   |  2 +-
 .../maxtest/src/{sql_t1.cpp => sql_t1.cc}     |  0
 .../src/{stopwatch.cpp => stopwatch.cc}       |  2 +-
 .../{tcp_connection.cpp => tcp_connection.cc} |  2 +-
 ...test_binlog_fnc.cpp => test_binlog_fnc.cc} |  0
 ...testconnections.cpp => testconnections.cc} |  2 +-
 .../mxs1628_bad_handshake.cpp                 |  2 +-
 .../mxs173_throttle_filter.cpp                |  4 +-
 36 files changed, 40 insertions(+), 40 deletions(-)
 rename maxscale-system-test/maxtest/include/maxtest/{appexception.h => appexception.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{env.h => env.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{envv.h => envv.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{execute_cmd.h => execute_cmd.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{maxscales.h => maxscales.hh} (99%)
 rename maxscale-system-test/maxtest/include/maxtest/{nodes.h => nodes.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{stopwatch.h => stopwatch.hh} (100%)
 rename maxscale-system-test/maxtest/include/maxtest/{tcp_connection.h => tcp_connection.hh} (100%)
 rename maxscale-system-test/maxtest/src/{big_load.cpp => big_load.cc} (100%)
 rename maxscale-system-test/maxtest/src/{big_transaction.cpp => big_transaction.cc} (100%)
 rename maxscale-system-test/maxtest/src/{blob_test.cpp => blob_test.cc} (100%)
 rename maxscale-system-test/maxtest/src/{config_operations.cpp => config_operations.cc} (100%)
 rename maxscale-system-test/maxtest/src/{different_size.cpp => different_size.cc} (100%)
 rename maxscale-system-test/maxtest/src/{envv.cpp => envv.cc} (99%)
 rename maxscale-system-test/maxtest/src/{execute_cmd.cpp => execute_cmd.cc} (96%)
 rename maxscale-system-test/maxtest/src/{fw_copy_rules.cpp => fw_copy_rules.cc} (100%)
 rename maxscale-system-test/maxtest/src/{get_com_select_insert.cpp => get_com_select_insert.cc} (100%)
 rename maxscale-system-test/maxtest/src/{get_my_ip.cpp => get_my_ip.cc} (100%)
 rename maxscale-system-test/maxtest/src/{keepalived_func.cpp => keepalived_func.cc} (100%)
 rename maxscale-system-test/maxtest/src/{mariadb_func.cpp => mariadb_func.cc} (100%)
 rename maxscale-system-test/maxtest/src/{mariadb_nodes.cpp => mariadb_nodes.cc} (99%)
 rename maxscale-system-test/maxtest/src/{maxadmin_operations.cpp => maxadmin_operations.cc} (100%)
 rename maxscale-system-test/maxtest/src/{maxinfo_func.cpp => maxinfo_func.cc} (100%)
 rename maxscale-system-test/maxtest/src/{maxscales.cpp => maxscales.cc} (99%)
 rename maxscale-system-test/maxtest/src/{nodes.cpp => nodes.cc} (99%)
 rename maxscale-system-test/maxtest/src/{rds_vpc.cpp => rds_vpc.cc} (99%)
 rename maxscale-system-test/maxtest/src/{sql_t1.cpp => sql_t1.cc} (100%)
 rename maxscale-system-test/maxtest/src/{stopwatch.cpp => stopwatch.cc} (99%)
 rename maxscale-system-test/maxtest/src/{tcp_connection.cpp => tcp_connection.cc} (98%)
 rename maxscale-system-test/maxtest/src/{test_binlog_fnc.cpp => test_binlog_fnc.cc} (100%)
 rename maxscale-system-test/maxtest/src/{testconnections.cpp => testconnections.cc} (99%)

diff --git a/maxscale-system-test/maxtest/include/maxtest/appexception.h b/maxscale-system-test/maxtest/include/maxtest/appexception.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/appexception.h
rename to maxscale-system-test/maxtest/include/maxtest/appexception.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/env.h b/maxscale-system-test/maxtest/include/maxtest/env.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/env.h
rename to maxscale-system-test/maxtest/include/maxtest/env.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/envv.h b/maxscale-system-test/maxtest/include/maxtest/envv.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/envv.h
rename to maxscale-system-test/maxtest/include/maxtest/envv.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/execute_cmd.h b/maxscale-system-test/maxtest/include/maxtest/execute_cmd.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/execute_cmd.h
rename to maxscale-system-test/maxtest/include/maxtest/execute_cmd.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
index 06c80d31e..68cdb5744 100644
--- a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
+++ b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
@@ -16,7 +16,7 @@
 #include "mariadb_func.h"
 #include <errno.h>
 #include <string>
-#include "nodes.h"
+#include "nodes.hh"
 
 /**
  * @brief A class to handle backend nodes
diff --git a/maxscale-system-test/maxtest/include/maxtest/maxscales.h b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh
similarity index 99%
rename from maxscale-system-test/maxtest/include/maxtest/maxscales.h
rename to maxscale-system-test/maxtest/include/maxtest/maxscales.hh
index 491d51997..98204df48 100644
--- a/maxscale-system-test/maxtest/include/maxtest/maxscales.h
+++ b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include "nodes.h"
+#include "nodes.hh"
 #include "mariadb_func.h"
 #include "mariadb_nodes.h"
 
diff --git a/maxscale-system-test/maxtest/include/maxtest/nodes.h b/maxscale-system-test/maxtest/include/maxtest/nodes.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/nodes.h
rename to maxscale-system-test/maxtest/include/maxtest/nodes.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/stopwatch.h b/maxscale-system-test/maxtest/include/maxtest/stopwatch.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/stopwatch.h
rename to maxscale-system-test/maxtest/include/maxtest/stopwatch.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/tcp_connection.h b/maxscale-system-test/maxtest/include/maxtest/tcp_connection.hh
similarity index 100%
rename from maxscale-system-test/maxtest/include/maxtest/tcp_connection.h
rename to maxscale-system-test/maxtest/include/maxtest/tcp_connection.hh
diff --git a/maxscale-system-test/maxtest/include/maxtest/testconnections.h b/maxscale-system-test/maxtest/include/maxtest/testconnections.h
index e158f7389..319eece87 100644
--- a/maxscale-system-test/maxtest/include/maxtest/testconnections.h
+++ b/maxscale-system-test/maxtest/include/maxtest/testconnections.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "mariadb_nodes.h"
-#include "maxscales.h"
+#include "maxscales.hh"
 #include "test_dir.hh"
 #include <fcntl.h>
 #include <pthread.h>
diff --git a/maxscale-system-test/maxtest/src/CMakeLists.txt b/maxscale-system-test/maxtest/src/CMakeLists.txt
index a43a8f3ed..9d309d39d 100644
--- a/maxscale-system-test/maxtest/src/CMakeLists.txt
+++ b/maxscale-system-test/maxtest/src/CMakeLists.txt
@@ -1,27 +1,27 @@
 add_library(maxtest SHARED
-        stopwatch.cpp
-        big_load.cpp
-        big_transaction.cpp
-        blob_test.cpp
-        config_operations.cpp
-        different_size.cpp
-        envv.cpp
-        execute_cmd.cpp
-        fw_copy_rules.cpp
-        get_com_select_insert.cpp
-        get_my_ip.cpp
-        keepalived_func.cpp
-        mariadb_func.cpp
-        mariadb_nodes.cpp
-        maxadmin_operations.cpp
-        maxinfo_func.cpp
-        maxscales.cpp
-        nodes.cpp
-        rds_vpc.cpp
-        sql_t1.cpp
-        tcp_connection.cpp
-        test_binlog_fnc.cpp
-        testconnections.cpp
+        big_load.cc
+        big_transaction.cc
+        blob_test.cc
+        config_operations.cc
+        different_size.cc
+        envv.cc
+        execute_cmd.cc
+        fw_copy_rules.cc
+        get_com_select_insert.cc
+        get_my_ip.cc
+        keepalived_func.cc
+        mariadb_func.cc
+        mariadb_nodes.cc
+        maxadmin_operations.cc
+        maxinfo_func.cc
+        maxscales.cc
+        nodes.cc
+        rds_vpc.cc
+        sql_t1.cc
+        stopwatch.cc
+        tcp_connection.cc
+        test_binlog_fnc.cc
+        testconnections.cc
         ${CMAKE_CURRENT_BINARY_DIR}/test_info.cc
         # Include the CDC connector in the core library
         ${CMAKE_SOURCE_DIR}/connectors/cdc-connector/cdc_connector.cpp)
diff --git a/maxscale-system-test/maxtest/src/big_load.cpp b/maxscale-system-test/maxtest/src/big_load.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/big_load.cpp
rename to maxscale-system-test/maxtest/src/big_load.cc
diff --git a/maxscale-system-test/maxtest/src/big_transaction.cpp b/maxscale-system-test/maxtest/src/big_transaction.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/big_transaction.cpp
rename to maxscale-system-test/maxtest/src/big_transaction.cc
diff --git a/maxscale-system-test/maxtest/src/blob_test.cpp b/maxscale-system-test/maxtest/src/blob_test.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/blob_test.cpp
rename to maxscale-system-test/maxtest/src/blob_test.cc
diff --git a/maxscale-system-test/maxtest/src/config_operations.cpp b/maxscale-system-test/maxtest/src/config_operations.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/config_operations.cpp
rename to maxscale-system-test/maxtest/src/config_operations.cc
diff --git a/maxscale-system-test/maxtest/src/different_size.cpp b/maxscale-system-test/maxtest/src/different_size.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/different_size.cpp
rename to maxscale-system-test/maxtest/src/different_size.cc
diff --git a/maxscale-system-test/maxtest/src/envv.cpp b/maxscale-system-test/maxtest/src/envv.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/envv.cpp
rename to maxscale-system-test/maxtest/src/envv.cc
index 0b6ab355d..70560633f 100644
--- a/maxscale-system-test/maxtest/src/envv.cpp
+++ b/maxscale-system-test/maxtest/src/envv.cc
@@ -1,4 +1,4 @@
-#include "envv.h"
+#include "envv.hh"
 
 #include <cstring>
 #include <cstdarg>
diff --git a/maxscale-system-test/maxtest/src/execute_cmd.cpp b/maxscale-system-test/maxtest/src/execute_cmd.cc
similarity index 96%
rename from maxscale-system-test/maxtest/src/execute_cmd.cpp
rename to maxscale-system-test/maxtest/src/execute_cmd.cc
index d6aa7555f..68c85a49b 100644
--- a/maxscale-system-test/maxtest/src/execute_cmd.cpp
+++ b/maxscale-system-test/maxtest/src/execute_cmd.cc
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "execute_cmd.h"
+#include "execute_cmd.hh"
 
 using namespace std;
 
diff --git a/maxscale-system-test/maxtest/src/fw_copy_rules.cpp b/maxscale-system-test/maxtest/src/fw_copy_rules.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/fw_copy_rules.cpp
rename to maxscale-system-test/maxtest/src/fw_copy_rules.cc
diff --git a/maxscale-system-test/maxtest/src/get_com_select_insert.cpp b/maxscale-system-test/maxtest/src/get_com_select_insert.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/get_com_select_insert.cpp
rename to maxscale-system-test/maxtest/src/get_com_select_insert.cc
diff --git a/maxscale-system-test/maxtest/src/get_my_ip.cpp b/maxscale-system-test/maxtest/src/get_my_ip.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/get_my_ip.cpp
rename to maxscale-system-test/maxtest/src/get_my_ip.cc
diff --git a/maxscale-system-test/maxtest/src/keepalived_func.cpp b/maxscale-system-test/maxtest/src/keepalived_func.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/keepalived_func.cpp
rename to maxscale-system-test/maxtest/src/keepalived_func.cc
diff --git a/maxscale-system-test/maxtest/src/mariadb_func.cpp b/maxscale-system-test/maxtest/src/mariadb_func.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/mariadb_func.cpp
rename to maxscale-system-test/maxtest/src/mariadb_func.cc
diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cpp b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/mariadb_nodes.cpp
rename to maxscale-system-test/maxtest/src/mariadb_nodes.cc
index c5fdc3361..e1b5cfbe1 100644
--- a/maxscale-system-test/maxtest/src/mariadb_nodes.cpp
+++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
@@ -20,7 +20,7 @@
 #include <future>
 #include <functional>
 #include <algorithm>
-#include "envv.h"
+#include "envv.hh"
 
 using std::cout;
 using std::endl;
diff --git a/maxscale-system-test/maxtest/src/maxadmin_operations.cpp b/maxscale-system-test/maxtest/src/maxadmin_operations.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/maxadmin_operations.cpp
rename to maxscale-system-test/maxtest/src/maxadmin_operations.cc
diff --git a/maxscale-system-test/maxtest/src/maxinfo_func.cpp b/maxscale-system-test/maxtest/src/maxinfo_func.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/maxinfo_func.cpp
rename to maxscale-system-test/maxtest/src/maxinfo_func.cc
diff --git a/maxscale-system-test/maxtest/src/maxscales.cpp b/maxscale-system-test/maxtest/src/maxscales.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/maxscales.cpp
rename to maxscale-system-test/maxtest/src/maxscales.cc
index 127a34c00..453956fc2 100644
--- a/maxscale-system-test/maxtest/src/maxscales.cpp
+++ b/maxscale-system-test/maxtest/src/maxscales.cc
@@ -1,8 +1,8 @@
-#include "maxscales.h"
+#include "maxscales.hh"
 #include <sstream>
 #include <unordered_map>
 #include <string>
-#include "envv.h"
+#include "envv.hh"
 
 Maxscales::Maxscales(const char *pref, const char *test_cwd, bool verbose,
                      std::string network_config)
diff --git a/maxscale-system-test/maxtest/src/nodes.cpp b/maxscale-system-test/maxtest/src/nodes.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/nodes.cpp
rename to maxscale-system-test/maxtest/src/nodes.cc
index 95bbb1f11..ca886db7a 100644
--- a/maxscale-system-test/maxtest/src/nodes.cpp
+++ b/maxscale-system-test/maxtest/src/nodes.cc
@@ -1,4 +1,4 @@
-#include "nodes.h"
+#include "nodes.hh"
 #include <string>
 #include <cstring>
 #include <iostream>
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <signal.h>
 
-#include "envv.h"
+#include "envv.hh"
 
 Nodes::Nodes()
 {
diff --git a/maxscale-system-test/maxtest/src/rds_vpc.cpp b/maxscale-system-test/maxtest/src/rds_vpc.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/rds_vpc.cpp
rename to maxscale-system-test/maxtest/src/rds_vpc.cc
index 6d51575f4..62ac3d3cc 100644
--- a/maxscale-system-test/maxtest/src/rds_vpc.cpp
+++ b/maxscale-system-test/maxtest/src/rds_vpc.cc
@@ -1,4 +1,4 @@
-#include "execute_cmd.h"
+#include "execute_cmd.hh"
 #include "rds_vpc.h"
 
 RDS::RDS(char* cluster)
diff --git a/maxscale-system-test/maxtest/src/sql_t1.cpp b/maxscale-system-test/maxtest/src/sql_t1.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/sql_t1.cpp
rename to maxscale-system-test/maxtest/src/sql_t1.cc
diff --git a/maxscale-system-test/maxtest/src/stopwatch.cpp b/maxscale-system-test/maxtest/src/stopwatch.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/stopwatch.cpp
rename to maxscale-system-test/maxtest/src/stopwatch.cc
index ae40b9fee..cc4563d72 100644
--- a/maxscale-system-test/maxtest/src/stopwatch.cpp
+++ b/maxscale-system-test/maxtest/src/stopwatch.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "stopwatch.h"
+#include "stopwatch.hh"
 
 #include <iomanip>
 #include <iostream>
diff --git a/maxscale-system-test/maxtest/src/tcp_connection.cpp b/maxscale-system-test/maxtest/src/tcp_connection.cc
similarity index 98%
rename from maxscale-system-test/maxtest/src/tcp_connection.cpp
rename to maxscale-system-test/maxtest/src/tcp_connection.cc
index cc0227ea9..88b0b7965 100644
--- a/maxscale-system-test/maxtest/src/tcp_connection.cpp
+++ b/maxscale-system-test/maxtest/src/tcp_connection.cc
@@ -1,4 +1,4 @@
-#include "tcp_connection.h"
+#include "tcp_connection.hh"
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/maxscale-system-test/maxtest/src/test_binlog_fnc.cpp b/maxscale-system-test/maxtest/src/test_binlog_fnc.cc
similarity index 100%
rename from maxscale-system-test/maxtest/src/test_binlog_fnc.cpp
rename to maxscale-system-test/maxtest/src/test_binlog_fnc.cc
diff --git a/maxscale-system-test/maxtest/src/testconnections.cpp b/maxscale-system-test/maxtest/src/testconnections.cc
similarity index 99%
rename from maxscale-system-test/maxtest/src/testconnections.cpp
rename to maxscale-system-test/maxtest/src/testconnections.cc
index 4109dc891..6f976e908 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cpp
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@@ -21,7 +21,7 @@
 #include "sql_t1.h"
 #include "testconnections.h"
 #include "test_info.hh"
-#include "envv.h"
+#include "envv.hh"
 
 using namespace mxb;
 using std::cout;
diff --git a/maxscale-system-test/mxs1628_bad_handshake.cpp b/maxscale-system-test/mxs1628_bad_handshake.cpp
index 39f0cbddd..d374d4058 100644
--- a/maxscale-system-test/mxs1628_bad_handshake.cpp
+++ b/maxscale-system-test/mxs1628_bad_handshake.cpp
@@ -1,5 +1,5 @@
 #include "testconnections.h"
-#include "tcp_connection.h"
+#include "tcp_connection.hh"
 
 #include <vector>
 
diff --git a/maxscale-system-test/mxs173_throttle_filter.cpp b/maxscale-system-test/mxs173_throttle_filter.cpp
index fbc7c36d6..6eaba8628 100644
--- a/maxscale-system-test/mxs173_throttle_filter.cpp
+++ b/maxscale-system-test/mxs173_throttle_filter.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "testconnections.h"
-#include "stopwatch.h"
-#include "appexception.h"
+#include "stopwatch.hh"
+#include "appexception.hh"
 #include <iostream>
 #include <memory>
 #include <sstream>