MXS-2900 maxtest includes cleanup, part 2

maxscale-system-test/avro.cpp

@@ -6,17 +6,12 @@
  * - check that data in avro file is correct
  */
 
-
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-
-#include "test_binlog_fnc.h"
-#include <jansson.h>
-#include "maxinfo_func.h"
-
 #include <sstream>
 #include <iostream>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/maxinfo_func.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/testconnections.h>
 
 using std::cout;
 using std::endl;

maxscale-system-test/avro_long.cpp

@@ -4,13 +4,11 @@
  * - put some data to t1 in the loop
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/maxadmin_operations.h>
-#include "maxadmin_operations.h"
+#include <maxtest/sql_t1.h>
-#include "sql_t1.h"
+#include <maxtest/test_binlog_fnc.h>
-
+#include <maxtest/testconnections.h>
-#include "test_binlog_fnc.h"
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/binlog_semisync.cpp

@@ -2,14 +2,9 @@
  * @file binlog_semisync.cpp Same test as setup_binlog, but with semisync enabled
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/test_binlog_fnc.h>
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
-#include "sql_t1.h"
-
-#include "test_binlog_fnc.h"
-
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug676.cpp

@@ -9,8 +9,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
-#include "mariadb_func.h"
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug681.cpp

@@ -24,8 +24,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/mariadb_func.h>
-#include "mariadb_func.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/cdc_client.cpp

@@ -6,23 +6,21 @@
  * - read data from avro listener, comapre it with inserted data
  */
 
+#include <atomic>
+#include <chrono>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
+#include <thread>
 #include <unistd.h>
-#include "testconnections.h"
-
-#include <stdio.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <string.h>
-#include <openssl/sha.h>
-#include "maxinfo_func.h"
-#include "sql_t1.h"
 #include <sys/epoll.h>
-#include <atomic>
+
-#include <thread>
+#include <maxtest/maxinfo_func.h>
-#include <chrono>
+#include <maxtest/sql_t1.h>
+#include <maxtest/testconnections.h>
 
 using namespace std;
 char reg_str[] = "REGISTER UUID=XXX-YYY_YYY, TYPE=JSON";

maxscale-system-test/clustrix_basics.cpp

@@ -14,8 +14,8 @@
 #include <iostream>
 #include <maxbase/string.hh>
 #include <maxscale/jansson.hh>
-#include "testconnections.h"
+#include <maxtest/maxrest.hh>
-#include "maxrest.hh"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/clustrix_distribution.cpp

@@ -14,8 +14,8 @@
 #include <iostream>
 #include <map>
 #include <vector>
-#include "testconnections.h"
+#include <maxtest/maxrest.hh>
-#include "maxrest.hh"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/clustrix_transaction_replay.cpp

@@ -13,8 +13,8 @@
 
 #include <iostream>
 #include <map>
-#include "testconnections.h"
+#include <maxtest/maxrest.hh>
-#include "maxrest.hh"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/create_rds.cpp

@@ -5,10 +5,7 @@
  */
 
 #include <iostream>
-#include <unistd.h>
+#include <maxtest/rds_vpc.h>
-#include "testconnections.h"
-#include <jansson.h>
-#include "rds_vpc.h"
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/delete_rds.cpp

@@ -4,10 +4,7 @@
  */
 
 #include <iostream>
-#include <unistd.h>
+#include <maxtest/rds_vpc.h>
-#include "testconnections.h"
-#include <jansson.h>
-#include "rds_vpc.h"
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/keepalived.cpp

@@ -12,10 +12,9 @@
  * TODO: replace 'yum' call with executing Chef recipe
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/keepalived_func.h>
-#include "keepalived_func.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/keepalived_masterdown.cpp

@@ -2,11 +2,10 @@
  * @file keepalived:masterdown.cpp
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/failover_common.cpp>
-#include "keepalived_func.h"
+#include <maxtest/keepalived_func.h>
-#include "failover_common.cpp"
+#include <maxtest/testconnections.h>
 
 static bool check_maxscale_passive(TestConnections& test, int node);
 static void expect_maxscale_active_passive(TestConnections& test, int active_node);

maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "mariadb_nodes.h"
+#include <maxtest/mariadb_nodes.h>
 #include "failover_common.cpp"
 
 int main(int argc, char** argv)

maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h

@@ -21,10 +21,10 @@
  * TODO: move functionality of install_clustrix() to MDBCI
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <string>
-#include <maxtest/nodes.hh>
 #include <maxtest/mariadb_nodes.h>
+#include <maxtest/nodes.hh>
 
 #define CLUSTRIX_DEPS_YUM "yum install -y bzip2 wget screen ntp ntpdate vim htop mdadm"
 #define WGET_CLUSTRIX     "wget http://files.clustrix.com/releases/software/clustrix-9.1.4.el7.tar.bz2"

maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h

@@ -12,10 +12,9 @@
  * @endverbatim
  */
 
-
+#include <cerrno>
-#include <maxtest/mariadb_func.h>
-#include <errno.h>
 #include <string>
