Menu
▾
▴
[Jcframework-commits] Nunit/InheritedClasses CEmployee.vb,1.1,1.2 ManyToManyClasses_v2.vb,1.2,1.3 MultiRetrieveTests.vb,1.4,1.5 RetrieveCriteriaTests.vb,1.4,1.5 SuperClassTests.vb,1.6,1.7
|
From: Richard B. <rb...@us...> - 2005-03-16 11:34:27
|
Update of /cvsroot/jcframework/Nunit/InheritedClasses In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18429/InheritedClasses Modified Files: CEmployee.vb ManyToManyClasses_v2.vb MultiRetrieveTests.vb RetrieveCriteriaTests.vb SuperClassTests.vb Log Message: Extra unit tests for retrieve criteria. Some minor mods for existing unit tests related to framework changes. Index: RetrieveCriteriaTests.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/RetrieveCriteriaTests.vb,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- RetrieveCriteriaTests.vb 21 Dec 2004 22:00:01 -0000 1.4 +++ RetrieveCriteriaTests.vb 16 Mar 2005 11:34:12 -0000 1.5 @@ -81,7 +81,6 @@ While c.hasElements And Not c.EOF emp = New CEmployee c.loadObject(emp) - Console.WriteLine(emp.Name) Assert.IsTrue(emp.Persistent) c.nextCursor() End While Index: ManyToManyClasses_v2.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/ManyToManyClasses_v2.vb,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ManyToManyClasses_v2.vb 14 Feb 2005 02:24:12 -0000 1.2 +++ ManyToManyClasses_v2.vb 16 Mar 2005 11:34:12 -0000 1.3 @@ -81,7 +81,6 @@ Public Sub New() _aCol = New M2MACollection - _aCol.ContainerObject = Me End Sub End Class Index: CEmployee.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/CEmployee.vb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CEmployee.vb 19 Oct 2004 00:13:38 -0000 1.1 +++ CEmployee.vb 16 Mar 2005 11:34:12 -0000 1.2 @@ -12,7 +12,7 @@ Private m_name As String Private m_parentoid As String Private m_parent As CEmployee - Private m_children As CPersistentCollection + Private WithEvents m_children As CPersistentCollection Private m_team As CTeam Private m_teamoid As String @@ -104,8 +104,10 @@ Public Sub New() MyBase.New() m_children = New CPersistentCollection - m_children.ContainerObject = Me End Sub + Private Sub m_children_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles m_children.ListChanged + Me.SetDirtyFlag() + End Sub End Class End Namespace \ No newline at end of file Index: MultiRetrieveTests.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/MultiRetrieveTests.vb,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MultiRetrieveTests.vb 16 Mar 2005 09:35:16 -0000 1.4 +++ MultiRetrieveTests.vb 16 Mar 2005 11:34:12 -0000 1.5 @@ -50,41 +50,58 @@ Assert.AreEqual(3, c.TotalRows) End Sub - <Test()> Public Sub ChainedClassesWithOrderBy() - Dim mr1 As New mr1 - Dim mr2 As New mr2 - Dim mr3 As New mr3 - mrc = New CMultiRetrieveCriteria - mrc.addObjectToJoin(mr1, Nothing, "") - mrc.addObjectToJoin(mr2, mr1, "mr1tomr2") - mrc.addObjectToJoin(mr3, mr2, "mr2tomr3") - mrc.addOrderAttribute("mr3.field1") - mrc.ReturnFullObjects = True - c = mrc.perform - Assert.IsTrue(c.hasElements) - Assert.IsTrue(Not c.EOF) - Assert.IsFalse(c.HoldsProxies) - Assert.AreEqual(3, c.TotalRows) - End Sub + <Test()> Public Sub ChainedClassesWithWhere() + Dim mr1 As New mr1 + Dim mr2 As New mr2 + Dim mr3 As New mr3 + mrc = New CMultiRetrieveCriteria + mrc.addObjectToJoin(mr1, Nothing, "") + mrc.addObjectToJoin(mr2, mr1, "mr1tomr2") + mrc.addObjectToJoin(mr3, mr2, "mr2tomr3") + mrc.WhereCondition.addSelectNotEqualTo("field1", "xxx") + mrc.ReturnFullObjects = True + c = mrc.perform + Assert.IsTrue(c.hasElements) + Assert.IsTrue(Not c.EOF) + Assert.IsFalse(c.HoldsProxies) + Assert.AreEqual(3, c.TotalRows) + End Sub - <Test()> Public Sub SaveMRClasses() - Dim mr1 As New mr1 - mr1.id = "id1" - mr1.field1 = "_a" - mr1.field2 = 1 - Dim mr2 As New mr2 - mr2.id = "id2" - mr2.field1 = "_aa" - mr2.field2 = 2 - mr1.mr2 = mr2 - Dim mr3 As New mr3 - mr3.id = "id3" - mr3.field1 = "zz" - mr3.field2 = 3 - mr2.mr3 = mr3 - mr1.Save() - mr2.field2 = 22 - mr2.Save() + <Test()> Public Sub ChainedClassesWithOrderBy() + Dim mr1 As New mr1 + Dim mr2 As New mr2 + Dim mr3 As New mr3 + mrc = New CMultiRetrieveCriteria + mrc.addObjectToJoin(mr1, Nothing, "") + mrc.addObjectToJoin(mr2, mr1, "mr1tomr2") + mrc.addObjectToJoin(mr3, mr2, "mr2tomr3") + mrc.addOrderAttribute("mr3.field1") + mrc.ReturnFullObjects = True + c = mrc.perform + Assert.IsTrue(c.hasElements) + Assert.IsTrue(Not c.EOF) + Assert.IsFalse(c.HoldsProxies) + Assert.AreEqual(3, c.TotalRows) + End Sub + + <Test()> Public Sub SaveMRClasses() + Dim mr1 As New mr1 + mr1.id = "id1" + mr1.field1 = "_a" + mr1.field2 = 1 + Dim mr2 As New mr2 + mr2.id = "id2" + mr2.field1 = "_aa" + mr2.field2 = 2 + mr1.mr2 = mr2 + Dim mr3 As New mr3 + mr3.id = "id3" + mr3.field1 = "zz" + mr3.field2 = 3 + mr2.mr3 = mr3 + mr1.Save() + mr2.field2 = 22 + mr2.Save() End Sub <Test()> Public Sub SummaryChainedClasses() @@ -103,5 +120,22 @@ Assert.AreEqual(1, c.TotalRows) End Sub + <Test()> Public Sub SummaryChainedClassesWithWhere() + Dim mr1 As New mr1 + Dim mr2 As New mr2 + Dim mr3 As New mr3 + Dim src As CMultiSummaryCriteria + src = New CMultiSummaryCriteria + src.addObjectToJoin(mr1, Nothing, "") + src.addObjectToJoin(mr2, mr1, "mr1tomr2") + src.addObjectToJoin(mr3, mr2, "mr2tomr3") + src.addSummaryField("field1", CMultiSummaryCriteria.SumMethod.Count) + src.WhereCondition.addSelectNotEqualTo("field1", "xxx") + c = src.perform + Assert.IsTrue(c.hasElements) + Assert.IsTrue(Not c.EOF) + Assert.AreEqual(1, c.TotalRows) + End Sub + End Class End Namespace \ No newline at end of file Index: SuperClassTests.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/SuperClassTests.vb,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- SuperClassTests.vb 6 Feb 2005 02:45:19 -0000 1.6 +++ SuperClassTests.vb 16 Mar 2005 11:34:12 -0000 1.7 @@ -72,7 +72,6 @@ 'save root (class A) root.Save(True) 'Now check that A, G and K are in the database - 'Console.WriteLine("\nIf you'll check the data in the tables,\nyou'll find that tblA is populated and tables tblG and tbl K are populated.\nBut tables tblE, tblC, tblH are not populated at all.\n"); pbroker.ClearCache() Dim col As CPersistentCollection @@ -113,7 +112,6 @@ 'save root (class A) root.Save(True) 'Now check that A, G and K are in the database - 'Console.WriteLine("\nIf you'll check the data in the tables,\nyou'll find that tblA is populated and tables tblG and tbl K are populated.\nBut tables tblE, tblC, tblH are not populated at all.\n"); pbroker.ClearCache() Dim col As CPersistentCollection Dim cpo As CPersistentObject = New A |
