[Jcframework-commits] Nunit/StandardClasses NonInheritedSuperClassTests.vb,NONE,1.1 tblAAtoNNClasses

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jcframework/Nunit/StandardClasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6561/Nunit/StandardClasses

Modified Files:
	NonInheritedRetreiveCriteria.vb NonInheritedTests.vb 
Added Files:
	NonInheritedSuperClassTests.vb tblAAtoNNClasses.vb 
Log Message:
Add support for standard classes super classes.
Add new NUnit test to test standard classes super classes.

--- NEW FILE: tblAAtoNNClasses.vb ---
Namespace StandardClasses

	Public Class AA
		Private _id As String = String.Empty
		Private _text As String = String.Empty

		Private _c As CC
		Private _cId As String = String.Empty
		Private _bCol As ArrayList

		Public Sub New()
			Me._bCol = New ArrayList
		End Sub

		Public Property Id() As String
			Get
				Return Me._id
			End Get
			Set(ByVal value As String)
				Me._id = value
			End Set
		End Property

		Public Property Text() As String
			Get
				Return Me._text
			End Get
			Set(ByVal Value As String)
				Me._text = Value
			End Set
		End Property

		Public Property C() As CC
			Get
				Return Me._c
			End Get
			Set(ByVal Value As CC)
				Me._c = Value
				If Not Value Is Nothing Then
					Me._cId = Value.Id
				End If
			End Set
		End Property

		Public Property CId() As String
			Get
				If Not Me._c Is Nothing Then
					Return Me._c.Id
				Else
					Return Me._cId
				End If
			End Get
			Set(ByVal Value As String)
				Me._cId = Value
			End Set
		End Property

		Public Property BCol() As ArrayList
			Get
				Return Me._bCol
			End Get
			Set(ByVal Value As ArrayList)
				Me._bCol = Value
			End Set
		End Property

	End Class

	Public Class BB

		Public Sub New()
			_nCol = New ArrayList
		End Sub

		Private _id As String = String.Empty
		Private _text As String = String.Empty
		Private _a As AA = Nothing
		Private _aId As String = String.Empty
		Private _m As MM = Nothing
		Private _mId As String = String.Empty
		Private _nCol As ArrayList

		Public Property Id() As String
			Get
				Return Me._id
			End Get
			Set(ByVal Value As String)
				Me._id = Value
			End Set
		End Property

		Public Property Text() As String
			Get
				Return Me._text
			End Get
			Set(ByVal Value As String)
				Me._text = Value
			End Set
		End Property

		Public Property A() As AA
			Get
				Return Me._a
			End Get
			Set(ByVal Value As AA)
				Me._a = Value
				If Not Value Is Nothing Then
					Me._aId = Value.Id
				End If
			End Set
		End Property

		Public Property AId() As String
			Get
				If Not (Me._a Is Nothing) Then
					Return Me._a.Id
				Else
					Return Me._aId
				End If
			End Get
			Set(ByVal Value As String)
				Me._aId = Value
			End Set
		End Property

		Public Property M() As MM
			Get
				Return Me._m
			End Get
			Set(ByVal Value As MM)
				Me._m = Value
				If Not Value Is Nothing Then
					Me._mId = Value.Id
				End If
			End Set
		End Property

		Public Property MId() As String
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.Id
				Else
					Return Me._mId
				End If
			End Get
			Set(ByVal Value As String)
				Me._mId = Value
			End Set
		End Property

		Public Property NCol() As ArrayList
			Get
				Return Me._nCol
			End Get
			Set(ByVal Value As ArrayList)
				Me._nCol = Value
			End Set
		End Property

	End Class

	Public Class CC

		Public Sub New()
		End Sub
		Private _id As String = String.Empty
		Private _text As String = String.Empty

		Public Property Id() As String
			Get
				Return Me._id
			End Get
			Set(ByVal Value As String)
				Me._id = Value
			End Set
		End Property

		Public Property Text() As String
			Get
				Return Me._text
			End Get
			Set(ByVal Value As String)
				Me._text = Value
			End Set
		End Property

	End Class

	Public Class DD
		Inherits BB

		Public Sub New()
		End Sub
		Private _str As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				Me._str = Value
			End Set
		End Property

	End Class

	Public Class EE
		Inherits BB

		Public Sub New()
		End Sub
		Private _str As String = String.Empty
		Private _m As MM = Nothing
		Private _mId As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				Me._str = Value
			End Set
		End Property

		Public Property M1() As MM
			Get
				Return Me._m
			End Get
			Set(ByVal Value As MM)
				Me._m = Value
				If Not Value Is Nothing Then
					Me._mId = Value.Id
				End If
			End Set
		End Property

		Public Property M1Id() As String
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.Id
				Else
					Return Me._mId
				End If
			End Get
			Set(ByVal Value As String)
				Me._mId = Value
			End Set
		End Property

	End Class

	Public Class FF
		Inherits EE

		Public Sub New()
		End Sub
		Private _i As Integer = 0

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

	End Class

	Public Class GG
		Inherits EE

		Public Sub New()
		End Sub
		Private _i As Integer = 0
		Private _m As MM = Nothing
		Private _mId As String = String.Empty

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

		Public Property M2() As MM
			Get
				Return Me._m
			End Get
			Set(ByVal Value As MM)
				Me._m = Value
				If Not Value Is Nothing Then
					Me._mId = Value.Id
				End If
			End Set
		End Property

		Public Property M2Id() As String
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.Id
				Else
					Return Me._mId
				End If
			End Get
			Set(ByVal Value As String)
				Me._mId = Value
			End Set
		End Property

	End Class

	Public Class HH
		Inherits CC

		Public Sub New()
		End Sub
		Private _str As String = String.Empty
		Private _m As MM = Nothing
		Private _mId As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				Me._str = Value
			End Set
		End Property

		Public Property M1() As MM
			Get
				Return Me._m
			End Get
			Set(ByVal Value As MM)
				Me._m = Value
				If Not Value Is Nothing Then
					Me._mID = Value.Id
				End If
			End Set
		End Property

		Public Property M1Id() As String
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.Id
				Else
					Return Me._mId
				End If
			End Get
			Set(ByVal Value As String)
				Me._mId = Value
			End Set
		End Property

	End Class

	Public Class II
		Inherits CC

		Public Sub New()
		End Sub
		Private _str As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				Me._str = Value
			End Set
		End Property

	End Class

	Public Class JJ
		Inherits HH

		Public Sub New()
		End Sub
		Private _i As Integer = 0

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

	End Class

	Public Class KK
		Inherits HH

		Public Sub New()
		End Sub
		Private _i As Integer = 0
		Private _m As MM = Nothing
		Private _mId As String = String.Empty

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

		Public Property M() As MM
			Get
				Return Me._m
			End Get
			Set(ByVal Value As MM)
				Me._m = Value
				If Not Value Is Nothing Then
					Me._mID = Value.Id
				End If
			End Set
		End Property

		Public Property MId() As String
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.Id
				Else
					Return Me._mId
				End If
			End Get
			Set(ByVal Value As String)
				Me._mId = Value
			End Set
		End Property

	End Class

	Public Class MM

		Public Sub New()
		End Sub

		Private _id As String = String.Empty
		Private _i As Integer = 0

		Public Property Id() As String
			Get
				Return Me._id
			End Get
			Set(ByVal value As String)
				Me._id = value
			End Set
		End Property

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

	End Class

	Public Class NN

		Public Sub New()
		End Sub
		Private _id As String = String.Empty
		Private _i As Integer = 0
		Private _b As BB = Nothing
		Private _bId As String = String.Empty

		Public Property Id() As String
			Get
				Return Me._id
			End Get
			Set(ByVal value As String)
				Me._id = value
			End Set
		End Property

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				Me._i = Value
			End Set
		End Property

		Public Property B() As BB
			Get
				Return Me._b
			End Get
			Set(ByVal Value As BB)
				Me._b = Value
				If Not Value Is Nothing Then
					Me._bId = Value.Id
				End If
			End Set
		End Property

		Public Property BId() As String
			Get
				If Not (Me._b Is Nothing) Then
					Return Me._b.Id
				Else
					Return Me._bId
				End If
			End Get
			Set(ByVal Value As String)
				Me._bId = Value
			End Set
		End Property

	End Class

	Public Class LL
		Inherits NN

		Public Sub New()
		End Sub

		Private _s As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._s
			End Get
			Set(ByVal Value As String)
				Me._s = Value
			End Set
		End Property
	End Class

	Public Class OO
		Inherits MM

		Public Sub New()
		End Sub

		Private _s As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._s
			End Get
			Set(ByVal Value As String)
				Me._s = Value
			End Set
		End Property
	End Class
