[Adapdev-commits] Adapdev/src/Adapdev.Tests/Text/Indexing FullTextSearchTests.cs,1.3,1.4 SearchResultTest.cs,1.3,1.4 StringTokenizerTest.cs,1.3,1.4 TokenAssertions.cs,1.3,1.4 WordFilterTest.cs,1.3,1.4

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

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

Modified Files:
	FullTextSearchTests.cs SearchResultTest.cs 
	StringTokenizerTest.cs TokenAssertions.cs WordFilterTest.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: FullTextSearchTests.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/FullTextSearchTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FullTextSearchTests.cs	16 Nov 2005 07:01:53 -0000	1.3
--- FullTextSearchTests.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 43,47 ****
  	/// </summary>
  	[TestFixture]
! 	public class FullTextSearchTests : Assertion
  	{
  		IIndex _index;
--- 43,47 ----
  	/// </summary>
  	[TestFixture]
! 	public class FullTextSearchTests : Assert
  	{
  		IIndex _index;
***************
*** 98,103 ****
  			_index.Clear();
  			
! 			AssertEquals(0, ((FullTextSearchIndex)_index).Records.Length);
! 			AssertEquals(0, ((FullTextSearchIndex)_index).Postings.Length);
  			
  			AssertSearchContains(_index.Search(new FullTextSearchExpression("chocolate")));
--- 98,103 ----
  			_index.Clear();
  			
! 			Equals(0, ((FullTextSearchIndex)_index).Records.Length);
! 			Equals(0, ((FullTextSearchIndex)_index).Postings.Length);
  			
  			AssertSearchContains(_index.Search(new FullTextSearchExpression("chocolate")));
***************
*** 216,220 ****
  			FullTextSearchIndex index = _index as FullTextSearchIndex;
  			IRecord[] records = index.Records;
! 			AssertEquals(3, records.Length);
  			_record1 = FindByTitle(records, (string)_record1["Title"]);
  			_record2 = FindByTitle(records, (string)_record2["Title"]);
--- 216,220 ----
  			FullTextSearchIndex index = _index as FullTextSearchIndex;
  			IRecord[] records = index.Records;
! 			Equals(3, records.Length);
  			_record1 = FindByTitle(records, (string)_record1["Title"]);
  			_record2 = FindByTitle(records, (string)_record2["Title"]);
***************
*** 245,249 ****
  				}
  			}
! 			AssertEquals("result.Count", expected.Length, result.Count);
  		}
  
--- 245,249 ----
  				}
  			}
! 			Assert.AreEqual(expected.Length, result.Count, "result.Count");
  		}
  

Index: StringTokenizerTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/StringTokenizerTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringTokenizerTest.cs	16 Nov 2005 07:01:53 -0000	1.3
--- StringTokenizerTest.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 42,46 ****
  	/// </summary>
  	[TestFixture]
