[Jcframework-commits] dotnet/Nunit/StandardClasses NonInheritedTests.vb,1.1,1.2

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

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

Modified Files:
	NonInheritedTests.vb 
Log Message:
Only copy one-to-many collections if the association is retrieveAutomatic.
More changes related to naming

Index: NonInheritedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/Nunit/StandardClasses/NonInheritedTests.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NonInheritedTests.vb	11 Apr 2005 00:31:49 -0000	1.1
+++ NonInheritedTests.vb	11 Apr 2005 23:27:08 -0000	1.2
@@ -54,7 +54,7 @@
 			Assert.AreEqual("basic", job.Description)
 		End Sub
 
-		<Test(), ExpectedException(GetType(System.Exception))> Public Sub CheckForError()
+		<Test(), ExpectedException(GetType(AtomsFrameworkException))> Public Sub CheckForError()
 			pbroker.GetObject(job)
 		End Sub
 
@@ -62,9 +62,9 @@
 			job.Id = "a2"
 			pbroker.GetObject(job)
 			job.Description = "SomeJob"
-			Assert.IsTrue(pbroker.getInjectedObject(job).IsDirty)
+			Assert.IsTrue(pbroker.GetInjectedObject(job).IsDirty)
 			pbroker.PersistChanges(job)
-			Assert.IsFalse(pbroker.getInjectedObject(job).IsDirty)
+			Assert.IsFalse(pbroker.GetInjectedObject(job).IsDirty)
 		End Sub
 
 		<Test()> Public Sub DeleteAJob()
@@ -103,15 +103,15 @@
 			pbroker.GetObject(job2)
 			job.Description = "c"
 			job2.Description = "d"
-			Assert.IsFalse(pbroker.getInjectedObject(job).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(job).Persistent)
 			pbroker.PersistChanges()
-			Assert.IsTrue(pbroker.getInjectedObject(job).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(job).Persistent)
 		End Sub
 
 		<Test()> Public Sub LoadEmployee_a()
 			emp.Name = "a"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Workers.Count, 0)
 			Assert.IsTrue(Not emp.ReportsTo Is Nothing)
 			Assert.AreEqual(emp.ReportsTo.Name, "c")
@@ -124,7 +124,7 @@
 		<Test()> Public Sub LoadEmployee_ac()
 			emp.Name = "ac"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Workers.Count, 3)
 			emp = CType(emp.Workers.Item(1), NPEmployee)
 			Assert.AreEqual(emp.Name, "aa")
@@ -134,8 +134,8 @@
 		<Test()> Public Sub CheckSchemaBasedProperties()
 			emp.Name = "ac"
 			pbroker.FindObject(emp)
-			Assert.AreEqual(50, pbroker.getInjectedObject(emp).getFieldLengthByName("Name"))
-			Assert.IsTrue(pbroker.getInjectedObject(emp).getFieldTypeByName("Name") Is GetType([String]))
+			Assert.AreEqual(50, pbroker.GetInjectedObject(emp).GetFieldLengthByName("Name"))
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).GetFieldTypeByName("Name") Is GetType([String]))
 		End Sub
 
 		<Test()> Public Sub PersistentObjectEquality()
@@ -152,49 +152,49 @@
 		<Test()> Public Sub LoadSaveandDeleteEmployee()
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.IsTrue(emp.ReportsTo Is Nothing)
 			Debug.WriteLine(pbroker.DumpCacheDetails)
 			emp = New NPEmployee
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Name, "new")
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
 			emp = New NPEmployee
 			emp.Name = "new"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 		End Sub
 
 		<Test()> Public Sub ChangeFindFieldValue()
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.IsTrue(emp.ReportsTo Is Nothing)
 			emp = New NPEmployee
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			Assert.AreEqual(emp.Name, "SaveThenChange")
 			emp.Name = "Changed"
 			pbroker.PersistChanges(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent)
 			pbroker.MarkForDeletion(emp)
 			pbroker.PersistChanges(emp)
 			emp = New NPEmployee
 			emp.Name = "Changed"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 			emp = New NPEmployee
 			emp.Name = "SaveThenChange"
 			pbroker.FindObject(emp)
-			Assert.IsFalse(pbroker.getInjectedObject(emp).Persistent)
+			Assert.IsFalse(pbroker.GetInjectedObject(emp).Persistent)
 		End Sub
 
 		<Test()> Public Sub saveHierarchy()
@@ -240,12 +240,12 @@
 			emp = New NPEmployee
 			emp.Name = "AManager"
 			pbroker.FindObject(emp)
-			Assert.IsTrue(pbroker.getInjectedObject(emp).Persistent, "AManager was deleted")
+			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")
+			Assert.IsTrue(pbroker.GetInjectedObject(emp).Persistent, "AWorker was deleted")
 		End Sub
 
 		<Test()> Public Sub LazyLoadEmployees()