[Jcframework-commits] Nunit/InheritedClasses ManyToManyClasses_v2.vb,1.1,1.2 TableA_B.vb,1.5,1.6 tblAtoKClasses.vb,1.5,1.6 ManyToManyClasses.vb,1.1,NONE ManyToManyTests.vb,1.2,NONE

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

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

Modified Files:
	ManyToManyClasses_v2.vb TableA_B.vb tblAtoKClasses.vb 
Removed Files:
	ManyToManyClasses.vb ManyToManyTests.vb 
Log Message:
Update unit tests for many-to-many and remove old unit tests for previous method of
 doing N:M associations.

Index: tblAtoKClasses.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/tblAtoKClasses.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tblAtoKClasses.vb	2 Jan 2005 09:41:10 -0000	1.5
+++ tblAtoKClasses.vb	14 Feb 2005 02:24:12 -0000	1.6
@@ -9,11 +9,10 @@
 
 		Public _c As C
 		Public _cOID As String
-		Public _bCol As CPersistentCollection
+		Public WithEvents _bCol As CPersistentCollection
 
 		Public Sub New()
 			_bCol = New CPersistentCollection
-			_bCol.ContainerObject = Me
 			Me.SetDirtyFlag()
 		End Sub
 
@@ -106,6 +105,10 @@
 		Public Overrides Function IsValid() As Boolean
 			Return True
 		End Function
+
+		Private Sub _bCol_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles _bCol.ListChanged
+			Me.SetDirtyFlag()
+		End Sub
 	End Class
 
 	Public Class B
@@ -113,7 +116,6 @@
 
 		Public Sub New()
 			_nCol = New CPersistentCollection
-			_nCol.ContainerObject = Me
 			Me.SetDirtyFlag()
 		End Sub
 
@@ -121,7 +123,7 @@
 		Public _text As String = String.Empty
 		Public _a As A = Nothing
 		Public _aOID As String = Nothing
-		Public _nCol As CPersistentCollection
+		Public WithEvents _nCol As CPersistentCollection
 
 		Public Property Id() As Integer
 			Get
@@ -211,6 +213,10 @@
 		Public Overloads Overrides Function IsValid() As Boolean
 			Return True
 		End Function
+
+		Private Sub _nCol_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles _nCol.ListChanged
+			Me.SetDirtyFlag()
+		End Sub
 	End Class
 
 	Public Class C
@@ -226,8 +232,8 @@
 				Return Me._id
 			End Get
 			Set(ByVal Value As Integer)
-				If Not (Me._id = value) Then
-					Me._id = value
+				If Not (Me._id = Value) Then
+					Me._id = Value
 					Me.SetDirtyFlag()
 				End If
 			End Set
@@ -238,8 +244,8 @@
 				Return Me._text
 			End Get
 			Set(ByVal Value As String)
-				If Not (Me._text = value) Then
-					Me._text = value
+				If Not (Me._text = Value) Then
+					Me._text = Value
 					Me.SetDirtyFlag()
 				End If
 			End Set

--- ManyToManyClasses.vb DELETED ---

Index: TableA_B.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/TableA_B.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TableA_B.vb	6 Feb 2005 02:45:19 -0000	1.5
+++ TableA_B.vb	14 Feb 2005 02:24:12 -0000	1.6
@@ -58,19 +58,14 @@
 			Me.SetDirtyFlag()
 		End Sub
 
-    Public Sub New()
-      _tableBCol.ContainerObject = Me
-      _tableCCol.ContainerObject = Me
-    End Sub
-
-    Private Sub _tableBCol_ObjectAdded(ByVal index As Integer, ByRef value As Object) Handles _tableBCol.ObjectAdded
-      Me.SetDirtyFlag()
-    End Sub
+		Private Sub _tableBCol_ObjectAdded(ByVal index As Integer, ByRef value As Object) Handles _tableBCol.ObjectAdded
+			Me.SetDirtyFlag()
+		End Sub
 
-    Private Sub _tableBCol_ObjectRemoved(ByVal index As Integer, ByRef value As Object) Handles _tableBCol.ObjectRemoved
-      Me.SetDirtyFlag()
-    End Sub
-  End Class
+		Private Sub _tableBCol_ObjectRemoved(ByVal index As Integer, ByRef value As Object) Handles _tableBCol.ObjectRemoved
+			Me.SetDirtyFlag()
+		End Sub
+	End Class
 
   Public Class TableB
     Inherits CPersistentObject

--- ManyToManyTests.vb DELETED ---

Index: ManyToManyClasses_v2.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/ManyToManyClasses_v2.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ManyToManyClasses_v2.vb	9 Feb 2005 06:20:50 -0000	1.1
+++ ManyToManyClasses_v2.vb	14 Feb 2005 02:24:12 -0000	1.2
@@ -6,7 +6,7 @@
 		Inherits CPersistentObject
 
 		Private _description As String
-		Private _bCol As M2MBCollection
+		Private WithEvents _bCol As M2MBCollection
 
 		Public Property Description() As String
 			Get
@@ -37,9 +37,11 @@
 
 		Public Sub New()
 			_bCol = New M2MBCollection
-			_bCol.ContainerObject = Me
 		End Sub
 
+		Private Sub _bCol_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles _bCol.ListChanged
+			Me.SetDirtyFlag()
+		End Sub
 	End Class
 #End Region