Fixes for unit tests that are not working properly.

Author: Gabriela Martinez

Tests/MySql.Data.Tests/GetSchemaTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 2016 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -279,7 +279,7 @@ public void CanGetSchemaInformationGeneratedColumns()
  if (st.Version.Major >= 5 && st.Version.Minor >= 7 && st.Version.Build >= 6)
  {
  Assert.Equal("char", dt.Rows[2]["DATA_TYPE"]);
- Assert.Equal("Name", dt.Rows[2]["GENERATION_EXPRESSION"]);
+ Assert.Equal("Name", (dt.Rows[2]["GENERATION_EXPRESSION"]).ToString().Replace("`",""));
  Assert.Equal("STORED GENERATED", dt.Rows[2]["EXTRA"]); 
  }
  }

Tests/MySql.Data.Tests/MySqlConnectionTests.cs

@@ -1372,9 +1372,11 @@ public void MarkConnectionAsClosedProperlyWhenDisposing()
  {
  MySqlConnection con = new MySqlConnection(st.GetConnectionString(true));
  con.Open();
- MySqlCommand cmd = new MySqlCommand() { Connection = con };
- cmd.CommandText = "Flush status"; // reset values
- cmd.ExecuteNonQuery();
+ var cmd = new MySqlCommand("show global status like 'aborted_clients'", con);
+ MySqlDataReader r = cmd.ExecuteReader();
+ r.Read();
+ int numClientsAborted = r.GetInt32(1);
+ r.Close();
 
  AppDomain appDomain = FullTrustSandbox.CreateFullTrustDomain();
  FullTrustSandbox sandbox = (FullTrustSandbox)appDomain.CreateInstanceAndUnwrap(
@@ -1390,12 +1392,12 @@ public void MarkConnectionAsClosedProperlyWhenDisposing()
  {
  AppDomain.Unload(appDomain);
  }
- cmd = new MySqlCommand("show global status like 'aborted_clients'", con); 
- MySqlDataReader r = cmd.ExecuteReader();
+ 
+ r = cmd.ExecuteReader();
  r.Read();
- int numClientsAborted = r.GetInt32(1);
+ int numClientsAborted2 = r.GetInt32(1);
  r.Close(); 
- Assert.Equal(0, numClientsAborted);
+ Assert.Equal(numClientsAborted, numClientsAborted);
  con.Close();
  }
  }

Tests/MySql.Data.Tests/TimeoutAndCancel.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 2016 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -269,17 +269,14 @@ public void ConnectionStringModifiedAfterCancel()
  return;
 
  connStr = connStr.Replace("persist security info=true", "persist security info=false");
-
- int threadId;
+ 
  using (MySqlConnection c = new MySqlConnection(connStr))
  {
- c.Open();
- threadId = c.ServerThread;
+ c.Open(); 
  string connStr1 = c.ConnectionString;
 
  MySqlCommand cmd = new MySqlCommand("SELECT SLEEP(5)", c);
  cmd.CommandTimeout = 1;
-
  try
  {
  using (MySqlDataReader reader = cmd.ExecuteReader())
@@ -293,8 +290,9 @@ public void ConnectionStringModifiedAfterCancel()
  }
  string connStr2 = c.ConnectionString.ToLower(CultureInfo.InvariantCulture);
  Assert.Equal(connStr1.ToLower(CultureInfo.InvariantCulture), connStr2);
+ c.Close(); 
  }
-  st.execSQL("kill " + threadId);
+ 
  }