[Adapdev-commits] Adapdev/src/Adapdev.Tests CollectionSorterTest.cs,NONE,1.1 Adapdev.Tests.csproj,1.8,1.9 ObjectComparerTest.cs,1.6,1.7

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

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

Modified Files:
	Adapdev.Tests.csproj ObjectComparerTest.cs 
Added Files:
	CollectionSorterTest.cs 
Log Message:


--- NEW FILE: CollectionSorterTest.cs ---
using System;
using System.Collections;
using Adapdev;
using NUnit.Framework;

namespace Adapdev.Tests
{
	[TestFixture]
	public class CollectionSorterTest
	{
		[Test]
		public void SortArrayByAge()
		{
			Person[] personArray = this.GetPersonArray();

			Assert.AreEqual("Johnny", personArray[1].Name);
			Array.Sort(personArray, new CollectionSorter("Age"));
			Assert.AreEqual("Joey", personArray[1].Name);
		}

		[Test]
		public void SortArrayListByAge()
		{
			ArrayList personArray = this.GetPersonArrayList();

			Assert.AreEqual("Johnny", (personArray[1] as Person).Name);
			personArray.Sort(new CollectionSorter("Age"));
			Assert.AreEqual("Joey", (personArray[1] as Person).Name);
			Assert.AreEqual(25, (personArray[1] as Person).Age);
		}


		[Test]
		public void SortArrayByNameAndAge()
		{
			Person[] personArray = this.GetPersonArray();

			Assert.AreEqual("Johnny", personArray[1].Name);
			Array.Sort(personArray, new CollectionSorter("Name","Age"));
			Assert.AreEqual("C.J.", personArray[0].Name);
			Assert.AreEqual("Joey", personArray[2].Name);
			Assert.AreEqual(21, personArray[2].Age);
			Assert.AreEqual("Joey", personArray[3].Name);
			Assert.AreEqual(25, personArray[3].Age);
		}

		[Test]
		public void SortArrayByNameAndAgeDESC()
		{
			Person[] personArray = this.GetPersonArray();

			Assert.AreEqual("Johnny", personArray[1].Name);
			Array.Sort(personArray, new CollectionSorter(
				new string[]{"Name","Age"},
				new bool[]{false,true}
				));
			Assert.AreEqual("C.J.", personArray[0].Name);
			Assert.AreEqual("Joey", personArray[2].Name);
			Assert.AreEqual(25, personArray[2].Age);
			Assert.AreEqual("Joey", personArray[3].Name);
			Assert.AreEqual(21, personArray[3].Age);
		}

		private Person[] GetPersonArray()
		{
			Person[] personArray = new Person[]
			{
				new Person("Joey", 21),
				new Person("Johnny", 30),
				new Person("Marky", 28),
				new Person("C.J.", 28),
				new Person("Joey", 25),
				new Person("Dee Dee", 33)
			};
			return personArray;
		}

		private ArrayList GetPersonArrayList()
		{
			ArrayList personArray = new ArrayList();
			personArray.Add(new Person("Joey", 21));
			personArray.Add(new Person("Johnny", 30));
			personArray.Add(new Person("Marky", 28));
			personArray.Add(new Person("C.J.", 28));
			personArray.Add(new Person("Joey", 25));
			personArray.Add(new Person("Dee Dee", 33));
			return personArray;
		}
	}

	public class Person
	{
		public string Name
		{
			get
			{
				return _name;
			}
			set
			{
				_name = value;
			}
		}

		public int Age
		{
			get
			{
				return _age;
			}
			set
			{
				_age = value;
			}
		}

		public Person(string name, int age)
		{
			_name = name;
			_age = age;
		}

		public override string ToString()
		{
			return Name + ", " + Age;
		}
		protected string _name;
		protected int _age;
	}
}


Index: ObjectComparerTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/ObjectComparerTest.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ObjectComparerTest.cs	26 Nov 2005 09:09:00 -0000	1.6
--- ObjectComparerTest.cs	21 Feb 2006 04:31:17 -0000	1.7
***************
*** 3,6 ****
--- 3,7 ----
  using System.Threading;
  using Adapdev.Mock;
+ using Adapdev.Reflection;
  using Adapdev.Serialization;
  using NUnit.Framework;