+#include <maxtest/mariadb_func.h>
 #include <maxtest/nodes.hh>
 
 /**

maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdlib>
+
 class TestConnections;
 
 int   create_tcp_socket();

maxscale-system-test/maxtest/include/maxtest/maxscales.hh

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <string>
-#include <maxtest/nodes.hh>
 #include <maxtest/mariadb_func.h>
 #include <maxtest/mariadb_nodes.h>
+#include <maxtest/nodes.hh>
 
 class Maxscales: public Nodes
 {

maxscale-system-test/maxtest/include/maxtest/testconnections.h

@@ -1,19 +1,19 @@
 #pragma once
 
-#include <maxtest/mariadb_nodes.h>
-#include <maxtest/clustrix_nodes.h>
-#include <maxtest/maxscales.hh>
-#include <maxtest/test_dir.hh>
-#include <fcntl.h>
-#include <pthread.h>
-#include <sys/time.h>
 #include <set>
 #include <string>
 #include <vector>
 #include <thread>
 #include <functional>
+#include <fcntl.h>
+#include <pthread.h>
+#include <sys/time.h>
 
 #include <maxbase/ccdefs.hh>
+#include <maxtest/clustrix_nodes.h>
+#include <maxtest/mariadb_nodes.h>
+#include <maxtest/maxscales.hh>
+#include <maxtest/test_dir.hh>
 
 typedef std::set<std::string> StringSet;
 

maxscale-system-test/maxtest/src/maxinfo_func.cc

@@ -1,19 +1,17 @@
+#include <maxtest/maxinfo_func.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <unistd.h>
-#include <maxtest/testconnections.h>
-
-#include <stdio.h>
-#include <sys/socket.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <openssl/sha.h>
-#include "maxinfo_func.h"
-#include <sys/epoll.h>
-#include <jansson.h>
 #include <fcntl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <jansson.h>
+#include <openssl/sha.h>
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/maxtest/src/maxrest.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "maxrest.hh"
+#include <maxtest/maxrest.hh>
 
 using namespace std;
 

maxscale-system-test/maxtest/src/nodes.cc

@@ -1,12 +1,12 @@
 #include <maxtest/nodes.hh>
-#include <string>
+
+#include <algorithm>
 #include <cstring>
-#include <iostream>
 #include <future>
 #include <functional>
-#include <algorithm>
+#include <iostream>
-#include <signal.h>
+#include <string>
-
+#include <csignal>
 #include <maxtest/envv.hh>
 
 Nodes::Nodes(const char* pref,

maxscale-system-test/maxtest/src/rds_vpc.cc

@@ -1,5 +1,5 @@
+#include <maxtest/rds_vpc.h>
 #include <maxtest/execute_cmd.hh>
-#include "rds_vpc.h"
 
 RDS::RDS(char* cluster)
 {

maxscale-system-test/maxtest/src/tcp_connection.cc

@@ -1,13 +1,11 @@
-#include "tcp_connection.hh"
+#include <maxtest/tcp_connection.hh>
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
 #include <string.h>
 #include <netdb.h>
 
-
 namespace
 {
 

maxscale-system-test/maxtest/src/test_binlog_fnc.cc

@@ -1,9 +1,8 @@
 #include <iostream>
-#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
-#include "maxadmin_operations.h"
 #include <maxtest/sql_t1.h>
-
+#include <maxtest/test_binlog_fnc.h>
-#include "test_binlog_fnc.h"
+#include <maxtest/testconnections.h>
 
 int check_sha1(TestConnections* Test)
 {

maxscale-system-test/mxs1628_bad_handshake.cpp

@@ -1,7 +1,6 @@
-#include "testconnections.h"
-#include "tcp_connection.hh"
-
 #include <vector>
+#include <maxtest/testconnections.h>
+#include <maxtest/tcp_connection.hh>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mxs2250_describe_temp_table.cpp

@@ -11,8 +11,8 @@
  * Public License.
  */
 
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mxs2512_trx_replay_rollback.cpp

@@ -11,11 +11,11 @@
  * Public License.
  */
 
+#include <iostream>
 #include <maxbase/assert.h>
 #include <maxbase/semaphore.hh>
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
-#include <iostream>
 
 using namespace std;
 

maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp

@@ -7,11 +7,9 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/maxadmin_operations.h>
-#include "maxadmin_operations.h"
+#include <maxtest/sql_t1.h>
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
-
-#include "test_binlog_fnc.h"
 
 const char* setup_binlog_wrong_passwrd
     =

maxscale-system-test/setup_binlog.cpp

@@ -28,14 +28,9 @@
  * master
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/test_binlog_fnc.h>
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
-#include "sql_t1.h"
-
-#include "test_binlog_fnc.h"
-
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/setup_binlog_gtid.cpp

@@ -3,14 +3,10 @@
  *
  */
 
-
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/maxadmin_operations.h>
-#include "maxadmin_operations.h"
+#include <maxtest/test_binlog_fnc.h>
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
-
-#include "test_binlog_fnc.h"
-
 
 int main(int argc, char* argv[])
 {