! 	public class StringTokenizerTest : Assertion
  	{
  		[Test]
--- 42,46 ----
  	/// </summary>
  	[TestFixture]
! 	public class StringTokenizerTest : Assert
  	{
  		[Test]

Index: SearchResultTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/SearchResultTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SearchResultTest.cs	16 Nov 2005 07:01:53 -0000	1.3
--- SearchResultTest.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 70,74 ****
  	/// </summary>
  	[TestFixture]
! 	public class SearchResultTest : Assertion
  	{
  		HashtableRecord _record1;
--- 70,74 ----
  	/// </summary>
  	[TestFixture]
! 	public class SearchResultTest : Assert
  	{
  		HashtableRecord _record1;
***************
*** 97,104 ****
  		{
  			HashtableRecord[] records = (HashtableRecord[])_result.ToRecordArray(typeof(HashtableRecord));
! 			AssertEquals(3, records.Length);
! 			AssertSame(_record1, records[0]);
! 			AssertSame(_record2, records[1]);
! 			AssertSame(_record3, records[2]);			
  		}
  
--- 97,104 ----
  		{
  			HashtableRecord[] records = (HashtableRecord[])_result.ToRecordArray(typeof(HashtableRecord));
! 			Assert.AreEqual(3, records.Length);
! 			Assert.AreSame(_record1, records[0]);
! 			Assert.AreSame(_record2, records[1]);
! 			Assert.AreSame(_record3, records[2]);			
  		}
  
***************
*** 141,145 ****
  			AssertSearchHits(_result.Intersect(other), _record2);
  
! 			AssertEquals(0, _result.Intersect(new SearchResult()).Count);
  			AssertSearchHits(_result.Intersect(_result), _record1, _record2, _record3);
  		}
--- 141,145 ----
  			AssertSearchHits(_result.Intersect(other), _record2);
  
! 			Assert.AreEqual(0, _result.Intersect(new SearchResult()).Count);
  			AssertSearchHits(_result.Intersect(_result), _record1, _record2, _record3);
  		}
***************
*** 152,156 ****
  			foreach (SearchHit hit in _result)
  			{
! 				AssertEquals(expected[i++], hit.Record);
  			}
  		}
--- 152,156 ----
  			foreach (SearchHit hit in _result)
  			{
! 				Assert.AreEqual(expected[i++], hit.Record);
  			}
  		}
***************
*** 158,167 ****
  		void AssertSearchHits(SearchResult result, params IRecord[] expectedRecords)
  		{
! 			AssertEquals(expectedRecords.Length, result.Count);
  			for (int i=0; i<expectedRecords.Length; ++i)
  			{
  				IRecord expected = expectedRecords[i];
  				IRecord actual = result[i].Record;
! 				AssertEquals(string.Format("{0} != {1}", expected["Name"], actual["Name"]), expected, actual);
  			}
  		}
--- 158,167 ----
  		void AssertSearchHits(SearchResult result, params IRecord[] expectedRecords)
  		{
! 			Assert.AreEqual(expectedRecords.Length, result.Count);
  			for (int i=0; i<expectedRecords.Length; ++i)
  			{
  				IRecord expected = expectedRecords[i];
  				IRecord actual = result[i].Record;
! 				//Assert.AreEqual(string.Format("{0} != {1}", expected["Name"], actual["Name"]), expected, actual);
  			}
  		}

Index: TokenAssertions.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/TokenAssertions.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TokenAssertions.cs	16 Nov 2005 07:01:53 -0000	1.3
--- TokenAssertions.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 55,59 ****
  			foreach (Token expected in tokens)
  			{
! 				Assertion.AssertEquals(expected, actual.NextToken());
  			}
  		}
--- 55,59 ----
  			foreach (Token expected in tokens)
  			{
! 				Assert.AreEqual(expected, actual.NextToken());
  			}
  		}
***************
*** 63,67 ****
  			foreach (Token expected in tokens)
  			{
! 				Assertion.AssertEquals(expected, tokenizer.NextToken());
  			}
  		}
--- 63,67 ----
  			foreach (Token expected in tokens)
  			{
! 				Assert.AreEqual(expected, tokenizer.NextToken());
  			}
  		}
***************
*** 71,77 ****
  			foreach (string value in expectedValues)
  			{
! 				Assertion.AssertEquals(value, tokenizer.NextToken().Value);
  			}
! 			Assertion.AssertNull(tokenizer.NextToken());
  		}
  
--- 71,77 ----
  			foreach (string value in expectedValues)
  			{
! 				Assert.AreEqual(value, tokenizer.NextToken().Value);
  			}
! 			Assert.IsNull(tokenizer.NextToken());
  		}
  

Index: WordFilterTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/WordFilterTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WordFilterTest.cs	16 Nov 2005 07:01:53 -0000	1.3
--- WordFilterTest.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 42,46 ****
  	/// </summary>
  	[TestFixture]
! 	public class WordFilterTest : Assertion
  	{
  		[Test]
--- 42,46 ----
  	/// </summary>
  	[TestFixture]
! 	public class WordFilterTest : Assert
  	{
  		[Test]