Merge JDBC UT fixes

Author: silvakid

test/unit/bugs/bugs.cpp

@@ -1182,12 +1182,12 @@ void bugs::bug32695580()
   logMsg("bugs::bug32695580");
   sql::ConnectOptionsMap opt;
   opt[OPT_HOSTNAME] = "127.0.0.1";
-  opt[OPT_PORT] = 111;
+  opt[OPT_PORT] = 65000;
 
   try {
     Connection con2(getConnection(&opt));
   }  catch (const sql::SQLException &e) {
-    ASSERT_EQUALS(2003,e.getErrorCode());
+    ASSERT_GT(2000,e.getErrorCode());
   }
 }
 

test/unit/classes/connection.cpp

@@ -2457,9 +2457,6 @@ void connection::connectAttrAdd()
 {
   logMsg("connection::connectAttr - MYSQL_OPT_CONNECT_ATTR_ADD|MYSQL_OPT_CONNECT_ATTR_DELETE");
 
-  //TODO: Enable it after fixing
-  SKIP("Removed untill fixed");
-
   int serverVersion=getMySQLVersion(con);
   if ( serverVersion < 56006)
   {
@@ -2628,11 +2625,11 @@ void connection::connectAttrAdd()
     if (perf_conn_attr_size < 512) {
       SKIP("The performance_schema_session_connect_attrs_size is less then 512");
     } else if (perf_conn_attr_size >= 512 && perf_conn_attr_size < 1024) {
-      max_count= 32;
+      max_count= 20;
     } else if (perf_conn_attr_size >= 1024 && perf_conn_attr_size < 2048) {
-      max_count= 64;
+      max_count= 50;
     } else if (perf_conn_attr_size >= 2048) {
-      max_count= 128;
+      max_count= 100;
     }
 
     try
@@ -2645,7 +2642,7 @@ void connection::connectAttrAdd()
 
       for (i=1; i <= max_count; ++i) {
         skey.str("");
-        skey << "keymu" << i;
+        skey << "keymu" <<  std::setw(3) << std::setfill('0') << i;
         connectAttrMap[skey.str()] = "value";
       }
 
@@ -2659,12 +2656,12 @@ void connection::connectAttrAdd()
       stmt.reset(conn2->createStatement());
       res.reset(stmt->executeQuery("SELECT ATTR_NAME, ATTR_VALUE FROM "
             "performance_schema.session_account_connect_attrs WHERE "
-            "ATTR_NAME LIKE '%keymu%' ORDER BY SUBSTRING(ATTR_NAME, 6)+0 ASC;"));
+            "ATTR_NAME LIKE '%keymu%' ORDER BY SUBSTRING(ATTR_NAME, 6) ASC;"));
 
       i=0;
       while (res->next()) {
         skey.str("");
-        skey << "keymu" << ++i;
+        skey << "keymu" << std::setw(3) << std::setfill('0') << ++i;
         ASSERT_EQUALS(res->getString("ATTR_NAME"), skey.str());
         ASSERT_EQUALS(res->getString("ATTR_VALUE"), "value");
       }
@@ -3078,7 +3075,7 @@ void connection::localInfile()
 
       sql::SQLString orig_dir_path = load_data_path;
       sql::SQLString dir_path = conn->getClientOption(OPT_LOAD_DATA_LOCAL_DIR);
-      ASSERT_EQUALS(orig_dir_path, dir_path);
+      ASSERT( dir_path->find(orig_dir_path) != sql::SQLString::npos);
 
       conn->setClientOption(OPT_LOAD_DATA_LOCAL_DIR, nullptr);
 
@@ -3239,19 +3236,25 @@ void connection::localInfile()
       temp_dir = "/tmp/";
 #endif
 
-      dir = temp_dir + "test/";
+#ifndef _WIN32
+      std::string pid = std::to_string(getpid());
+#else
+      std::string pid = std::to_string(GetCurrentProcessId());
+#endif
+
+      dir = temp_dir + std::string("test")+pid+"/";
       file_path = dir + "infile.txt";
 
       dataDir dir_test(dir);
-      dataDir dir_link(temp_dir + "test_link/");
-      dataDir dir_subdir_link(temp_dir + "test_subdir_link/");
+      dataDir dir_link(temp_dir + "test_link" + pid +"/");
+      dataDir dir_subdir_link(temp_dir + "test_subdir_link" + pid + "/");
 
       dataFile infile(dir, "infile.txt");
 
 #ifndef _WIN32
-      dataFile infile_wo("/tmp/test/", "infile_wo.txt", true);
-      dataSymlink sl(file_path, temp_dir + "test_link/link_infile.txt");
-      dataSymlink sld(dir, temp_dir + "test_subdir_link/subdir");
+      dataFile infile_wo(dir, "infile_wo.txt", true);
+      dataSymlink sl(file_path, temp_dir + "test_link"+ pid + "/link_infile.txt");
+      dataSymlink sld(dir, temp_dir + "test_subdir_link"+ pid + "/subdir");
       std::string sld_file = sld.path();
       sld_file.append("/infile.txt");
 #endif

test/unit/classes/resultsetmetadata.cpp

@@ -201,7 +201,8 @@ void resultsetmetadata::doGetColumnDisplaySize(bool is_ps)
   ASSERT_EQUALS((unsigned int) 1, meta->getColumnDisplaySize(2));
   ASSERT_EQUALS((unsigned int) 5, meta->getColumnDisplaySize(3));
   ASSERT_EQUALS((unsigned int) 1, meta->getColumnDisplaySize(4));
-  ASSERT_EQUALS((unsigned int) 3, meta->getColumnDisplaySize(5));
+  // Integer now adds +1 for sign
+  ASSERT_EQUALS((unsigned int) 4, meta->getColumnDisplaySize(5));
 
   try
   {
@@ -1286,9 +1287,6 @@ void resultsetmetadata::isSigned()
 {
   logMsg("resultsetmetadata::isSigned() - MySQL_ResultSetMetaData::isSigned");
 
-  //TODO: Enable it after fixing
-  SKIP("Removed untill fixed");
-
   std::stringstream sql;
   std::vector<columndefinition>::iterator it;
   ResultSetMetaData * meta_st;

test/unit/unit_fixture.cpp

@@ -130,7 +130,7 @@ void unit_fixture::init()
   columns.push_back(columndefinition("DATETIME", "DATETIME NOT NULL DEFAULT '2009-02-12 21:36:54'", sql::DataType::TIMESTAMP, "2009-02-12 17:49:21", true, 19, 0, false, "2009-02-12 21:36:54", 0, "NO", false));
   // TODO this might be server dependent!
 
-  columns.push_back(columndefinition("TIMESTAMP", "TIMESTAMP", sql::DataType::TIMESTAMP, "2038-01-09 03:14:07", false, 19, 0, true, "", 0, "NO", false));
+  columns.push_back(columndefinition("TIMESTAMP", "TIMESTAMP", sql::DataType::TIMESTAMP, "2038-01-09 03:14:07", true, 19, 0, true, "", 0, "NO", false));
   columns.push_back(columndefinition("TIME", "TIME", sql::DataType::TIME, "-838:59:59", true, 8, 0, true, "", 0, "NO", true));
   columns.push_back(columndefinition("TIME", "TIME NOT NULL", sql::DataType::TIME, "838:59:59", true, 8, 0, false, "", 0, "NO", false));
   columns.push_back(columndefinition("TIME", "TIME DEFAULT '12:39:41'", sql::DataType::TIME, "-838:59:59", true, 8, 0, true, "12:39:41", 0, "NO", true));