[Jcframework-commits] Nunit/InheritedClasses SuperClassTests.vb,1.1,1.2 tblAtoKClasses.vb,1.1,1.2

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

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

Modified Files:
	SuperClassTests.vb tblAtoKClasses.vb 
Log Message:
Fixed broken unit test for MultiInheritance

Index: tblAtoKClasses.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/tblAtoKClasses.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tblAtoKClasses.vb	20 Oct 2004 06:43:41 -0000	1.1
+++ tblAtoKClasses.vb	21 Dec 2004 00:10:31 -0000	1.2
@@ -43,11 +43,13 @@
 
 		Public Property C() As C
 			Get
-				If _c Is Nothing Then
-					_c = New C
-					_c.OIDValue = _cOID
-					_c.Retrieve()
-				End If
+				'Retrieving manually when we have an association set to autoretrieve can produce
+				'unpredictable results.
+				'If _c Is Nothing AndAlso _cOID <> String.Empty Then
+				'	_c = New C
+				'	_c.OIDValue = _cOID
+				'	_c.Retrieve()
+				'End If
 				Return _c
 			End Get
 			Set(ByVal Value As C)

Index: SuperClassTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/SuperClassTests.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SuperClassTests.vb	20 Oct 2004 06:43:41 -0000	1.1
+++ SuperClassTests.vb	21 Dec 2004 00:10:31 -0000	1.2
@@ -62,6 +62,7 @@
 			'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
 			col = cpo.getAll(True)