[Jcframework-commits] Nunit/StandardClasses NonInheritedTests.vb,1.8,1.9

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

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

Modified Files:
	NonInheritedTests.vb 
Log Message:
Unit tests for caching and event listeners, and also for timestamps on interfaces.

Index: NonInheritedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedTests.vb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NonInheritedTests.vb	21 Mar 2005 08:06:15 -0000	1.8
+++ NonInheritedTests.vb	1 Apr 2005 00:00:11 -0000	1.9
@@ -39,25 +39,28 @@
 
 		<Test()> Public Sub LoadJob_a1()
 			job.Id = "a1"
-			pbroker.GetObject(CType(job, NPJob))
+			pbroker.GetObject(job)
 			Assert.IsTrue(pbroker.getInjectedObject(job).Persistent)
 			Assert.AreEqual("basic", job.Description)
 		End Sub
 
 		<Test()> Public Sub FindJob_basic()
+			pbroker.ClearCache()
 			Dim job As New NPJob
-			job.Description = "basic"
-			pbroker.FindObject(CType(job, NPJob))
+			'NPJob has no find attributes so we set the key id
+			job.Id = "a1"
+			pbroker.FindObject(job)
+			Assert.IsTrue(pbroker.getInjectedObject(job).Persistent)
 			Assert.AreEqual("basic", job.Description)
 		End Sub
 
 		<Test(), ExpectedException(GetType(System.Exception))> Public Sub CheckForError()
-			pbroker.StartTracking(job)
+			pbroker.GetObject(job)
 		End Sub
 
 		<Test()> Public Sub SaveJob_a2()
 			job.Id = "a2"
-			pbroker.StartTracking(job)
+			pbroker.GetObject(job)
 			job.Description = "SomeJob"
 			Assert.IsTrue(pbroker.getInjectedObject(job).IsDirty)
 			pbroker.PersistChanges(job)
@@ -66,7 +69,7 @@
 
 		<Test()> Public Sub DeleteAJob()
 			job.Id = "a3"
-			pbroker.StartTracking(job)
+			pbroker.GetObject(job)
 			job.Description = "SomeJob3"
 			pbroker.PersistChanges(job)
 			pbroker.MarkForDeletion(job)
@@ -77,16 +80,16 @@
 		<Test()> Public Sub CheckInjectionCache()
 			Dim job2 As New NPJob
 			Try
-				pbroker.StartTracking(job)
+				pbroker.GetObject(job)
 			Catch
 			End Try
 			Assert.IsFalse(pbroker.ObjectIsTracked(job))
 			job.Id = "1"
-			pbroker.StartTracking(job)
+			pbroker.GetObject(job)
 			job.Description = "a"
 			Assert.IsTrue(pbroker.ObjectIsTracked(job))
 			job2.Id = "2"
-			pbroker.StartTracking(job2)
+			pbroker.GetObject(job2)
 			job2.Description = "b"
 			pbroker.PersistChanges(job)
 			pbroker.PersistChanges(job2)
@@ -96,8 +99,8 @@
 			Dim job2 As New NPJob
 			job.Id = "3"
 			job2.Id = "4"
-			pbroker.StartTracking(job)
-			pbroker.StartTracking(job2)
+			pbroker.GetObject(job)
+			pbroker.GetObject(job2)
 			job.Description = "c"
 			job2.Description = "d"
 			Assert.IsFalse(pbroker.getInjectedObject(job).Persistent)
@@ -198,7 +201,7 @@
 			Dim emp2 As New NPEmployee
 			Dim emp3 As New NPEmployee
 			emp.Name = "theBoss"
-			pbroker.StartTracking(emp)
+			pbroker.GetObject(emp)
 			emp2.Name = "middleMgr"
 			emp3.Name = "slave"
 			emp.Workers.Add(emp2)
@@ -220,7 +223,7 @@
 			Dim emp2 As New NPEmployee
 			Dim emp3 As New NPEmployee
 			emp.Name = "ABoss"
-			pbroker.StartTracking(emp)
+			pbroker.GetObject(emp)
 			emp2.Name = "AManager"
 			emp3.Name = "AWorker"
 			emp.Workers.Add(emp2)