[Jcframework-commits] Nunit/StandardClasses LazyEmployee.vb,1.1,1.2 NPEmployee.vb,1.2,1.3 NonInheritedTests.vb,1.7,1.8

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

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

Modified Files:
	LazyEmployee.vb NPEmployee.vb NonInheritedTests.vb 
Log Message:
New unit tests.

Index: NPEmployee.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NPEmployee.vb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NPEmployee.vb	25 Oct 2004 07:14:15 -0000	1.2
+++ NPEmployee.vb	21 Mar 2005 08:06:15 -0000	1.3
@@ -40,6 +40,10 @@
 			End Get
 			Set(ByVal Value As String)
 				m_parentname = Value
+				'Clear the parent object if the name is cleared
+				If m_parentname = Nothing OrElse m_parentname = String.Empty Then
+					m_parent = Nothing
+				End If
 			End Set
 		End Property
 

Index: NonInheritedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedTests.vb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- NonInheritedTests.vb	1 Mar 2005 20:51:34 -0000	1.7
+++ NonInheritedTests.vb	21 Mar 2005 08:06:15 -0000	1.8
@@ -216,6 +216,35 @@
 			Assert.AreEqual("slave", emp2.Name)
 		End Sub
 
+		<Test()> Public Sub RemoveFromCollection()
+			Dim emp2 As New NPEmployee
+			Dim emp3 As New NPEmployee
+			emp.Name = "ABoss"
+			pbroker.StartTracking(emp)
+			emp2.Name = "AManager"
+			emp3.Name = "AWorker"
+			emp.Workers.Add(emp2)
+			emp2.ReportsTo = emp
+			emp2.Workers.Add(emp3)
+			emp3.ReportsTo = emp2
+			pbroker.PersistChanges(emp)
+			pbroker.ClearCache()
+			emp = New NPEmployee
+			emp.Name = "ABoss"
+			pbroker.FindObject(emp)
+			emp.Workers.Clear()			'Save auto is true so workers should be deleted
+			pbroker.PersistChanges(emp)
+			emp = New NPEmployee
+			emp.Name = "AManager"
+			pbroker.FindObject(emp)
+			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")
+		End Sub
+
 		<Test()> Public Sub LazyLoadEmployees()
 			Dim emp1 As New LazyEmployee
 			emp1.Name = "aa"

Index: LazyEmployee.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/LazyEmployee.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LazyEmployee.vb	31 Oct 2004 23:08:36 -0000	1.1
+++ LazyEmployee.vb	21 Mar 2005 08:06:15 -0000	1.2
@@ -38,6 +38,10 @@
 			End Get
 			Set(ByVal Value As String)
 				m_parentname = Value
+				'Clear the parent object if the name is cleared
+				If m_parentname = Nothing OrElse m_parentname = String.Empty Then
+					m_parent = Nothing
+				End If
 			End Set
 		End Property