Menu
▾
▴
[Jcframework-commits] Nunit/StandardClasses NPEmployee.vb,1.1,1.2 NPJob.vb,1.1,1.2 NPTeam.vb,1.1,1.2 NonInheritedTests.vb,1.2,1.3
|
From: Richard B. <rb...@us...> - 2004-10-25 07:14:24
|
Update of /cvsroot/jcframework/Nunit/StandardClasses In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27457/StandardClasses Modified Files: NPEmployee.vb NPJob.vb NPTeam.vb NonInheritedTests.vb Log Message: Fix for cache problems when changing key values of objects that don't inherit from CPersistentObject Also fixed problem where many-to-many associations tried to save associationclass multiple times. Index: NPEmployee.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NPEmployee.vb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NPEmployee.vb 19 Oct 2004 00:13:38 -0000 1.1 +++ NPEmployee.vb 25 Oct 2004 07:14:15 -0000 1.2 @@ -3,29 +3,11 @@ Public Class NPEmployee Private m_name As String - Private m_parentoid As String + Private m_parentname As String Private m_parent As NPEmployee Private m_children As ArrayList - Private m_team As InheritedClasses.CTeam - Private m_teamoid As String - Private m_oid As AToMSFramework.COID - - Public Property OIDValue() As String - Get - Dim oidfactory As AToMSFramework.COIDFactory - If m_oid Is Nothing Then - oidfactory = AToMSFramework.modOIDFactorySingleton.getOIDFactoryInstance() - m_oid = oidfactory.newOID - End If - OIDValue = m_oid.OID - End Get - Set(ByVal value As String) - If m_oid Is Nothing Then - m_oid = New AToMSFramework.COID - End If - m_oid.OID = value - End Set - End Property + Private m_team As NPTeam + Private m_teamname As String Public Property Name() As String Get @@ -43,21 +25,21 @@ Set(ByVal Value As NPEmployee) If Not Value Is Nothing Then m_parent = Value - m_parentoid = Value.OIDValue + m_parentname = Value.Name End If End Set End Property - Public Property ReportsToOID() As String + Public Property ReportsToName() As String Get If m_parent Is Nothing Then - Return m_parentoid + Return m_parentname Else - Return (m_parent.OIDValue) + Return (m_parent.Name) End If End Get Set(ByVal Value As String) - m_parentoid = Value + m_parentname = Value End Set End Property @@ -70,28 +52,28 @@ End Set End Property - Public Property Team() As InheritedClasses.CTeam + Public Property Team() As NPTeam Get Return m_team End Get - Set(ByVal Value As InheritedClasses.CTeam) + Set(ByVal Value As NPTeam) If Not Value Is Nothing Then m_team = Value - m_teamoid = Value.OIDValue + m_teamname = Value.Name End If End Set End Property - Public Property TeamOID() As String + Public Property TeamName() As String Get If m_team Is Nothing Then - Return m_teamoid + Return m_teamname Else - Return (m_team.OIDValue) + Return (m_team.Name) End If End Get Set(ByVal Value As String) - m_teamoid = Value + m_teamname = Value End Set End Property Index: NPJob.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NPJob.vb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NPJob.vb 19 Oct 2004 00:13:38 -0000 1.1 +++ NPJob.vb 25 Oct 2004 07:14:15 -0000 1.2 @@ -23,27 +23,4 @@ End Class - Public Class NPJobWithOIDValue - Inherits NPJob - - Private m_oid As AToMSFramework.COID - - Public Property OIDValue() As String - Get - Dim oidfactory As AToMSFramework.COIDFactory - If m_oid Is Nothing Then - oidfactory = AToMSFramework.modOIDFactorySingleton.getOIDFactoryInstance() - m_oid = oidfactory.newOID - End If - OIDValue = m_oid.OID - End Get - Set(ByVal value As String) - If m_oid Is Nothing Then - m_oid = New AToMSFramework.COID - End If - m_oid.OID = value - End Set - End Property - - End Class End Namespace \ No newline at end of file Index: NPTeam.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NPTeam.vb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NPTeam.vb 19 Oct 2004 00:13:38 -0000 1.1 +++ NPTeam.vb 25 Oct 2004 07:14:15 -0000 1.2 @@ -2,29 +2,11 @@ Public Class NPTeam Private m_leader As NPEmployee - Private m_leaderoid As String + Private m_leadername As String Private m_name As String - Private m_job As NPJobWithOIDValue - Private m_joboid As String + Private m_job As NPJob + Private m_jobId As String Private m_members As ArrayList - Private m_oid As AToMSFramework.COID - - Public Property OIDValue() As String - Get - Dim oidfactory As AToMSFramework.COIDFactory - If m_oid Is Nothing Then - oidfactory = AToMSFramework.modOIDFactorySingleton.getOIDFactoryInstance() - m_oid = oidfactory.newOID - End If - OIDValue = m_oid.OID - End Get - Set(ByVal value As String) - If m_oid Is Nothing Then - m_oid = New AToMSFramework.COID - End If - m_oid.OID = value - End Set - End Property Public Property TeamLeader() As NPEmployee Get @@ -32,43 +14,43 @@ End Get Set(ByVal Value As NPEmployee) m_leader = Value - m_leaderoid = Value.OIDValue + m_leadername = Value.Name End Set End Property - Public Property TeamLeaderOID() As String + Public Property TeamLeaderName() As String Get If m_leader Is Nothing Then - Return m_leaderoid + Return m_leadername Else - Return (m_leader.OIDValue) + Return (m_leader.Name) End If End Get Set(ByVal Value As String) - m_leaderoid = Value + m_leadername = Value End Set End Property - Public Property Job() As NPJobWithOIDValue + Public Property Job() As NPJob Get Return m_job End Get - Set(ByVal Value As NPJobWithOIDValue) + Set(ByVal Value As NPJob) m_job = Value - m_joboid = Value.OIDValue + m_jobId = Value.Id End Set End Property - Public Property jobOID() As String + Public Property jobId() As String Get If m_job Is Nothing Then - Return m_joboid + Return m_jobId Else - Return (m_job.OIDValue) + Return (m_job.Id) End If End Get Set(ByVal Value As String) - m_joboid = Value + m_jobId = Value End Set End Property Index: NonInheritedTests.vb =================================================================== RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedTests.vb,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NonInheritedTests.vb 21 Oct 2004 23:36:46 -0000 1.2 +++ NonInheritedTests.vb 25 Oct 2004 07:14:15 -0000 1.3 @@ -39,20 +39,18 @@ <Test()> Public Sub LoadJob_a1() job.Id = "a1" - pbroker.GetObject(job) + pbroker.GetObject(CType(job, NPJob)) Assert.IsTrue(pbroker.getInjectedObject(job).Persistent) Assert.AreEqual("basic", job.Description) End Sub <Test()> Public Sub FindJob_basic() - Dim job As New NPJobWithOIDValue + Dim job As New NPJob job.Description = "basic" - pbroker.FindObject(job) - Assert.AreEqual("000000160002", job.OIDValue) + pbroker.FindObject(CType(job, NPJob)) Assert.AreEqual("basic", job.Description) End Sub - <Test()> Public Sub SaveJob_a2() pbroker.StartTracking(job) job.Id = "a2" @@ -108,9 +106,8 @@ Assert.IsTrue(Not emp.ReportsTo Is Nothing) Assert.AreEqual(emp.ReportsTo.Name, "c") Dim emp2 As NPEmployee - emp2 = emp.ReportsTo.Workers(0) + emp2 = CType(emp.ReportsTo.Workers(0), NPEmployee) Assert.AreEqual(emp2.Name, emp.Name) - Assert.AreEqual(emp2.OIDValue, emp.OIDValue) Assert.AreSame(emp2, emp) End Sub @@ -119,7 +116,7 @@ pbroker.FindObject(emp) Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent) Assert.AreEqual(emp.Workers.Count, 3) - emp = emp.Workers.Item(1) + emp = CType(emp.Workers.Item(1), NPEmployee) Assert.AreEqual(emp.Name, "aa") Assert.AreEqual(emp.ReportsTo.Name, "ac") End Sub @@ -143,11 +140,9 @@ End Sub <Test()> Public Sub LoadSaveandDeleteEmployee() - Dim oidvalue As String emp.Name = "new" pbroker.FindObject(emp) Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent) - oidvalue = emp.OIDValue pbroker.PersistChanges(emp) Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent) Assert.IsTrue(emp.ReportsTo Is Nothing) @@ -156,7 +151,6 @@ emp.Name = "new" pbroker.FindObject(emp) Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent) - Assert.AreEqual(emp.OIDValue, oidvalue) Assert.AreEqual(emp.Name, "new") pbroker.MarkForDeletion(emp) pbroker.PersistChanges(emp) @@ -165,15 +159,12 @@ emp.Name = "new" pbroker.FindObject(emp) Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent) - Assert.IsTrue(emp.OIDValue <> oidvalue) End Sub <Test()> Public Sub ChangeFindFieldValue() - Dim oidvalue As String emp.Name = "SaveThenChange" pbroker.FindObject(emp) Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent) - oidvalue = emp.OIDValue pbroker.PersistChanges(emp) Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent) Assert.IsTrue(emp.ReportsTo Is Nothing) @@ -181,7 +172,6 @@ emp.Name = "SaveThenChange" pbroker.FindObject(emp) Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent) - Assert.AreEqual(emp.OIDValue, oidvalue) Assert.AreEqual(emp.Name, "SaveThenChange") emp.Name = "Changed" pbroker.PersistChanges(emp) @@ -217,7 +207,7 @@ pbroker.FindObject(emp) Assert.AreEqual("middleMgr", emp.ReportsTo.Name) Assert.AreEqual("theBoss", emp.ReportsTo.ReportsTo.Name) - emp2 = emp.ReportsTo.Workers(0) + emp2 = CType(emp.ReportsTo.Workers(0), NPEmployee) Assert.AreEqual("slave", emp2.Name) End Sub |
