[Adapdev-commits] Adapdev/src/Adapdev.Data.Tests/Schema CompareDatabaseSchemasTest.cs,NONE,1.1 SaveDatabaseSchemaTest.cs,1.3,1.4

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27953/src/Adapdev.Data.Tests/Schema

Modified Files:
	SaveDatabaseSchemaTest.cs 
Added Files:
	CompareDatabaseSchemasTest.cs 
Log Message:
Fixed bug w/ dataschema saving and comparison
Fixed bugs w/ test multi-threading

Index: SaveDatabaseSchemaTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema/SaveDatabaseSchemaTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SaveDatabaseSchemaTest.cs	26 Nov 2005 08:09:23 -0000	1.3
--- SaveDatabaseSchemaTest.cs	27 Nov 2005 06:32:43 -0000	1.4
***************
*** 4,8 ****
  using NUnit.Framework;
  
! namespace Adapdev.Data.Tests.Schema
  {
  	/// <summary>
--- 4,8 ----
  using NUnit.Framework;
  
! namespace Adapdev.Data.Schema.Tests
  {
  	/// <summary>

--- NEW FILE: CompareDatabaseSchemasTest.cs ---
using System;
using Adapdev.Data.Schema;
using Adapdev.Serialization;
using NUnit.Framework;

namespace Adapdev.Data.Schema.Tests
{
	/// <summary>
	/// Summary description for CompareDatabaseSchemasTest.
	/// </summary>
	/// 
	[TestFixture]
	public class CompareDatabaseSchemasTest
	{
		[Test]
		public void CompareSame()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 2);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsFalse(column1.IsPrimaryKey);
			Assert.AreEqual(0, column1.Length);
		}

		[Test]
		public void CompareDifferentColumns()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ColumnSchema column = ds2.GetTable("Table1").GetColumn("Column1");
			column.IsPrimaryKey = true;
			column.Length = 200;

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 2);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsTrue(column1.IsPrimaryKey, "Column1 was not saved as a primary key");
			Assert.AreEqual(200, column1.Length, "Column1 length was not saved.");

		}

		[Test]
		public void CompareWithAddedColumn()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ColumnSchema column = ds2.GetTable("Table1").GetColumn("Column1");
			column.IsPrimaryKey = true;
			column.Length = 200;

			ColumnSchema column3 = new ColumnSchema();
			column3.Name = "Column3";
			ds1.GetTable("Table1").AddColumn(column3);

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 3);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsTrue(column1.IsPrimaryKey, "Column1 was not saved as a primary key");
			Assert.AreEqual(200, column1.Length, "Column1 length was not saved.");

		}

		[Test]
		public void CompareWithRemovedColumn()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ds1.GetTable("Table1").RemoveColumn("Column1");
			Assert.IsTrue(ds1.GetTable("Table1").Columns.Count == 1, "Column1 was not removed.");

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Console.WriteLine(ds3);
			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 1, "Removed column is still present");
		}


		[Test]
		public void CompareWithAddedTable()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			TableSchema table = new TableSchema();
			table.Name = "Table2";
			ds1.AddTable(table);

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 2);
		}

		[Test]
		public void CompareWithRemovedTable()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ds1.Tables.Remove("Table1");

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.AreEqual("REMOVED_Table1", ds3.GetTable("Table1").Name);
		}


		private DatabaseSchema CreateDatabaseSchema()
		{
			DatabaseSchema ds = new DatabaseSchema();
			
			TableSchema table = new TableSchema();
			table.Name = "Table1";

			ColumnSchema column1 = new ColumnSchema();
			column1.Name = "Column1";

			ColumnSchema column2 = new ColumnSchema();
			column2.Name = "Column2";

			table.AddColumn(column1);
			table.AddColumn(column2);

			ds.AddTable(table);

			return ds;

		}
			
	}
}