[Jcframework-commits] Nunit AtomsFramework.xml,1.14,1.15 original db1.mdb,1.11,1.12

[Dan M. <dan...@us...>]

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

Modified Files:
	AtomsFramework.xml original db1.mdb 
Log Message:
Add test to check if multiple retrive creteria of oneToMany collections does not duplicate records.
Fix the problem in retriveAssociation() in CPersistentBroker.vb.
Checks whether the object exist in the collection before adding it.

Index: original db1.mdb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/original db1.mdb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
Binary files /tmp/cvsl4QWVc and /tmp/cvsJ9scnq differ

Index: AtomsFramework.xml
===================================================================
RCS file: /cvsroot/jcframework/Nunit/AtomsFramework.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- AtomsFramework.xml	21 Dec 2004 08:52:44 -0000	1.14
+++ AtomsFramework.xml	2 Jan 2005 09:41:09 -0000	1.15
@@ -118,13 +118,14 @@
 	<attribute name="Id" column="id" key="primary"/>
 	<attribute name="field1" column="field1" />
 	<attribute name="AId" column="a_id" />
-	<attrbute name="TableA" />
+	<attribute name="TableA" />
+	<attribute name="TableDCollection" />
 </class>
 <class name="TableC" table="TableC" database="MSA" namespace="NunitTests.InheritedClasses">
 	<attribute name="Id" column="id" key="primary"/>
 	<attribute name="field1" column="field1" />
 	<attribute name="AId" column="a_id" />
-	<attrbute name="TableA" />
+	<attribute name="TableA" />
 </class>
 <association fromClass="NunitTests.InheritedClasses.TableA" toClass="NunitTests.InheritedClasses.TableB" target="TableBCollection" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="true" inverse="false" name="AtoB">
@@ -139,6 +140,7 @@
 		<attribute name="OIDValue" column="oid" key="primary"/>
 		<attribute name="CreatedDate" column="CreatedDate" timestamp="true"/>
 		<attribute name="ModifiedDate" column="ModifiedDate" timestamp="true"/>
+		<attribute name="Id" column="id" find="true"/>
 		<attribute name="BCol" />
 		<attribute name="C" />
 		<attribute name="COID" column="cOID"/>
@@ -151,6 +153,7 @@
 		<attribute name="Text" column="textCol"/>
 		<attribute name="A" />
 		<attribute name="AOID" column="aOID"/>
+		<attribute name="NCol" />
 	</class>
 	<class name="C" table="tblC" database="MSA" namespace="NunitTests.InheritedClasses">
 		<attribute name="OIDValue" column="oid" key="primary"/>
@@ -219,11 +222,19 @@
 		<attribute name="M"/>
 		<attribute name="MOID" column="mOID"/>
 	</class>
-	<class name="M" table="tblK" database="MSA" namespace="NunitTests.InheritedClasses">
+	<class name="M" table="tblM" database="MSA" namespace="NunitTests.InheritedClasses">
+		<attribute name="OIDValue" column="oid" key="primary" reference="OIDValue"/>
+		<attribute name="CreatedDate" column="CreatedDate" timestamp="true"/>
+		<attribute name="ModifiedDate" column="ModifiedDate" timestamp="true"/>
+		<attribute name="I" column="i"/>
+	</class>
+	<class name="N" table="tblN" database="MSA" namespace="NunitTests.InheritedClasses">
 		<attribute name="OIDValue" column="oid" key="primary" reference="OIDValue"/>
 		<attribute name="CreatedDate" column="CreatedDate" timestamp="true"/>
 		<attribute name="ModifiedDate" column="ModifiedDate" timestamp="true"/>
 		<attribute name="I" column="i"/>
+		<attribute name="B" />
+		<attribute name="BOID" column="bOID"/>
 	</class>
 	<association fromClass="NunitTests.InheritedClasses.A"
 		toClass="NunitTests.InheritedClasses.B"
@@ -275,7 +286,27 @@
 		inverse="false">
 		<entry fromAttribute="COID" toAttribute="OIDValue"/>
 	</association>
-
+	<association fromClass="NunitTests.InheritedClasses.B"
+		toClass="NunitTests.InheritedClasses.N"
+		cardinality="oneToMany"
+		target="NCol"
+		retrieveAutomatic="true"
+		deleteAutomatic="true"
+		saveAutomatic="true"
+		inverse="false">
+		<entry fromAttribute="OIDValue" toAttribute="BOID"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.N"
+		toClass="NunitTests.InheritedClasses.B"
+		cardinality="oneToOne"
+		target="B"
+		retrieveAutomatic="true"
+		deleteAutomatic="false"
+		saveAutomatic="false"
+		inverse="false">
+		<entry fromAttribute="BOID" toAttribute="OIDValue"/>
+	</association>
+	
 	<class name="ManyToManyA" table="ManyToManyA" database="MSA" namespace="NunitTests.InheritedClasses">
 		<attribute name="GUIDValue" column="GuidValue" key="primary"/>
 		<attribute name="Description" column="description" />