[pgsqlclient-checkins] SF.net SVN: pgsqlclient: [43] trunk/pgsqlclient/source/UnitTests
Status: Inactive
Brought to you by:
carlosga_fb
From: <car...@us...> - 2006-03-22 12:08:56
|
Revision: 43 Author: carlosga_fb Date: 2006-03-22 04:08:42 -0800 (Wed, 22 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=43&view=rev Log Message: ----------- More changes on the nunit test suite Modified Paths: -------------- trunk/pgsqlclient/source/UnitTests/PgBaseTest.cs trunk/pgsqlclient/source/UnitTests/PgDataReaderTest.cs trunk/pgsqlclient/source/UnitTests/PgDatabaseSchemaTest.cs Modified: trunk/pgsqlclient/source/UnitTests/PgBaseTest.cs =================================================================== --- trunk/pgsqlclient/source/UnitTests/PgBaseTest.cs 2006-03-22 11:01:46 UTC (rev 42) +++ trunk/pgsqlclient/source/UnitTests/PgBaseTest.cs 2006-03-22 12:08:42 UTC (rev 43) @@ -56,14 +56,7 @@ [SetUp] public void SetUp() { - try - { - DropDatabase(); - } - catch - { - } - + DropDatabase(); CreateDatabase(); // Build the connection string @@ -75,6 +68,7 @@ csb.Password = ConfigurationSettings.AppSettings["Password"]; csb.Port = Convert.ToInt32(ConfigurationSettings.AppSettings["Port"]); csb.Ssl = Convert.ToBoolean(ConfigurationSettings.AppSettings["SSL"]); + csb.Pooling = false; connection = new PgConnection(csb.ToString()); connection.StateChange += new StateChangeEventHandler(StateChange); @@ -104,6 +98,7 @@ csb.Password = ConfigurationSettings.AppSettings["Password"]; csb.Port = Convert.ToInt32(ConfigurationSettings.AppSettings["Port"]); csb.Ssl = Convert.ToBoolean(ConfigurationSettings.AppSettings["SSL"]); + csb.Pooling = false; PgConnection connection = new PgConnection(csb.ToString()); connection.Open(); @@ -125,12 +120,19 @@ csb.Password = ConfigurationSettings.AppSettings["Password"]; csb.Port = Convert.ToInt32(ConfigurationSettings.AppSettings["Port"]); csb.Ssl = Convert.ToBoolean(ConfigurationSettings.AppSettings["SSL"]); + csb.Pooling = false; PgConnection connection = new PgConnection(csb.ToString()); connection.Open(); PgCommand dropDatabase = new PgCommand(String.Format("drop database {0}", ConfigurationSettings.AppSettings["Database"]), connection); - dropDatabase.ExecuteNonQuery(); + try + { + dropDatabase.ExecuteNonQuery(); + } + catch + { + } dropDatabase.Dispose(); connection.Close(); @@ -281,7 +283,7 @@ private void InsertTestData() { - string commandText = "insert into public.test_table values(@int4_field, @char_field, @varchar_field, @single_field, @double_field, @date_Field, @time_field, @timestamp_field, @blob_field, @bool_field)"; + string commandText = "insert into public.test_table values(@int4_field, @char_field, @varchar_field, @single_field, @double_field, @date_field, @time_field, @timestamp_field, @blob_field, @bool_field)"; PgTransaction transaction = connection.BeginTransaction(); PgCommand command = new PgCommand(commandText, connection, transaction); Modified: trunk/pgsqlclient/source/UnitTests/PgDataReaderTest.cs =================================================================== --- trunk/pgsqlclient/source/UnitTests/PgDataReaderTest.cs 2006-03-22 11:01:46 UTC (rev 42) +++ trunk/pgsqlclient/source/UnitTests/PgDataReaderTest.cs 2006-03-22 12:08:42 UTC (rev 43) @@ -201,8 +201,8 @@ command.Dispose(); } - [Test] + [Ignore] public void NextResultTest() { string querys = Modified: trunk/pgsqlclient/source/UnitTests/PgDatabaseSchemaTest.cs =================================================================== --- trunk/pgsqlclient/source/UnitTests/PgDatabaseSchemaTest.cs 2006-03-22 11:01:46 UTC (rev 42) +++ trunk/pgsqlclient/source/UnitTests/PgDatabaseSchemaTest.cs 2006-03-22 12:08:42 UTC (rev 43) @@ -47,12 +47,6 @@ } [Test] - public void CheckConstraintsByTable() - { - DataTable checkConstraintsByTable = Connection.GetSchema("CheckConstraintsByTable", null); - } - - [Test] public void Columns() { DataTable columns = Connection.GetSchema("Columns", null); @@ -61,28 +55,22 @@ [Test] public void Databases() { - DataTable databases = Connection.GetSchema("Database", null); + DataTable databases = Connection.GetSchema("Databases", null); } [Test] - public void Domains() - { - DataTable domains = Connection.GetSchema("Domains", null); - } - - [Test] public void ForeignKeys() { DataTable foreignKeys = Connection.GetSchema("ForeignKeys", null); } - [Test] - public void FunctionPrivileges() - { - DataTable functionPrivileges = Connection.GetSchema("FunctionPrivileges", null); - } + [Test] + public void ForeignKeyColumns() + { + DataTable foreignKeys = Connection.GetSchema("ForeignKeyColumns", null); + } - [Test] + [Test] public void Functions() { DataTable functions = Connection.GetSchema("Functions", null); @@ -100,16 +88,32 @@ DataTable indexes = Connection.GetSchema("Indexes", null); } - [Test] + [Test] + public void IndexColumns() + { + DataTable indexes = Connection.GetSchema("Indexes", null); + + foreach (DataRow index in indexes.Rows) + { + string catalog = !index.IsNull("TABLE_CATALOG") ? (string)index["TABLE_CATALOG"] : null; + string schema = !index.IsNull("TABLE_SCHEMA") ? (string)index["TABLE_SCHEMA"] : null; + string tableName = !index.IsNull("TABLE_NAME") ? (string)index["TABLE_NAME"] : null; + string indexName = !index.IsNull("INDEX_NAME") ? (string)index["INDEX_NAME"] : null; + + DataTable indexColumns = Connection.GetSchema("IndexColumns", new string[] { catalog, schema, tableName, indexName }); + } + } + + [Test] public void PrimaryKeys() { DataTable primaryKeys = Connection.GetSchema("PrimaryKeys", null); } [Test] - public void ProviderTypes() + public void DataTypes() { - DataTable providerTypes = Connection.GetSchema("ProviderTypes", null); + DataTable providerTypes = Connection.GetSchema("DataTypes", null); } [Test] @@ -125,85 +129,38 @@ } [Test] - [Ignore("Not implemented.")] - public void Statistics() - { - DataTable statistics = Connection.GetSchema("Statistics", null); - } - - [Test] - public void TableConstraint() - { - DataTable tableConstraint = Connection.GetSchema("TableConstraint", null); - } - - [Test] - public void TablePrivileges() - { - DataTable tablePrivileges = Connection.GetSchema("TablePrivileges", null); - } - - [Test] - [Ignore("Not implemented.")] - public void TableStatistics() - { - DataTable tableStatistics = Connection.GetSchema("TableStatistics", null); - } - - [Test] public void Tables() { DataTable tables = Connection.GetSchema("Tables", null); } - [Test] - [Ignore("Not implemented.")] - public void TablesInfo() - { - DataTable tablesInfo = Connection.GetSchema("TablesInfo", null); - } + [Test] + public void TableConstraint() + { + DataTable tableConstraint = Connection.GetSchema("TableConstraint", null); + } - [Test] - [Ignore("Not implemented.")] - public void TriggerParameters() - { - DataTable triggerParameters = Connection.GetSchema("TriggerParameters", null); - } + [Test] + public void Triggers() + { + DataTable triggers = Connection.GetSchema("Triggers", null); + } - [Test] - [Ignore("Not implemented.")] - public void TriggerPrivileges() - { - DataTable triggerPrivileges = Connection.GetSchema("TriggerPrivileges", null); - } + [Test] + [Ignore("Not implemented.")] + public void TriggerParameters() + { + DataTable triggerParameters = Connection.GetSchema("TriggerParameters", null); + } [Test] - public void Triggers() + [Ignore("Not Implemented")] + public void ViewColumns() { - DataTable triggers = Connection.GetSchema("Triggers", null); + DataTable viewColumns = Connection.GetSchema("viewColumns", null); } [Test] - [Ignore("Not implemented.")] - public void UsagePrivileges() - { - DataTable usagePrivileges = Connection.GetSchema("UsagePrivileges", null); - } - - [Test] - [Ignore("Not implemented.")] - public void ViewColumnUsage() - { - DataTable viewColumnUsage = Connection.GetSchema("ViewColumnUsage", null); - } - - [Test] - public void ViewPrivileges() - { - DataTable viewPrivileges = Connection.GetSchema("ViewPrivileges", null); - } - - [Test] public void Views() { DataTable views = Connection.GetSchema("Views", null); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |