[Jcframework-commits] Nunit AtomsFramework.xml,1.7,1.8 Nunit_AtomsFramework.vbproj,1.9,1.10 original db1.mdb,1.5,1.6

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

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

Modified Files:
	AtomsFramework.xml Nunit_AtomsFramework.vbproj 
	original db1.mdb 
Log Message:
New tests for multiple inheritance, and multilevel subclassing

Index: Nunit_AtomsFramework.vbproj
===================================================================
RCS file: /cvsroot/jcframework/Nunit/Nunit_AtomsFramework.vbproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Nunit_AtomsFramework.vbproj	19 Oct 2004 03:30:41 -0000	1.9
+++ Nunit_AtomsFramework.vbproj	20 Oct 2004 06:43:40 -0000	1.10
@@ -160,11 +160,21 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "InheritedClasses\SuperClassTests.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "InheritedClasses\TableA_B.vb"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "InheritedClasses\tblAtoKClasses.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "Interfaces\EmployeeInterfaceTests.vb"
                     SubType = "Code"
                     BuildAction = "Compile"

Index: original db1.mdb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/original db1.mdb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvsW9HF5f and /tmp/cvszlZIJ6 differ

Index: AtomsFramework.xml
===================================================================
RCS file: /cvsroot/jcframework/Nunit/AtomsFramework.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AtomsFramework.xml	19 Oct 2004 03:30:41 -0000	1.7
+++ AtomsFramework.xml	20 Oct 2004 06:43:40 -0000	1.8
@@ -8,138 +8,233 @@
 	</database>
 
 <class name="SharedParent" table="SharedClasses" database="MSA" namespace="NunitTests.InheritedClasses">
-  <attribute name="OIDValue" column="oid" key="primary"/>
-  <attribute name="CreatedDate" column="created" timestamp="true"/>
-  <attribute name="ModifiedDate" column="modified" timestamp="true"/>
+	<attribute name="OIDValue" column="oid" key="primary"/>
+	<attribute name="CreatedDate" column="created" timestamp="true"/>
+	<attribute name="ModifiedDate" column="modified" timestamp="true"/>
 </class>
-
 <class name="SharedChild" table="SharedClasses" superclass="SharedParent" database="MSA" sharedtablefield="IType" sharedtablevalue="PLN"  namespace="NunitTests.InheritedClasses">
 </class>
 
 <class name="NPJob" table="NPJobs" database="MSA"  namespace="NunitTests.StandardClasses">
-  <attribute name="Id" column="id" key="primary"/>
-  <attribute name="Description" column="description"/>
+	<attribute name="Id" column="id" key="primary"/>
+	<attribute name="Description" column="description"/>
 </class>
-
 <class name="NPJobWithOIDValue" table="jobs" database="MSA" namespace="NunitTests.StandardClasses">
-  <attribute name="OIDValue" column="oidvalue" key="primary"/>
-  <attribute name="Description" column="description" find="true"/>
+	<attribute name="OIDValue" column="oidvalue" key="primary"/>
+	<attribute name="Description" column="description" find="true"/>
 </class>
-
-
 <class name="NPEmployee" table="employee" database="MSA" namespace="NunitTests.StandardClasses">
-  <attribute name="OIDValue" column="oid" key="primary"/>
-  <attribute name="Name" column="name" find="true"/>
-  <attribute name="ReportsToOID" column="parentoid" />
-  <attribute name="TeamOID" column="teamoid" />
-  <attribute name="Team" />
-  <attribute name="ReportsTo" />
-  <attribute name="Workers" />
+	<attribute name="OIDValue" column="oid" key="primary"/>
+	<attribute name="Name" column="name" find="true"/>
+	<attribute name="ReportsToOID" column="parentoid" />
+	<attribute name="TeamOID" column="teamoid" />
+	<attribute name="Team" />
+	<attribute name="ReportsTo" />
+	<attribute name="Workers" />
 </class>
