[Jcframework-commits] Nunit/StandardClasses NonInheritedTests.vb,1.5,1.6

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

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

Modified Files:
	NonInheritedTests.vb 
Log Message:
New unit tests for many-to-many associations for non-inherited objects.
Changed a few unit tests to work under new restrictrions for injected (tracked) objects.

Index: NonInheritedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/StandardClasses/NonInheritedTests.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NonInheritedTests.vb	21 Dec 2004 22:00:02 -0000	1.5
+++ NonInheritedTests.vb	28 Feb 2005 23:05:49 -0000	1.6
@@ -1,4 +1,4 @@
-Imports AToMSFramework
+Imports Atoms.Framework
 Imports NUnit.Framework
 
 Namespace StandardClasses
@@ -51,9 +51,13 @@
 			Assert.AreEqual("basic", job.Description)
 		End Sub
 
-		<Test()> Public Sub SaveJob_a2()
+		<Test(), ExpectedException(GetType(System.Exception))> Public Sub CheckForError()
 			pbroker.StartTracking(job)
+		End Sub
+
+		<Test()> Public Sub SaveJob_a2()
 			job.Id = "a2"
+			pbroker.StartTracking(job)
 			job.Description = "SomeJob"
 			Assert.IsTrue(pbroker.getInjectedObject(job).IsDirty)
 			pbroker.PersistChanges(job)
@@ -61,25 +65,28 @@
 		End Sub
 
 		<Test()> Public Sub DeleteAJob()
-			pbroker.StartTracking(job)
 			job.Id = "a3"
+			pbroker.StartTracking(job)
 			job.Description = "SomeJob3"
 			pbroker.PersistChanges(job)
 			pbroker.MarkForDeletion(job)
 			pbroker.PersistChanges(job)
 			Assert.IsFalse(pbroker.ObjectIsTracked(job))
-			Assert.IsNull(pbroker.getInjectedObject(job))
 		End Sub
 
 		<Test()> Public Sub CheckInjectionCache()
 			Dim job2 As New NPJob
-			pbroker.StartTracking(job)
-			pbroker.StartTracking(job2)
-			Assert.IsTrue(pbroker.ObjectIsTracked(job))
+			Try
+				pbroker.StartTracking(job)
+			Catch
+			End Try
+			Assert.IsFalse(pbroker.ObjectIsTracked(job))
 			job.Id = "1"
+			pbroker.StartTracking(job)
 			job.Description = "a"
 			Assert.IsTrue(pbroker.ObjectIsTracked(job))
 			job2.Id = "2"
+			pbroker.StartTracking(job2)
 			job2.Description = "b"
 			pbroker.PersistChanges(job)
 			pbroker.PersistChanges(job2)
@@ -154,7 +161,6 @@
 			Assert.AreEqual(emp.Name, "new")
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
-			Assert.IsNull(pbroker.getInjectedObject(emp))
 			emp = New NPEmployee
 			emp.Name = "new"
 			pbroker.FindObject(emp)
@@ -178,7 +184,6 @@
 			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
-			Assert.IsNull(pbroker.getInjectedObject(emp))
 			emp = New NPEmployee
 			emp.Name = "Changed"
 			pbroker.FindObject(emp)
@@ -192,8 +197,8 @@
 		<Test()> Public Sub saveHierarchy()
 			Dim emp2 As New NPEmployee
 			Dim emp3 As New NPEmployee
-			pbroker.StartTracking(emp)
 			emp.Name = "theBoss"
+			pbroker.StartTracking(emp)
 			emp2.Name = "middleMgr"
 			emp3.Name = "slave"
 			emp.Workers.Add(emp2)