[Jcframework-commits] Nunit NPJob.vb,NONE,1.1 NonInheritedTests.vb,NONE,1.1 AtomsFramework.xml,1.2,1.3 Nunit_AtomsFramework.vbproj,1.3,1.4 original db1.mdb,1.2,1.3

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

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

Modified Files:
	AtomsFramework.xml Nunit_AtomsFramework.vbproj 
	original db1.mdb 
Added Files:
	NPJob.vb NonInheritedTests.vb 
Log Message:
Tests for persistence of objects that don't inherit from CPersistentObject

Index: Nunit_AtomsFramework.vbproj
===================================================================
RCS file: /cvsroot/jcframework/Nunit/Nunit_AtomsFramework.vbproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Nunit_AtomsFramework.vbproj	28 Sep 2004 07:32:24 -0000	1.3
+++ Nunit_AtomsFramework.vbproj	14 Oct 2004 05:23:48 -0000	1.4
@@ -140,6 +140,16 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "NonInheritedTests.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "NPJob.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "RetrieveCriteriaTests.vb"
                     SubType = "Code"
                     BuildAction = "Compile"

--- NEW FILE: NPJob.vb ---

Public Class NPJob
	Private m_id As String
	Private m_description As String

	Public Property Id() As String
		Get
			Return m_id
		End Get
		Set(ByVal Value As String)
			m_id = Value
		End Set
	End Property

	Public Property Description() As String
		Get
			Return m_description
		End Get
		Set(ByVal Value As String)
			m_description = Value
		End Set
	End Property

End Class

Public Class NPJobWithOIDValue
	Inherits NPJob

	Private m_oid As AToMSFramework.COID

	Public Property OIDValue() As String
		Get
			Dim oidfactory As AToMSFramework.COIDFactory
			If m_oid Is Nothing Then
				oidfactory = AToMSFramework.modoidfactorysingleton.getOIDFactoryInstance()
				m_oid = oidfactory.newOID
			End If
			OIDValue = m_oid.OID
		End Get
		Set(ByVal value As String)
			If m_oid Is Nothing Then
				m_oid = New AToMSFramework.COID
			End If
			m_oid.OID = value
		End Set
	End Property

End Class
Index: original db1.mdb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/original db1.mdb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs8HdDBl and /tmp/cvsj1kVDv differ

Index: AtomsFramework.xml
===================================================================
RCS file: /cvsroot/jcframework/Nunit/AtomsFramework.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AtomsFramework.xml	28 Sep 2004 07:32:24 -0000	1.2
+++ AtomsFramework.xml	14 Oct 2004 05:23:48 -0000	1.3
@@ -16,4 +16,14 @@
 <class name="SharedChild" table="SharedClasses" superclass="SharedParent" database="MSA" sharedtablefield="IType" sharedtablevalue="PLN">
 </class>
 
+<class name="NPJob" table="NPJobs" database="MSA">
+  <attribute name="Id" column="id" key="primary"/>
+  <attribute name="Description" column="description"/>
+</class>
+
+<class name="NPJobWithOIDValue" table="jobs" database="MSA">
+  <attribute name="OIDValue" column="oidvalue" key="primary"/>
+  <attribute name="Description" column="description" find="true"/>
+</class>
+
 </map>
\ No newline at end of file

--- NEW FILE: NonInheritedTests.vb ---
Imports AToMSFramework
Imports NUnit.Framework

<TestFixture()> Public Class NonInheritedTests

	Private pbroker As CPersistenceBroker
	Private job As NPJob

	<TestFixtureSetUp()> Public Sub Init()
		Environment.CurrentDirectory = "C:\Projects\MMM\Nunit_AtomsFramework"
		Try
			'Remove any existing test database
			System.IO.File.Delete(".\db1.mdb")
		Catch ex As Exception
		End Try
		System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
		pbroker = New CPersistenceBroker
		pbroker.init()
	End Sub

	<TestFixtureTearDown()> Public Sub Dispose()
		pbroker.Dispose()
		pbroker = Nothing
	End Sub

	<SetUp()> Public Sub TestInit()
		job = New NPJob
	End Sub

	<Test()> Public Sub LoadJob_a1()
		job.Id = "a1"
		pbroker.GetObject(job)
		Assert.AreEqual(cinjectedobject.state.loaded, pbroker.getcurrentstate(job))
		Assert.AreEqual("basic", job.Description)
	End Sub

	<Test()> Public Sub FindJob_basic()
		Dim job As New NPJobWithOIDValue
		job.Description = "basic"
		pbroker.FindObject(job)
		Assert.AreEqual("000000160002", job.OIDValue)
		Assert.AreEqual("basic", job.Description)
	End Sub


	<Test()> Public Sub SaveJob_a2()
		pbroker.StartTracking(job)
		job.Id = "a2"
		job.Description = "SomeJob"
		pbroker.PersistChanges(job)
	End Sub

	<Test()> Public Sub DeleteAJob()
		'pbroker.StartTracking(job)
		'job.Id = "a3"
		'job.Description = "SomeJob3"
		'pbroker.PersistChanges(job)
		'pbroker.MarkForDeletion(job)
		'pbroker.PersistChanges(job)
	End Sub
End Class