Fix data tests.

pull/151/head
Laurents Meyer 2 years ago
parent f95ccf1edb
commit 955d73d0ec

@ -44,11 +44,11 @@ namespace EntityFrameworkCore.Jet.Data.Tests
[TestMethod] [TestMethod]
public void Odbc_read_connection_string_with_all_properties() public void Odbc_read_connection_string_with_all_properties()
{ {
const string connectionString = @"driver={Microsoft Access Driver (*.mdb, *.accdb)};dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=hunter2;systemdb=SysDb"; const string connectionString = @"driver={Microsoft Access Driver (*.mdb, *.accdb)};dbq=ConnectionStringTest.accdb;uid=Admin;pwd=hunter2;systemdb=SysDb";
var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc) { ConnectionString = connectionString }; var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc) { ConnectionString = connectionString };
Assert.AreEqual(csb.Provider, @"Microsoft Access Driver (*.mdb, *.accdb)"); Assert.AreEqual(csb.Provider, @"Microsoft Access Driver (*.mdb, *.accdb)");
Assert.AreEqual(csb.DataSource, @"C:\myFolder\myAccessFile.accdb"); Assert.AreEqual(csb.DataSource, @"ConnectionStringTest.accdb");
Assert.AreEqual(csb.UserId, "Admin"); Assert.AreEqual(csb.UserId, "Admin");
Assert.AreEqual(csb.Password, "hunter2"); Assert.AreEqual(csb.Password, "hunter2");
Assert.AreEqual(csb.SystemDatabase, "SysDb"); Assert.AreEqual(csb.SystemDatabase, "SysDb");
@ -61,14 +61,14 @@ namespace EntityFrameworkCore.Jet.Data.Tests
var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc) var csb = new JetConnectionStringBuilder(DataAccessProviderType.Odbc)
{ {
Provider = "Microsoft Access Driver (*.mdb, *.accdb)", Provider = "Microsoft Access Driver (*.mdb, *.accdb)",
DataSource = @"C:\myFolder\myAccessFile.accdb", DataSource = @"ConnectionStringTest.accdb",
UserId = "Admin", UserId = "Admin",
Password = "hunter2", Password = "hunter2",
SystemDatabase = "SysDb", SystemDatabase = "SysDb",
DatabasePassword = "DbPwd", DatabasePassword = "DbPwd",
}; };
Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString); Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=ConnectionStringTest.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString);
} }
[TestMethod] [TestMethod]
@ -77,23 +77,23 @@ namespace EntityFrameworkCore.Jet.Data.Tests
var csb = new JetConnection(OdbcFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder; var csb = new JetConnection(OdbcFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder;
Assert.IsNotNull(csb); Assert.IsNotNull(csb);
csb.Provider = "Microsoft Access Driver (*.mdb, *.accdb)"; csb.Provider = "Microsoft Access Driver (*.mdb, *.accdb)";
csb.DataSource = @"C:\myFolder\myAccessFile.accdb"; csb.DataSource = @"ConnectionStringTest.accdb";
csb.UserId = "Admin"; csb.UserId = "Admin";
csb.Password = "hunter2"; csb.Password = "hunter2";
csb.SystemDatabase = "SysDb"; csb.SystemDatabase = "SysDb";
csb.DatabasePassword = "DbPwd"; csb.DatabasePassword = "DbPwd";
Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=C:\myFolder\myAccessFile.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString); Assert.AreEqual(@"driver=""{Microsoft Access Driver (*.mdb, *.accdb)}"";dbq=ConnectionStringTest.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb", csb.ConnectionString);
} }
[TestMethod] [TestMethod]
public void OleDb_read_connection_string_with_all_properties() public void OleDb_read_connection_string_with_all_properties()
{ {
const string connectionString = @"Provider=Microsoft.ACE.OLEDB.12.0;Data Source=C:\myFolder\myAccessFile.accdb;User ID=Admin;Password=hunter2;Jet OLEDB:System Database=SysDb;Jet OLEDB:Database Password=DbPwd"; const string connectionString = @"Provider=Microsoft.ACE.OLEDB.12.0;Data Source=ConnectionStringTest.accdb;User ID=Admin;Password=hunter2;Jet OLEDB:System Database=SysDb;Jet OLEDB:Database Password=DbPwd";
var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb) { ConnectionString = connectionString }; var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb) { ConnectionString = connectionString };
Assert.AreEqual(csb.Provider, "Microsoft.ACE.OLEDB.12.0"); Assert.AreEqual(csb.Provider, "Microsoft.ACE.OLEDB.12.0");
Assert.AreEqual(csb.DataSource, @"C:\myFolder\myAccessFile.accdb"); Assert.AreEqual(csb.DataSource, @"ConnectionStringTest.accdb");
Assert.AreEqual(csb.UserId, "Admin"); Assert.AreEqual(csb.UserId, "Admin");
Assert.AreEqual(csb.Password, "hunter2"); Assert.AreEqual(csb.Password, "hunter2");
Assert.AreEqual(csb.SystemDatabase, "SysDb"); Assert.AreEqual(csb.SystemDatabase, "SysDb");
@ -106,14 +106,14 @@ namespace EntityFrameworkCore.Jet.Data.Tests
var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb) var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb)
{ {
Provider = "Microsoft.ACE.OLEDB.12.0", Provider = "Microsoft.ACE.OLEDB.12.0",
DataSource = @"C:\myFolder\myAccessFile.accdb", DataSource = @"ConnectionStringTest.accdb",
UserId = "Admin", UserId = "Admin",
Password = "hunter2", Password = "hunter2",
SystemDatabase = "SysDb", SystemDatabase = "SysDb",
DatabasePassword = "DbPwd", DatabasePassword = "DbPwd",
}; };
Assert.AreEqual(@"provider=Microsoft.ACE.OLEDB.12.0;data source=C:\myFolder\myAccessFile.accdb;user id=Admin;password=hunter2;jet oledb:system database=SysDb;jet oledb:database password=DbPwd", csb.ConnectionString); Assert.AreEqual(@"provider=Microsoft.ACE.OLEDB.12.0;data source=ConnectionStringTest.accdb;user id=Admin;password=hunter2;jet oledb:system database=SysDb;jet oledb:database password=DbPwd", csb.ConnectionString);
} }
[TestMethod] [TestMethod]
@ -122,13 +122,15 @@ namespace EntityFrameworkCore.Jet.Data.Tests
var csb = new JetConnection(OleDbFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder; var csb = new JetConnection(OleDbFactory.Instance).JetFactory.CreateConnectionStringBuilder() as JetConnectionStringBuilder;
Assert.IsNotNull(csb); Assert.IsNotNull(csb);
csb.Provider = "Microsoft.ACE.OLEDB.12.0"; csb.Provider = "Microsoft.ACE.OLEDB.12.0";
csb.DataSource = @"C:\myFolder\myAccessFile.accdb"; csb.DataSource = @"ConnectionStringTest.accdb";
csb.UserId = "Admin"; csb.UserId = "Admin";
csb.Password = "hunter2"; csb.Password = "hunter2";
csb.SystemDatabase = "SysDb"; csb.SystemDatabase = "SysDb";
csb.DatabasePassword = "DbPwd"; csb.DatabasePassword = "DbPwd";
Assert.AreEqual(@"provider=Microsoft.ACE.OLEDB.12.0;data source=C:\myFolder\myAccessFile.accdb;password=hunter2;user id=Admin;jet oledb:system database=SysDb;jet oledb:database password=DbPwd", csb.ConnectionString); Assert.IsTrue(
csb.ConnectionString is @"provider=Microsoft.ACE.OLEDB.12.0;data source=ConnectionStringTest.accdb;password=hunter2;user id=Admin;jet oledb:system database=SysDb;jet oledb:database password=DbPwd"
or @"provider=Microsoft.ACE.OLEDB.12.0;data source=ConnectionStringTest.accdb;user id=Admin;password=hunter2;jet oledb:system database=SysDb;jet oledb:database password=DbPwd");
} }
} }
} }
Loading…
Cancel
Save