End Namespace
--- NEW FILE: NonInheritedSuperClassTests.vb ---
Imports AToMSFramework
Imports NUnit.Framework


Namespace StandardClasses
	<TestFixture()> Public Class NonInheritedSuperClassTests

		Private pbroker As PersistenceBroker

		<TestFixtureSetUp()> Public Sub Init()
			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
			Dim retry As Boolean = True
			While retry = True
				Try
					'Remove any existing test database
					System.IO.File.Delete(".\db1.mdb")
					retry = False
				Catch iox As IO.IOException
					GC.Collect()
					'file is in use  - so we will loop around until it is released
				Catch ex As Exception
					retry = False
				End Try
			End While
			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
			pbroker = New PersistenceBroker
			pbroker.init()
		End Sub

		<TestFixtureTearDown()> Public Sub Dispose()
			pbroker.Dispose()
			pbroker = Nothing
		End Sub

		<SetUp()> Public Sub TestInit()
		End Sub

		<TearDown()> Public Sub TestEnd()
		End Sub

		<Test()> Public Sub CheckMultiInheritance1()
			Dim root As New AA
			root.Id = "1"
			root.Text = "Root object"
			root.BCol = New ArrayList
			' create G and add it to the collection
			Dim g As New GG
			g.Id = "5"
			g.Text = "Child class of EE"
			g.Str = "Added to collection"
			g.I = 555
			g.A = root
			root.BCol.Add(g)

			' create oneToOne object (KK) and add it to root
			Dim k As New KK
			k.Id = "6"
			k.Text = "Child of class HH"
			k.Str = "Added to oneToOne association"
			k.I = 666
			root.C = k

			'save root (class AA)
			pbroker.GetObject(root)
			pbroker.PersistChanges()
			'Now check that AA, GG and KK are in the database

			pbroker.ClearCache()
			Dim col As ArrayList

			col = pbroker.GetAll(New AA().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Assert.IsTrue(injObj.ReferencedObject.C.GetType Is GetType(KK))
				Assert.AreEqual(root.C.Text, injObj.ReferencedObject.C.Text)
				Assert.IsTrue(injObj.ReferencedObject.BCol.Count > 0)
				For Each b As BB In injObj.ReferencedObject.BCol
					Assert.IsTrue(b.GetType Is GetType(GG))
				Next
			Next
		End Sub

		<Test()> Public Sub CheckMultiInheritance2()
			Dim root As New AA
			root.Id = "1"
			root.Text = "Root object"
			root.BCol = New ArrayList
			' create G and add it to the collection
			Dim g As New GG
			g.Id = "5"
			g.Text = "Child class of EE"
			g.Str = "Added to collection"
			g.I = 555
			g.A = root
			root.BCol.Add(g)

			' create oneToOne object (K) and add it to root
			Dim k As New KK
			k.Id = "6"
			k.Text = "Child of class HH"
			k.Str = "Added to oneToOne association"
			k.I = 666
			root.C = k

			'save root (class AA)
			pbroker.GetObject(root)
			pbroker.PersistChanges()
			'Now check that AA, GG and KK are in the database

			pbroker.ClearCache()
			Dim col As ArrayList

			col = pbroker.GetAll(New AA().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Assert.IsNull(CType(CType(injObj.ReferencedObject.C, KK).M, MM), "Object is not NULL")
				Assert.IsTrue(injObj.ReferencedObject.BCol.Count > 0)
				For Each b As BB In injObj.ReferencedObject.BCol
					Assert.IsTrue(b.GetType Is GetType(GG))
					Assert.IsNull(CType(CType(b, GG).M1, MM), "Object is not NULL")
				Next
			Next
		End Sub

		<Test()> Public Sub CheckMultiInheritance3()
			Dim col As ArrayList = pbroker.GetAll(New AA().GetType(), True)
			For Each injObj As InjectedObject In col
				pbroker.MarkForDeletion(injObj.ReferencedObject, True)
				pbroker.PersistChanges()
			Next

			Dim root As New AA
			root.Id = "1"
			root.Text = "Root object"
			root.BCol = New ArrayList
			' create GG and add it to the collection
			Dim g As New GG
			g.Id = "5"
			g.Text = "Child class of GG"
			g.Str = "test"
			g.I = 1234
			g.A = root
			root.BCol.Add(g)

			' create LL and add it to the collection
			Dim l As New LL
			l.Id = "6"
			l.Str = "Child of class LL"
			l.I = 666
			l.B = g
			g.NCol.Add(l)

			Dim o As New OO
			o.Id = "7"
			o.I = 9876
			o.Str = "Child of class OO"
			g.M = o

			'save root (class AA)
			pbroker.GetObject(root)
			pbroker.PersistChanges()
			'Now check that AA, GG and KK are in the database

			pbroker.ClearCache()

			col = pbroker.GetAll(New AA().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Assert.IsTrue(injObj.ReferencedObject.BCol.Count > 0)
				For Each b As BB In injObj.ReferencedObject.BCol
					Assert.IsTrue(b.GetType Is GetType(GG))
					Assert.IsTrue(CType(b, GG).M.GetType Is GetType(OO))
					Assert.IsTrue(b.NCol.Count > 0)
					For Each n As NN In b.NCol
						Assert.IsTrue(n.GetType Is GetType(LL))
					Next
				Next
			Next
		End Sub

		<Test()> Public Sub RetrievalViaParentAttributes()
			Dim j As New JJ
			j.I = 1
			j.Id = "123"
			j.Text = "Class CC Text"
			j.Str = "Class HH Str"
			pbroker.GetObject(j)
			pbroker.PersistChanges()

			j = New JJ
			Dim rc As New RetrieveCriteria
			rc.ClassMap = pbroker.GetClassMap(GetType(JJ))
			Dim condition As New CriteriaCondition
			condition.ClassMap = pbroker.GetClassMap(GetType(JJ))
			condition.Tables = rc.Tables
			condition.AddSelectEqualTo("Text", "Class CC Text")
			rc.WhereCondition = condition
			Dim cursor As ResultCursor = rc.Perform
			Assert.IsTrue(cursor.HasElements)
			Assert.AreEqual(1, cursor.TotalRows)
			cursor.LoadObject(j)
			Assert.AreEqual("Class CC Text", j.Text)
			Assert.AreEqual("Class HH Str", j.Str)
			Assert.AreEqual("123", j.Id)
		End Sub

		<Test()> Public Sub RetrievalViaParentAttributes2()
			Dim j As New JJ
			j.I = 1
			j.Id = "124"
			j.Text = "Class CC Text1"
			j.Str = "Class HH Str"
			pbroker.GetObject(j)
			pbroker.PersistChanges(True)

			j = New JJ
			Dim rc As New RetrieveCriteria
			rc.ClassMap = pbroker.GetClassMap(GetType(JJ))
			rc.WhereCondition.AddSelectEqualTo("Text", "Class CC Text1")
			Dim cursor As ResultCursor = rc.Perform
			Assert.IsTrue(cursor.HasElements)
			Assert.AreEqual(1, cursor.TotalRows)
			cursor.LoadObject(j)
			Assert.AreEqual("Class CC Text1", j.Text)
			Assert.AreEqual("Class HH Str", j.Str)
			Assert.AreEqual("124", j.Id)
		End Sub

		<Test()> Public Sub MultiRetreiveCreteria()
			Dim a As AA
			Dim b As BB
			Dim n As NN
			Dim f As FF

			a = New AA
			a.Id = "5"
			a.Text = "Instance of class AA"

			b = New BB
			b.Id = "1"
			b.Text = "Instance of class BB"
			b.A = a
			a.BCol.Add(b)

			n = New NN
			n.Id = "8"
			n.I = 7
			n.B = b
			b.NCol.Add(n)

			pbroker.GetObject(a)
			pbroker.PersistChanges()

			pbroker.ClearCache()

			Dim mrc As MultiRetrieveCriteria
			Dim a1 As New AA
			Dim c As ResultCursor

			mrc = New MultiRetrieveCriteria(a1)
			mrc.ClassMap = pbroker.GetClassMap(GetType(AA))
			mrc.ReturnFullObjects = True
			mrc.WhereCondition.ClassMap = pbroker.GetClassMap(GetType(AA))
			mrc.WhereCondition.AddSelectEqualTo("Id", "5")
			c = mrc.Perform
			c.LoadObject(a1)
			pbroker.GetObject(a1)

			Assert.AreEqual(1, a1.BCol.Count, "Number of objects in collection are different then 1")
		End Sub

		<Test()> Public Sub MultiRetreiveCreteria1()
			Dim gg As GG = New GG

			gg.Id = "1"
			gg.I = 26
			gg.Str = "test"
			gg.Text = "Child of class GG"
			pbroker.GetObject(gg)
			pbroker.PersistChanges(gg)

			gg.Id = "2"
			gg.I = 55
			gg.Str = "test"
			gg.Text = "Child of class GG"
			pbroker.GetObject(gg)
			pbroker.PersistChanges(gg)

			gg.Id = "3"
			gg.I = 987
			gg.Str = "test1"
			gg.Text = "Child of class GG"
			pbroker.GetObject(gg)
			pbroker.PersistChanges(gg)

			pbroker.ClearCache()

			gg = New GG
			Dim mrc As MultiRetrieveCriteria = New MultiRetrieveCriteria(gg)
			mrc.ClassMap = pbroker.GetClassMap(GetType(GG))
			mrc.ReturnFullObjects = True
			mrc.WhereCondition.ClassMap = pbroker.GetClassMap(GetType(EE))
			mrc.WhereCondition.AddSelectEqualTo("Str", "Test")
			Dim c As ResultCursor = mrc.Perform
			Dim list As ArrayList = New ArrayList
			While (Not c.EOF)
				c.LoadObject(gg)
				pbroker.GetObject(gg)
				list.Add(gg)
				gg = New GG
				c.NextCursor()
			End While

			Assert.AreEqual(2, list.Count, "Wrong number of objects")
		End Sub

		<Test()> Public Sub DeleteObjectAndSuperClass()
			Dim e As New EE
			e.Id = "1"
			e.Str = "test"
			e.Text = "test2"
			Dim n As New NN
			n.Id = "2"
			n.I = 51
			e.NCol.Add(n)
			n.B = e

			Me.pbroker.PersistChanges(e)
			Me.pbroker.ClearCache()

			Dim col As ArrayList = pbroker.GetAll(New EE().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Me.pbroker.MarkForDeletion(injObj.ReferencedObject, True)
				Me.pbroker.PersistChanges(injObj.ReferencedObject)
			Next
		End Sub

		<Test()> Public Sub CheckObjectType()
			Dim e As New EE
			e.Id = "1"
			e.Str = "test"
			e.Text = "test2"
			Dim n As New NN
			n.Id = "1"
			n.I = 51
			n.B = e
			e.NCol.Add(n)

			n = New NN
			n.Id = "2"
			n.I = 52
			n.B = e
			e.NCol.Add(n)

			Me.pbroker.PersistChanges(e)
			Me.pbroker.ClearCache()

			Dim col As ArrayList = pbroker.GetAll(New EE().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Assert.IsNotNull(CType(injObj.ReferencedObject, EE), "Object is of wrong type")
			Next

			col = pbroker.GetAll(New EE().GetType(), True)

			Assert.IsTrue(col.Count > 0)
			For Each injObj As InjectedObject In col
				Assert.IsNotNull(CType(injObj.ReferencedObject, EE), "Object is of wrong type")
			Next
		End Sub
	End Class
End Namespace
Index: NonInheritedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedTests.vb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NonInheritedTests.vb	1 Apr 2005 00:00:11 -0000	1.9
+++ NonInheritedTests.vb	10 Jul 2005 11:35:38 -0000	1.10
@@ -4,7 +4,7 @@
 Namespace StandardClasses
 	<TestFixture()> Public Class NonInheritedTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private job As NPJob
 		Private emp As NPEmployee
 
@@ -23,7 +23,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -54,7 +54,7 @@
 			Assert.AreEqual("basic", job.Description)
 		End Sub
 
-		<Test(), ExpectedException(GetType(System.Exception))> Public Sub CheckForError()
+		<Test(), ExpectedException(GetType(AtomsFrameworkException))> Public Sub CheckForError()
 			pbroker.GetObject(job)
 		End Sub
 
@@ -62,9 +62,9 @@
 			job.Id = "a2"
 			pbroker.GetObject(job)
 			job.Description = "SomeJob"
-			Assert.IsTrue(pbroker.getInjectedObject(job).IsDirty)
+			Assert.IsTrue(pbroker.GetInjectedObject(job).IsDirty)
 			pbroker.PersistChanges(job)
-			Assert.IsFalse(pbroker.getInjectedObject(job).IsDirty)
+			Assert.IsFalse(pbroker.GetInjectedObject(job).IsDirty)
 		End Sub
 
 		<Test()> Public Sub DeleteAJob()
@@ -103,15 +103,15 @@
 			pbroker.GetObject(job2)
 			job.Description = "c"
 			job2.Description = "d"
-			Assert.IsFalse(pbroker.getInjectedObject(job).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(job).Persistent)
 			pbroker.PersistChanges()
-			Assert.IsTrue(pbroker.getInjectedObject(job).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(job).Persistent)
 		End Sub
 
 		<Test()> Public Sub LoadEmployee_a()
 			emp.Name = "a"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Workers.Count, 0)
 			Assert.IsTrue(Not emp.ReportsTo Is Nothing)
 			Assert.AreEqual(emp.ReportsTo.Name, "c")
@@ -124,7 +124,7 @@
 		<Test()> Public Sub LoadEmployee_ac()
 			emp.Name = "ac"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Workers.Count, 3)
 			emp = CType(emp.Workers.Item(1), NPEmployee)
 			Assert.AreEqual(emp.Name, "aa")
@@ -134,8 +134,8 @@
 		<Test()> Public Sub CheckSchemaBasedProperties()
 			emp.Name = "ac"
 			pbroker.FindObject(emp)
-			Assert.AreEqual(50, pbroker.getInjectedObject(emp).getFieldLengthByName("Name"))
-			Assert.IsTrue(pbroker.getInjectedObject(emp).getFieldTypeByName("Name") Is GetType([String]))
+			Assert.AreEqual(50, pbroker.GetInjectedObject(emp).GetFieldLengthByName("Name"))
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).GetFieldTypeByName("Name") Is GetType([String]))
 		End Sub
 
 		<Test()> Public Sub PersistentObjectEquality()
@@ -152,49 +152,49 @@
 		<Test()> Public Sub LoadSaveandDeleteEmployee()
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.IsTrue(emp.ReportsTo Is Nothing)
 			Debug.WriteLine(pbroker.DumpCacheDetails)
 			emp = New NPEmployee
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Name, "new")
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
 			emp = New NPEmployee
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 		End Sub
 
 		<Test()> Public Sub ChangeFindFieldValue()
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.IsTrue(emp.ReportsTo Is Nothing)
 			emp = New NPEmployee
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Name, "SaveThenChange")
 			emp.Name = "Changed"
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
 			emp = New NPEmployee
 			emp.Name = "Changed"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			emp = New NPEmployee
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 		End Sub
 
 		<Test()> Public Sub saveHierarchy()