***************
*** 16,20 ****
  	{
  		[Test]
! 		public void AreEqual()
  		{
  			DateTime now = DateTime.Now;
--- 17,21 ----
  	{
  		[Test]
! 		public void AreBytesEqual()
  		{
  			DateTime now = DateTime.Now;
***************
*** 31,44 ****
  
  			// Uses ISerializable comparison
! 			Assert.IsTrue(ObjectComparer.AreEqual(e1, e2), "Objects should be equal.");
  
  			e2.Created = DateTime.Now.AddHours(1);
  
! 			Assert.IsFalse(ObjectComparer.AreEqual(e1, e2), "Objects should not be equal.");
  
  		}
  
  		[Test]
! 		public void FailAreEqualWithFields()
  		{
  			DateTime now = DateTime.Now;
--- 32,112 ----
  
  			// Uses ISerializable comparison
! 			Assert.IsTrue(ObjectComparer.AreBytesEqual(e1, e2), "Objects should be equal.");
  
  			e2.Created = DateTime.Now.AddHours(1);
  
! 			Assert.IsFalse(ObjectComparer.AreBytesEqual(e1, e2), "Objects should not be equal.");
  
  		}
  
  		[Test]
! 		public void ArePropertiesEqual()
! 		{
! 			DateTime now = DateTime.Now;
! 
! 			SuppliersEntity e1 = new SuppliersEntity();
! 			e1.Address = "Test";
! 			e1.SupplierID = 12;
! 			e1.Created = now;
! 
! 			SuppliersEntity e2 = new SuppliersEntity();
! 			e2.Address = "Test";
! 			e2.SupplierID = 12;
! 			e2.Created = now;
! 
! 			// Uses ISerializable comparison
! 			Assert.IsTrue(ObjectComparer.ArePropertiesEqual(e1, e2), "Objects should be equal.");
! 
! 			e2.Created = DateTime.Now.AddHours(1);
! 
! 			Assert.IsFalse(ObjectComparer.ArePropertiesEqual(e1, e2), "Objects should not be equal.");
! 
! 		}
! 
! 		[Test]
! 		public void AreFieldsEqual()
! 		{
! 			DateTime now = DateTime.Now;
! 
! 			SuppliersEntity e1 = new SuppliersEntity();
! 			e1.Address = "Test";
! 			e1.SupplierID = 12;
! 			e1.Created = now;
! 
! 			SuppliersEntity e2 = new SuppliersEntity();
! 			e2.Address = "Test";
! 			e2.SupplierID = 12;
! 			e2.Created = now;
! 
! 			Assert.IsTrue(ObjectComparer.AreFieldsEqual(e1, e2), "Objects should be equal.");
! 
! 			ClassAccessor c = ClassAccessorCache.Get(e2);
! 			c.SetValue(e2, "_Created", DateTime.Now.AddHours(1));
! 
! 			Assert.IsFalse(ObjectComparer.AreFieldsEqual(e1, e2), "Objects should not be equal.");
! 
! 		}
! 
! 
! 		[Test]
! 		public void FailDefaultEquals()
! 		{
! 			DateTime now = DateTime.Now;
! 
! 			SuppliersEntity e1 = new SuppliersEntity();
! 			e1.Address = "Test";
! 			e1.SupplierID = 12;
! 			e1.Created = now;
! 
! 			SuppliersEntity e2 = new SuppliersEntity();
! 			e2.Address = "Test";
! 			e2.SupplierID = 12;
! 			e2.Created = now;
! 
! 			Assert.IsFalse(e1.Equals(e2));
! 		}
! 
! 		[Test]
! 		public void FailAreEqual()
  		{
  			DateTime now = DateTime.Now;
***************
*** 59,63 ****
  			//Console.WriteLine(e2);
  
! 			Assert.IsFalse(ObjectComparer.AreEqual(e1, e2, true), "Objects should not be equal because InternalCreated is different.");
  		}
  	}
--- 127,131 ----
  			//Console.WriteLine(e2);
  
! 			Assert.IsFalse(ObjectComparer.AreEqual(e1, e2), "Objects should not be equal because InternalCreated is different.");
  		}
  	}

Index: Adapdev.Tests.csproj
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Adapdev.Tests.csproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Adapdev.Tests.csproj	16 Nov 2005 07:01:52 -0000	1.8
--- Adapdev.Tests.csproj	21 Feb 2006 04:31:17 -0000	1.9
***************
*** 126,129 ****
--- 126,134 ----
                  />
                  <File
+                     RelPath = "Cryptography\HasherTest.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Diagnostics\CPUMeterTest.cs"
                      SubType = "Code"
***************
*** 166,169 ****
--- 171,179 ----
                  />
                  <File
+                     RelPath = "Serialization\SerializerTest.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Text\Indexing\FullTextSearchTests.cs"
                      SubType = "Code"