Update of /cvsroot/jcframework/Nunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19366 Modified Files: AtomsFramework.xml Nunit_AtomsFramework.vbproj Removed Files: AtomsFrameworkTests.vb CEmployee.vb CJob.vb CSharedClasses.vb CStudent.vb CTeam.vb CWorker.vb EmployeeInterfaceTests.vb IEmployee.vb NPEmployee.vb NPJob.vb NPTeam.vb NonInheritedRetreiveCriteria.vb NonInheritedTests.vb RetrieveCriteriaTests.vb SharedTests.vb Log Message: Rearrange unit test structure (extra namespaces and folders) --- CJob.vb DELETED --- --- NPJob.vb DELETED --- --- IEmployee.vb DELETED --- --- NonInheritedTests.vb DELETED --- --- RetrieveCriteriaTests.vb DELETED --- --- CStudent.vb DELETED --- --- AtomsFrameworkTests.vb DELETED --- --- CWorker.vb DELETED --- --- NPTeam.vb DELETED --- --- CSharedClasses.vb DELETED --- --- NPEmployee.vb DELETED --- --- SharedTests.vb DELETED --- Index: Nunit_AtomsFramework.vbproj =================================================================== RCS file: /cvsroot/jcframework/Nunit/Nunit_AtomsFramework.vbproj,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Nunit_AtomsFramework.vbproj 18 Oct 2004 01:38:39 -0000 1.7 +++ Nunit_AtomsFramework.vbproj 19 Oct 2004 00:13:37 -0000 1.8 @@ -20,8 +20,8 @@ OptionCompare = "Binary" OptionExplicit = "On" OptionStrict = "Off" - RootNamespace = "Nunit_AtomsFramework" - StartupObject = "" + RootNamespace = "NunitTests" + StartupObject = "NunitTests.(None)" > <Config Name = "Debug" @@ -105,82 +105,82 @@ BuildAction = "Content" /> <File - RelPath = "AtomsFrameworkTests.vb" + RelPath = "InheritedClasses\AtomsFrameworkTests.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CEmployee.vb" + RelPath = "InheritedClasses\CEmployee.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CJob.vb" + RelPath = "InheritedClasses\CJob.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CSharedClasses.vb" + RelPath = "InheritedClasses\CSharedClasses.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CStudent.vb" + RelPath = "InheritedClasses\CStudent.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CTeam.vb" + RelPath = "InheritedClasses\CTeam.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "CWorker.vb" + RelPath = "InheritedClasses\CWorker.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "EmployeeInterfaceTests.vb" + RelPath = "InheritedClasses\RetrieveCriteriaTests.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "IEmployee.vb" + RelPath = "InheritedClasses\SharedTests.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "NonInheritedRetreiveCriteria.vb" + RelPath = "Interfaces\EmployeeInterfaceTests.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "NonInheritedTests.vb" + RelPath = "Interfaces\IEmployee.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "NPEmployee.vb" + RelPath = "StandardClasses\NonInheritedRetreiveCriteria.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "NPJob.vb" + RelPath = "StandardClasses\NonInheritedTests.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "NPTeam.vb" + RelPath = "StandardClasses\NPEmployee.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "RetrieveCriteriaTests.vb" + RelPath = "StandardClasses\NPJob.vb" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "SharedTests.vb" + RelPath = "StandardClasses\NPTeam.vb" SubType = "Code" BuildAction = "Compile" /> --- CTeam.vb DELETED --- --- CEmployee.vb DELETED --- --- EmployeeInterfaceTests.vb DELETED --- Index: AtomsFramework.xml =================================================================== RCS file: /cvsroot/jcframework/Nunit/AtomsFramework.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- AtomsFramework.xml 18 Oct 2004 01:38:39 -0000 1.5 +++ AtomsFramework.xml 19 Oct 2004 00:13:37 -0000 1.6 @@ -7,27 +7,27 @@ <parameter name="OIDTable" value="OID"/> </database> -<class name="SharedParent" table="SharedClasses" database="MSA"> +<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"/> </class> -<class name="SharedChild" table="SharedClasses" superclass="SharedParent" database="MSA" sharedtablefield="IType" sharedtablevalue="PLN"> +<class name="SharedChild" table="SharedClasses" superclass="SharedParent" database="MSA" sharedtablefield="IType" sharedtablevalue="PLN" namespace="NunitTests.InheritedClasses"> </class> -<class name="NPJob" table="NPJobs" database="MSA"> +<class name="NPJob" table="NPJobs" database="MSA" namespace="NunitTests.StandardClasses"> <attribute name="Id" column="id" key="primary"/> <attribute name="Description" column="description"/> </class> -<class name="NPJobWithOIDValue" table="jobs" database="MSA"> +<class name="NPJobWithOIDValue" table="jobs" database="MSA" namespace="NunitTests.StandardClasses"> <attribute name="OIDValue" column="oidvalue" key="primary"/> <attribute name="Description" column="description" find="true"/> </class> -<class name="NPEmployee" table="employee" database="MSA"> +<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" /> @@ -37,17 +37,17 @@ <attribute name="Workers" /> </class> - <association fromClass="NPEmployee" toClass="NPEmployee" target="ReportsTo" cardinality="OneToOne" + <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="NPEmployee" toClass="NPEmployee" target="Workers" cardinality="OneToMany" + <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"> +<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" /> @@ -56,22 +56,22 @@ <attribute name="Job" /> </class> - <association fromClass="NPTeam" toClass="NPEmployee" target="TeamLeader" cardinality="OneToOne" + <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="NPTeam" toClass="NPJobWithOIDValue" target="Job" cardinality="OneToOne" + <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="NPTeam" toClass="NPEmployee" target="Members" cardinality="OneToMany" + <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> -<class name="IEmployee" table="employee" database="MSA" factory="IEmployeeFactory"> +<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" /> @@ -81,12 +81,12 @@ <attribute name="Workers" /> </class> - <association fromClass="IEmployee" toClass="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="IEmployee" toClass="IEmployee" target="Workers" cardinality="OneToMany" + <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> --- NonInheritedRetreiveCriteria.vb DELETED --- |