@@ -240,12 +240,12 @@
 			emp = New NPEmployee
 			emp.Name = "AManager"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent, "AManager was deleted")
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent, "AManager was deleted")
 			Assert.IsNull(emp.ReportsTo, "AManager's ReportsTo wasn't cleared")
 			emp = New NPEmployee
 			emp.Name = "AWorker"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent, "AWorker was deleted")
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent, "AWorker was deleted")
 		End Sub
 
 		<Test()> Public Sub LazyLoadEmployees()
@@ -257,5 +257,24 @@
 			Assert.AreEqual(emp1.ReportsToName, emp1.ReportsTo.Name)
 			Assert.AreEqual(0, emp1.ReportsTo.Workers.Count)
 		End Sub
+
+		<Test()> Public Sub GetAll()
+			Dim list As ArrayList
+
+			list = pbroker.GetAll(emp.GetType(), True)
+			Assert.IsTrue(list.Count > 0, "No objects have been read from the database")
+			Assert.AreEqual((CType(list(0), InjectedObject)).ReferencedObject.Name, "ab")
+			Assert.AreEqual((CType(list(0), InjectedObject)).ReferencedObject.ReportsToName, (CType(list(0), InjectedObject)).ReferencedObject.ReportsTo.Name)
+			Assert.AreEqual((CType(list(1), InjectedObject)).ReferencedObject.Name, "ac")
+			Assert.IsTrue((CType(list(1), InjectedObject)).ReferencedObject.Workers.Count > 0)
+			Assert.AreEqual((CType(list(2), InjectedObject)).ReferencedObject.Name, "aa")
+			Assert.AreEqual((CType(list(2), InjectedObject)).ReferencedObject.ReportsToName, (CType(list(2), InjectedObject)).ReferencedObject.ReportsTo.Name)
+			Assert.AreEqual((CType(list(3), InjectedObject)).ReferencedObject.Name, "b")
+			Assert.AreEqual((CType(list(3), InjectedObject)).ReferencedObject.ReportsToName, (CType(list(3), InjectedObject)).ReferencedObject.ReportsTo.Name)
+			Assert.AreEqual((CType(list(4), InjectedObject)).ReferencedObject.Name, "a")
+			Assert.AreEqual((CType(list(4), InjectedObject)).ReferencedObject.ReportsToName, (CType(list(4), InjectedObject)).ReferencedObject.ReportsTo.Name)
+			Assert.AreEqual((CType(list(5), InjectedObject)).ReferencedObject.Name, "c")
+			Assert.IsTrue((CType(list(5), InjectedObject)).ReferencedObject.Workers.Count > 0)
+		End Sub
 	End Class
 End Namespace
