[Jcframework-commits] Nunit/Interfaces EmployeeInterfaceTests.vb,1.1,1.2 IEmployee.vb,1.1,1.2

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

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

Modified Files:
	EmployeeInterfaceTests.vb IEmployee.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: EmployeeInterfaceTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/Interfaces/EmployeeInterfaceTests.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EmployeeInterfaceTests.vb	19 Oct 2004 00:13:38 -0000	1.1
+++ EmployeeInterfaceTests.vb	25 Oct 2004 07:14:15 -0000	1.2
@@ -43,9 +43,8 @@
 			Assert.IsTrue(Not emp.ReportsTo Is Nothing)
 			Assert.AreEqual(emp.ReportsTo.Name, "c")
 			Dim emp2 As IEmployee
-			emp2 = emp.ReportsTo.Workers(0)
+			emp2 = CType(emp.ReportsTo.Workers(0), IEmployee)
 			Assert.AreEqual(emp2.Name, emp.Name)
-			Assert.AreEqual(emp2.OIDValue, emp.OIDValue)
 			Assert.AreSame(emp2, emp)
 		End Sub
 
@@ -54,7 +53,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), IEmployee)
 			Assert.AreEqual(emp.Name, "aa")
 			Assert.AreEqual(emp.ReportsTo.Name, "ac")
 		End Sub

Index: IEmployee.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/Interfaces/IEmployee.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- IEmployee.vb	19 Oct 2004 00:13:38 -0000	1.1
+++ IEmployee.vb	25 Oct 2004 07:14:15 -0000	1.2
@@ -1,42 +1,23 @@
 Namespace Interfaces
 
 	Public Interface IEmployee
-		Property OIDValue() As String
 		Property Name() As String
 		Property ReportsTo() As IEmployee
-		Property ReportsToOID() As String
+		Property ReportsToName() As String
 		Property Workers() As ArrayList
 		Property Team() As InheritedClasses.CTeam
-		Property TeamOID() As String
+		Property TeamName() As String
 	End Interface
 
 	Public Class EmployeeClass
 		Implements IEmployee
 
 		Private m_name As String
-		Private m_parentoid As String
+		Private m_parentName As String
 		Private m_parent As IEmployee
 		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 Implements IEmployee.OIDValue
-			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_teamName As String
 
 		Public Property Name() As String Implements IEmployee.Name
 			Get
@@ -54,21 +35,21 @@
 			Set(ByVal Value As IEmployee)
 				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 Implements IEmployee.ReportsToOID
+		Public Property ReportsToName() As String Implements IEmployee.ReportsToName
 			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
 
@@ -88,21 +69,21 @@
 			Set(ByVal Value As InheritedClasses.CTeam)
 				If Not Value Is Nothing Then
 					m_team = Value
-					m_teamoid = Value.OIDValue
+					m_teamName = Value.OIDValue
 				End If
 			End Set
 		End Property
 
-		Public Property TeamOID() As String Implements IEmployee.TeamOID
+		Public Property TeamName() As String Implements IEmployee.TeamName
 			Get
 				If m_team Is Nothing Then
-					Return m_teamoid
+					Return m_teamName
 				Else
 					Return (m_team.OIDValue)
 				End If
 			End Get
 			Set(ByVal Value As String)
-				m_teamoid = Value
+				m_teamName = Value
 			End Set
 		End Property