[Jcframework-commits] dotnet/Nunit/InheritedClasses RetrieveCriteriaTests.vb,1.1,1.2

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/dotnet/Nunit/InheritedClasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31743/Nunit/InheritedClasses

Modified Files:
	RetrieveCriteriaTests.vb 
Log Message:
Fixed sorted GetAll and added extra unit test

Index: RetrieveCriteriaTests.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/Nunit/InheritedClasses/RetrieveCriteriaTests.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RetrieveCriteriaTests.vb	11 Apr 2005 00:31:49 -0000	1.1
+++ RetrieveCriteriaTests.vb	9 May 2005 00:29:15 -0000	1.2
@@ -39,11 +39,19 @@
 			emp = New CEmployee
 		End Sub
 
+		<Test()> Public Sub SortedGetAll()
+			Dim poc As New PersistentObjectCollection
+			Dim attribute As New Collection
+			attribute.Add("Name")
+			poc = emp.GetAll(attribute, attribute)
+			Assert.IsTrue(poc.Count > 0)
+		End Sub
+
 		<Test()> Public Sub SingleClassRetrieve()
 			r = New RetrieveCriteria
-			r.ClassMap = emp.getClassMap
-			c = r.perform
-			Assert.IsTrue(c.hasElements)
+			r.ClassMap = emp.GetClassMap
+			c = r.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.IsTrue(Not c.EOF)
 			Assert.IsTrue(c.HoldsProxies)
 			Assert.AreEqual(c.ResultSet.ResultSet.Tables(0).Rows.Count, 6)
@@ -53,56 +61,56 @@
 			Dim si As SelectInCriteria
 
 			mr = New MultiRetrieveCriteria(emp)
-			mr.WhereCondition.addSelectEqualTo("Name", "ac")
+			mr.WhereCondition.AddSelectEqualTo("Name", "ac")
 			si = New SelectInCriteria(emp)
-			si.WhereCondition.addSelectEqualTo("Name", "ac")
+			si.WhereCondition.AddSelectEqualTo("Name", "ac")
 			si.SetSelectAttribute("Name")
-			mr.WhereCondition.addSelectNotIn("Name", si)
-			c = mr.perform
-			Assert.IsFalse(c.hasElements)
+			mr.WhereCondition.AddSelectNotIn("Name", si)
+			c = mr.Perform
+			Assert.IsFalse(c.HasElements)
 			Assert.IsTrue(c.EOF)
 		End Sub
 
 		<Test()> Public Sub RetrieveCriteriaOffset()
 			r = New RetrieveCriteria
-			r.ClassMap = emp.getClassMap
+			r.ClassMap = emp.GetClassMap
 			r.RowLimit = 1
 			r.Offset = 1
-			c = r.perform
-			Assert.IsTrue(c.hasElements)
+			c = r.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.AreEqual(1, c.TotalRows)
 		End Sub
 
 		<Test()> Public Sub LoadFullObjects()
 			r = New RetrieveCriteria
 			r.ReturnFullObjects = True
-			c = r.perform(emp)
+			c = r.Perform(emp)
 			Assert.IsFalse(c.HoldsProxies)
-			While c.hasElements And Not c.EOF
+			While c.HasElements And Not c.EOF
 				emp = New CEmployee
-				c.loadObject(emp)
+				c.LoadObject(emp)
 				Assert.IsTrue(emp.Persistent)
-				c.nextCursor()
+				c.NextCursor()
 			End While
 			c.SetCursor(0)
 			emp = New CEmployee
-			c.loadObject(emp)
+			c.LoadObject(emp)
 			Assert.AreEqual(emp.Name, "ab")
 		End Sub
 
 		<Test()> Public Sub SimpleOrCriteria()
 			r = New RetrieveCriteria
-			r.ClassMap = emp.getClassMap
-			r.WhereCondition.addSelectEqualTo("Name", "aa")
-			r.WhereCondition.addSelectEqualTo("Name", "b", True)
-			c = r.perform
-			Assert.IsTrue(c.hasElements)
+			r.ClassMap = emp.GetClassMap
+			r.WhereCondition.AddSelectEqualTo("Name", "aa")
+			r.WhereCondition.AddSelectEqualTo("Name", "b", True)
+			c = r.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.AreEqual(c.ResultSet.ResultSet.Tables(0).Rows.Count, 2)
-			c.loadObject(emp)
+			c.LoadObject(emp)
 			Assert.AreEqual(emp.Name, "aa")
-			c.nextCursor()
+			c.NextCursor()
 			emp = New CEmployee
-			c.loadObject(emp)
+			c.LoadObject(emp)
 			Assert.AreEqual(emp.Name, "b")
 		End Sub
 
@@ -111,16 +119,16 @@
 			al.Add("aa")
 			al.Add("b")
 			r = New RetrieveCriteria
-			r.ClassMap = emp.getClassMap
-			r.WhereCondition.addSelectInList("Name", al)
-			c = r.perform
-			Assert.IsTrue(c.hasElements)
+			r.ClassMap = emp.GetClassMap
+			r.WhereCondition.AddSelectInList("Name", al)
+			c = r.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.AreEqual(c.ResultSet.ResultSet.Tables(0).Rows.Count, 2)
-			c.loadObject(emp)
+			c.LoadObject(emp)
 			Assert.AreEqual(emp.Name, "aa")
-			c.nextCursor()
+			c.NextCursor()
 			emp = New CEmployee
-			c.loadObject(emp)
+			c.LoadObject(emp)
 			Assert.AreEqual(emp.Name, "b")
 		End Sub
 
@@ -131,27 +139,27 @@
 			Dim xx_4 As New CriteriaCondition
 
 			r = New RetrieveCriteria
-			r.ClassMap = emp.getClassMap
+			r.ClassMap = emp.GetClassMap
 			xx_1.ClassMap = r.ClassMap
 			xx_2.ClassMap = r.ClassMap
 			xx_3.ClassMap = r.ClassMap
 			xx_4.ClassMap = r.ClassMap
-			xx_1.addSelectEqualTo("Name", "aa")
-			xx_2.addSelectEqualTo("Name", "ab")
-			xx_1.addSubCriteria(xx_2, True)
-			xx_3.addSelectEqualTo("Name", "ab")
-			xx_4.addSelectEqualTo("Name", "ac")
-			xx_3.addSubCriteria(xx_4, True)
-			r.WhereCondition.addSubCriteria(xx_1, True)
-			r.WhereCondition.addSubCriteria(xx_3, False)
-			c = r.perform
-			Assert.IsTrue(c.hasElements)
+			xx_1.AddSelectEqualTo("Name", "aa")
+			xx_2.AddSelectEqualTo("Name", "ab")
+			xx_1.AddSubCriteria(xx_2, True)
+			xx_3.AddSelectEqualTo("Name", "ab")
+			xx_4.AddSelectEqualTo("Name", "ac")
+			xx_3.AddSubCriteria(xx_4, True)
+			r.WhereCondition.AddSubCriteria(xx_1, True)
+			r.WhereCondition.AddSubCriteria(xx_3, False)
+			c = r.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.AreEqual(c.ResultSet.ResultSet.Tables(0).Rows.Count, 1)
-			While c.hasElements And Not c.EOF
+			While c.HasElements And Not c.EOF
 				emp = New CEmployee
-				c.loadObject(emp)
+				c.LoadObject(emp)
 				Assert.AreEqual(emp.Name, "ab")
-				c.nextCursor()
+				c.NextCursor()
 			End While
 		End Sub
 	End Class