\ No newline at end of file

Index: NonInheritedRetreiveCriteria.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedRetreiveCriteria.vb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NonInheritedRetreiveCriteria.vb	16 Mar 2005 11:34:13 -0000	1.3
+++ NonInheritedRetreiveCriteria.vb	10 Jul 2005 11:35:38 -0000	1.4
@@ -4,12 +4,12 @@
 Namespace StandardClasses
 	<TestFixture()> Public Class NonInheritedRetreiveCriteria
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private emp As NPEmployee
-		Private r As CRetrieveCriteria
-		Private mr As CMultiRetrieveCriteria
-		Private c As CCursor
-		Private injObj As CInjectedObject
+		Private r As RetrieveCriteria
+		Private mr As MultiRetrieveCriteria
+		Private c As ResultCursor
+		Private injObj As InjectedObject
 
 		<TestFixtureSetUp()> Public Sub Init()
 			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
@@ -26,7 +26,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -40,7 +40,7 @@
 		End Sub
 
 		<Test()> Public Sub SingleClassRetrieve()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = pbroker.getClassMap(GetType(NPEmployee))
 			c = r.perform
 			Assert.IsTrue(c.hasElements)
@@ -50,7 +50,7 @@
 		End Sub
 
 		<Test()> Public Sub LoadFullObjects()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ReturnFullObjects = True
 			r.ClassMap = pbroker.getClassMap(emp.GetType)
 			c = r.perform