-
- <association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="ReportsTo" cardinality="OneToOne"
+<class name="NPTeam" table="teams" database="MSA" namespace="NunitTests.StandardClasses">
+	<attribute name="OIDValue" column="oidvalue" key="primary"/>
+	<attribute name="Name" column="teamname" find="true"/>
+	<attribute name="TeamLeaderOID" column="teamleader" />
+	<attribute name="jobOID" column="joboidvalue" />
+	<attribute name="TeamLeader" />
+	<attribute name="Job" />
+</class>
+<association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="ReportsTo" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="ReportsToOID" toAttribute="OIDValue"/>
- </association>
-
- <association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="Workers" cardinality="OneToMany"
+</association>
+<association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="Workers" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="OIDValue" toAttribute="ReportsToOID"/>
- </association>
-
-<class name="NPTeam" table="teams" database="MSA" namespace="NunitTests.StandardClasses">
-  <attribute name="OIDValue" column="oidvalue" key="primary"/>
-  <attribute name="Name" column="teamname" find="true"/>
-  <attribute name="TeamLeaderOID" column="teamleader" />
-  <attribute name="jobOID" column="joboidvalue" />
-  <attribute name="TeamLeader" />
-  <attribute name="Job" />
-</class>
-
- <association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="TeamLeader" cardinality="OneToOne"
+</association>
+<association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="TeamLeader" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="TeamLeaderOID" toAttribute="OIDValue"/>
- </association>
-
- <association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPJobWithOIDValue" target="Job" cardinality="OneToOne"
+</association>
+<association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPJobWithOIDValue" target="Job" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="jobOID" toAttribute="OIDValue"/>
- </association>
-
- <association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="Members" cardinality="OneToMany"
+</association>
+<association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="Members" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="OIDValue" toAttribute="TeamOID"/>
- </association>
+</association>
+
 
 <class name="IEmployee" table="employee" database="MSA" factory="IEmployeeFactory" namespace="NunitTests.Interfaces">
-  <attribute name="OIDValue" column="oid" key="primary"/>
-  <attribute name="Name" column="name" find="true"/>
-  <attribute name="ReportsToOID" column="parentoid" />
-  <attribute name="TeamOID" column="teamoid" />
-  <attribute name="Team" />
-  <attribute name="ReportsTo" />
-  <attribute name="Workers" />
+	<attribute name="OIDValue" column="oid" key="primary"/>
+	<attribute name="Name" column="name" find="true"/>
+	<attribute name="ReportsToOID" column="parentoid" />
+	<attribute name="TeamOID" column="teamoid" />
+	<attribute name="Team" />
+	<attribute name="ReportsTo" />
+	<attribute name="Workers" />
 </class>
-
- <association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="ReportsTo" cardinality="OneToOne"
+<association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="ReportsTo" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="ReportsToOID" toAttribute="OIDValue"/>
- </association>
-
- <association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="Workers" cardinality="OneToMany"
+</association>
+<association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="Workers" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
 		<entry fromAttribute="OIDValue" toAttribute="ReportsToOID"/>
- </association>
+</association>
 
 
 <class name="mr1" table="mr1" database="MSA" namespace="NunitTests.InheritedClasses">
-  <attribute name="id" column="id" key="primary"/>
-  <attribute name="field1" column="field1" />
-  <attribute name="field2" column="field2" />
-  <attribute name="mr2_id" column="mr2_id" />
-  <attribute name="mr2" />
+	<attribute name="id" column="id" key="primary"/>
+	<attribute name="field1" column="field1" />
+	<attribute name="field2" column="field2" />
+	<attribute name="mr2_id" column="mr2_id" />
+	<attribute name="mr2" />
 </class>
-
 <class name="mr2" table="mr2" database="MSA" namespace="NunitTests.InheritedClasses">
-  <attribute name="id" column="id" key="primary"/>
-  <attribute name="field1" column="field1" />
-  <attribute name="field2" column="field2" />
-  <attribute name="mr3_id" column="mr3_id" />
-  <attribute name="mr3" />
+	<attribute name="id" column="id" key="primary"/>
+	<attribute name="field1" column="field1" />
+	<attribute name="field2" column="field2" />
+	<attribute name="mr3_id" column="mr3_id" />
+	<attribute name="mr3" />
 </class>
-
 <class name="mr3" table="mr3" database="MSA" namespace="NunitTests.InheritedClasses">
-  <attribute name="id" column="id" key="primary"/>
-  <attribute name="field1" column="field1" />
-  <attribute name="field2" column="field2" />
+	<attribute name="id" column="id" key="primary"/>
+	<attribute name="field1" column="field1" />
+	<attribute name="field2" column="field2" />
 </class>
-
- <association fromClass="NunitTests.InheritedClasses.mr1" toClass="NunitTests.InheritedClasses.mr2" target="mr2" cardinality="OneToOne"
+<association fromClass="NunitTests.InheritedClasses.mr1" toClass="NunitTests.InheritedClasses.mr2" target="mr2" cardinality="OneToOne"
 	retrieveAutomatic="false" saveAutomatic="false" deleteAutomatic="false" inverse="false" name="mr1tomr2">
 		<entry fromAttribute="mr2_id" toAttribute="id"/>