@@ -69,7 +69,7 @@
 		End Sub
 
 		<Test()> Public Sub SimpleOrCriteria()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = pbroker.getClassMap(emp.GetType)
 			r.WhereCondition.addSelectEqualTo("Name", "aa")
 			r.WhereCondition.addSelectEqualTo("Name", "b", True)
@@ -88,7 +88,7 @@
 			Dim al As New ArrayList
 			al.Add("aa")
 			al.Add("b")
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = pbroker.getClassMap(emp.GetType)
 			r.WhereCondition.addSelectInList("Name", al)
 			c = r.perform
@@ -103,23 +103,23 @@
 		End Sub
 
 		<Test()> Public Sub SubCriteria()
-			Dim xx_1 As New CCriteriaCondition
-			Dim xx_2 As New CCriteriaCondition
-			Dim xx_3 As New CCriteriaCondition
-			Dim xx_4 As New CCriteriaCondition
+			Dim xx_1 As New CriteriaCondition
+			Dim xx_2 As New CriteriaCondition
+			Dim xx_3 As New CriteriaCondition
+			Dim xx_4 As New CriteriaCondition
 
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = pbroker.getClassMap(emp.GetType)
 			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)
+			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
@@ -134,11 +134,11 @@
 		End Sub
 
 		<Test()> Public Sub MultiRetrieveTest1()
-			Dim si As CSelectInCriteria
+			Dim si As SelectInCriteria
 
-			mr = New CMultiRetrieveCriteria(emp)
+			mr = New MultiRetrieveCriteria(emp)
 			mr.WhereCondition.addSelectEqualTo("Name", "ac")
-			si = New CSelectInCriteria(emp)
+			si = New SelectInCriteria(emp)
 			si.WhereCondition.addSelectEqualTo("Name", "ac")
 			si.SetSelectAttribute("Name")
 			mr.WhereCondition.addSelectNotIn("Name", si)





[Jcframework-commits] Nunit/StandardClasses NonInheritedSuperClassTests.vb,NONE,1.1 tblAAtoNNClasses

[Jcframework-commits] Nunit/StandardClasses NonInheritedSuperClassTests.vb,NONE,1.1 tblAAtoNNClasses.vb,NONE,1.1 NonInheritedRetreiveCriteria.vb,1.3,1.4 NonInheritedTests.vb,1.9,1.10