- </association>
-
- <association fromClass="NunitTests.InheritedClasses.mr2" toClass="NunitTests.InheritedClasses.mr3" target="mr3" cardinality="OneToOne"
+</association>
+<association fromClass="NunitTests.InheritedClasses.mr2" toClass="NunitTests.InheritedClasses.mr3" target="mr3" cardinality="OneToOne"
 	retrieveAutomatic="false" saveAutomatic="false" deleteAutomatic="false" inverse="false" name="mr2tomr3">
 		<entry fromAttribute="mr3_id" toAttribute="id"/>
- </association>
+</association>
 
 
 <class name="TableA" table="tableA" database="MSA" namespace="NunitTests.InheritedClasses">
-  <attribute name="Id" column="id" key="primary"/>
-  <attribute name="field1" column="field1" />
-  <attribute name="TableBCollection" />
+	<attribute name="Id" column="id" key="primary"/>
+	<attribute name="field1" column="field1" />
+	<attribute name="TableBCollection" />
 </class>
 <class name="TableB" table="TableB" 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="Id" column="id" key="primary"/>
+	<attribute name="field1" column="field1" />
+	<attribute name="AId" column="a_id" />
+	<attrbute name="TableA" />
 </class>
-
- <association fromClass="NunitTests.InheritedClasses.TableA" toClass="NunitTests.InheritedClasses.TableB" target="TableBCollection" cardinality="OneToMany"
+<association fromClass="NunitTests.InheritedClasses.TableA" toClass="NunitTests.InheritedClasses.TableB" target="TableBCollection" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="true" inverse="false" name="AtoB">
 		<entry fromAttribute="Id" toAttribute="AId"/>
- </association>
+</association>
+
+	<class name="A" table="tblA" database="MSA" namespace="NunitTests.InheritedClasses">
+		<attribute name="OIDValue" column="oid" key="primary"/>
+		<attribute name="CreatedDate" column="CreatedDate" timestamp="true"/>
+		<attribute name="ModifiedDate" column="ModifiedDate" timestamp="true"/>
+		<attribute name="BCol" />
+		<attribute name="C" />
+		<attribute name="COID" column="cOID"/>
+	</class>
+	<class name="B" table="tblB" database="MSA" namespace="NunitTests.InheritedClasses">
+		<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="Text" column="textCol"/>
+		<attribute name="A" />
+		<attribute name="AOID" column="aOID"/>
+	</class>
+	<class name="C" table="tblC" database="MSA" namespace="NunitTests.InheritedClasses">
+		<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="Text" column="textCol"/>
+	</class>
+	<class name="D" table="tblD" database="MSA" superclass="B" 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="Id" column="id" find="true" />
+		<attribute name="Str" column="str"/>
+	</class>
+	<class name="E" table="tblE" database="MSA" superclass="B" 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="Id" column="id" find="true"/>
+		<attribute name="Str" column="str"/>
+	</class>
+	<class name="F" table="tblF" database="MSA" superclass="E" 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="Id" column="id" find="true"/>
+		<attribute name="I" column="i"/>
+	</class>
+	<class name="G" table="tblG" database="MSA" superclass="E" 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="Id" column="id" find="true" />
+		<attribute name="I" column="i"/>
+	</class>
+	<class name="H" table="tblH" database="MSA" superclass="C" 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="Id" column="id" find="true" />
+		<attribute name="Str" column="str"/>
+	</class>
+	<class name="I" table="tblI" database="MSA" superclass="C" 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="Id" column="id" find="true" />
+		<attribute name="Str" column="str"/>
+	</class>
+	<class name="J" table="tblJ" database="MSA" superclass="H" 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="Id" column="id" find="true" />
+		<attribute name="I" column="i"/>
+	</class>
+	<class name="K" table="tblK" database="MSA" superclass="H" 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="Id" column="id" find="true" />
+		<attribute name="I" column="i"/>
+	</class>
+	<association fromClass="NunitTests.InheritedClasses.A"
+		toClass="NunitTests.InheritedClasses.B"
+		cardinality="oneToMany"
+		target="BCol"
+		retrieveAutomatic="true"
+		deleteAutomatic="true"
+		saveAutomatic="true"
+		inverse="false">
+		<entry fromAttribute="OIDValue" toAttribute="AOID"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.B"
+		toClass="NunitTests.InheritedClasses.A"
+		cardinality="oneToOne"
+		target="A"
+		retrieveAutomatic="true"
+		deleteAutomatic="false"
+		saveAutomatic="false"
+		inverse="false">
+		<entry fromAttribute="AOID" toAttribute="OIDValue"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.A"
+		toClass="NunitTests.InheritedClasses.C"
+		cardinality="oneToOne"
+		target="C"
+		retrieveAutomatic="true"
+		saveAutomatic="true"
+		deleteAutomatic="true"
+		inverse="false">
+		<entry fromAttribute="COID" toAttribute="OIDValue"/>
+	</association>
 
 </map>
\ No newline at end of file