Author: roberto
Date: Mon Jul 25 18:55:20 2005
New Revision: 225217
URL: http://svn.apache.org/viewcvs?rev=225217&view=rev
Log:
+ Added C# Common and DataAccess NUnit test NAnt build files
Added:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/IBatisNet.Common.Test.build
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMapConfig.xsd
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
ibatis/trunk/cs/mapper/iBATIS.build
Added: ibatis/trunk/cs/mapper/IBatisNet.Common.Test/IBatisNet.Common.Test.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/IBatisNet.Common.Test.build?rev=225217&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Test/IBatisNet.Common.Test.build
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Test/IBatisNet.Common.Test.build
Mon Jul 25 18:55:20 2005
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<project name="IBatisNet.Common.Test" default="build">
+ <!--
+ Required properties:
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
+ * build.debug - (true|false) debug build?
+ * current.build.defines - framework-specific build defines
+ -->
+ <target name="build">
+
+ <echo message="Build Directory is
${build.dir}/${project.config}/bin" />
+
+ <!-- build IBatisNet.Common.Test -->
+ <csc target="library" define="${current.build.defines}"
warnaserror="true"
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
+ <nowarn>
+ <warning number="${nowarn.numbers}" />
+ </nowarn>
+ <sources failonempty="true">
+ <include name="**/*.cs" />
+ <exclude name="NUnit/CommonTests/DynamicProxy/ProxyTest.cs" />
+ </sources>
+ <resources prefix="IBatisNet.Common.Test"
dynamicprefix="true">
+ <include name="properties.xml" />
+ <exclude name="bin/**/*.xml" />
+ </resources>
+ <references basedir="${build.dir}/${project.config}/bin">
+ <include name="*.dll"/>
+ <exclude name="${nant.project.name}.dll"/>
+ </references>
+ </csc>
+
+ <copy todir="${build.dir}">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="DataBase*.config" />
+ </fileset>
+ </copy>
+
+ <copy flatten="true" todir="${build.dir}/${project.config}/bin">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="bin/**/*.config" />
+ </fileset>
+ </copy>
+
+ <!-- delete the mapping files used for testing -->
+ <delete dir="${build.dir}/maps" failonerror="false" />
+ <mkdir dir="${build.dir}/maps" />
+
+ <echo message="Copy mapping files" />
+
+ <copy todir="${build.dir}/maps">
+ <fileset basedir="Maps">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
+ <!-- delete the script files used for testing -->
+ <delete dir="${build.dir}/Scripts" failonerror="false" />
+ <mkdir dir="${build.dir}/Scripts" />
+
+ <echo message="Copy Scripts files" />
+
+ <copy todir="${build.dir}/Scripts">
+ <fileset basedir="Scripts">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="test" depends="build">
+ <mkdir dir="${build.dir}/testCommonResults" />
+ <nunit2 failonerror="false">
+ <formatter type="Plain" />
+ <formatter type="Xml" usefile="true" extension=".xml"
outputdir="${build.dir}/testCommonResults" />
+ <test
+
assemblyname="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
+
appconfig="${build.dir}/${project.config}/bin/${nant.project.name}.dll.config">
+ <categories>
+ <exclude name="MTS" />
+ </categories>
+ </test>
+ </nunit2>
+ <nunit2report
out="${build.dir}/testCommonResults/UnitTests.html" verbose="true">
+ <fileset>
+ <include
name="${build.dir}/testCommonResults/*-results.xml"/>
+ </fileset>
+ </nunit2report>
+ </target>
+
+</project>
Added: ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMapConfig.xsd
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMapConfig.xsd?rev=225217&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMapConfig.xsd
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMapConfig.xsd Mon
Jul 25 18:55:20 2005
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ibatis.apache.org/dataMapper";
+elementFormDefault="qualified"
+xmlns:mstns="http://tempuri.org/XMLSchema.xsd";
+xmlns:xs="http://www.w3.org/2001/XMLSchema";
+xmlns="http://ibatis.apache.org/dataMapper";
+xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense";
+vs:friendlyname="iBATIS.NET DataMapper Configuration Schema"
+vs:ishtmlschema="false"
+vs:iscasesensitive="true"
+vs:requireattributequotes="true"
+vs:defaultnamespacequalifier=""
+vs:defaultnsprefix="">
+
+ <xs:annotation>
+ <xs:documentation>
+ DataMapper XML Schema Definition
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="typeAlias">
+ <xs:complexType>
+ <xs:attribute name="alias" type="xs:string"
use="required"/>
+ <xs:attribute name="type" type="xs:string"
use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="typeHandler">
+ <xs:complexType>
+ <xs:attribute name="type" type="xs:string"/>
+ <xs:attribute name="dbType" type="xs:string"/>
+ <xs:attribute name="callback" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="typeHandlers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="typeHandler"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="alias">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="typeAlias"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="dataSource">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string"
use="required"/>
+ <xs:attribute name="connectionString" type="xs:string"
use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="database">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="provider"/>
+ <xs:element ref="dataSource"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="property" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="resource" type="xs:string"/>
+ <xs:attribute name="url" type="xs:string"/>
+ <xs:attribute name="embedded" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="property">
+ <xs:complexType>
+ <xs:attribute name="resource" type="xs:string"/>
+ <xs:attribute name="url" type="xs:string"/>
+ <xs:attribute name="embedded" type="xs:string"/>
+ <xs:attribute name="key" type="xs:string"/>
+ <xs:attribute name="value" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="provider">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string"
use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="setting">
+ <xs:complexType>
+ <xs:attribute name="useStatementNamespaces"
type="xs:string" default="false"/>
+ <xs:attribute name="cacheModelsEnabled"
type="xs:string"/>
+ <xs:attribute name="validateSqlMap" type="xs:string"
default="false"/>
+ <xs:attribute name="useEmbedStatementParams"
type="xs:boolean" default="false"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="settings">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="setting"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="sqlMap">
+ <xs:complexType>
+ <xs:attribute name="resource" type="xs:string"/>
+ <xs:attribute name="url" type="xs:string"/>
+ <xs:attribute name="embedded" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="providers">
+ <xs:complexType>
+ <xs:attribute name="resource" type="xs:string"/>
+ <xs:attribute name="url" type="xs:string"/>
+ <xs:attribute name="embedded" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:annotation>
+ <xs:documentation>
+ The document root.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="sqlMapConfig">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:element ref="properties" minOccurs="0"/>
+ <xs:element ref="settings" minOccurs="0"/>
+ <xs:element ref="providers" minOccurs="0"/>
+ <xs:element ref="database" minOccurs="0"/>
+ <xs:element ref="alias" minOccurs="0"/>
+ <xs:element ref="typeHandlers" minOccurs="0"/>
+ <xs:element ref="sqlMaps" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="sqlMaps">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="sqlMap" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build?rev=225217&view=auto
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build
(added)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build
Mon Jul 25 18:55:20 2005
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<project name="IBatisNet.DataAccess.Test" default="build">
+ <!--
+ Required properties:
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
+ * build.debug - (true|false) debug build?
+ * current.build.defines - framework-specific build defines
+ -->
+ <target name="build">
+
+ <echo message="Build Directory is
${build.dir}/${project.config}/bin" />
+
+ <!-- build IBatisNet.DataAccess.Test -->
+ <csc target="library" define="${current.build.defines}"
warnaserror="true"
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
+ <nowarn>
+ <warning number="${nowarn.numbers}" />
+ </nowarn>
+ <sources failonempty="true">
+ <include name="**/*.cs" />
+ <exclude name="Dao/Implementations/NHibernate/*.cs" />
+ <exclude name="NUnit/DaoTests/MutipleDaoTest.cs" />
+ <exclude name="NUnit/DaoTests/NHibernateDaoTest.cs" />
+ </sources>
+ <resources prefix="IBatisNet.DataAccess.Test"
dynamicprefix="true">
+ <include name="User.hbm.xml" />
+ <exclude name="bin/**/*.xml" />
+ </resources>
+ <resources prefix="IBatisNet.DataAccess.Test.bin.Debug">
+ <include name="bin/**/SqlMap_MSSQL_SqlClient.config" />
+ </resources>
+ <references basedir="${build.dir}/${project.config}/bin">
+ <include name="*.dll"/>
+ <exclude name="${nant.project.name}.dll"/>
+ </references>
+ </csc>
+
+ <copy todir="${build.dir}">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="DataBase*.config" />
+ </fileset>
+ </copy>
+
+ <copy flatten="true" todir="${build.dir}/${project.config}/bin">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="bin/**/*.config" />
+ </fileset>
+ </copy>
+
+ <!-- delete the mapping files used for testing -->
+ <delete dir="${build.dir}/maps" failonerror="false" />
+ <mkdir dir="${build.dir}/maps" />
+
+ <echo message="Copy mapping files" />
+
+ <copy todir="${build.dir}/maps">
+ <fileset basedir="Maps">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
+ <!-- delete the script files used for testing -->
+ <delete dir="${build.dir}/Scripts" failonerror="false" />
+ <mkdir dir="${build.dir}/Scripts" />
+
+ <echo message="Copy Scripts files" />
+
+ <copy todir="${build.dir}/Scripts">
+ <fileset basedir="Scripts">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="test" depends="build">
+ <mkdir dir="${build.dir}/testDataAccessResults" />
+ <nunit2 failonerror="false">
+ <formatter type="Plain" />
+ <formatter type="Xml" usefile="true" extension=".xml"
outputdir="${build.dir}/testDataAccessResults" />
+ <test
+
assemblyname="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
+
appconfig="${build.dir}/${project.config}/bin/${nant.project.name}.dll.config">
+ <categories>
+ <exclude name="MySql" />
+ <exclude name="Oracle" />
+ </categories>
+ </test>
+ </nunit2>
+ <nunit2report
out="${build.dir}/testDataAccessResults/UnitTests.html" verbose="true">
+ <fileset>
+ <include
name="${build.dir}/testDataAccessResults/*-results.xml"/>
+ </fileset>
+ </nunit2report>
+ </target>
+
+</project>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build?rev=225217&r1=225216&r2=225217&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
Mon Jul 25 18:55:20 2005
@@ -10,8 +10,8 @@
<echo message="Build Directory is
${build.dir}/${project.config}/bin" />
- <!-- build IBatisNet.Test -->
- <csc target="library" define="${current.build.defines}"
warnaserror="true"
+ <!-- build IBatisNet.DataMapper.Test -->
+ <csc target="library" define="${current.build.defines}"
warnaserror="true"
debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
<nowarn>
<warning number="${nowarn.numbers}" />
@@ -77,10 +77,10 @@
</target>
<target name="test" depends="build">
- <mkdir dir="${build.dir}/testResults" />
+ <mkdir dir="${build.dir}/testDataMapperResults" />
<nunit2 failonerror="false">
<formatter type="Plain" />
- <formatter type="Xml" usefile="true" extension=".xml"
outputdir="${build.dir}/testResults" />
+ <formatter type="Xml" usefile="true" extension=".xml"
outputdir="${build.dir}/testDataMapperResults" />
<test
assemblyname="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
appconfig="${build.dir}/${project.config}/bin/${nant.project.name}.dll.config">
@@ -93,9 +93,9 @@
</categories>
</test>
</nunit2>
- <nunit2report out="${build.dir}/testResults/UnitTests.html"
verbose="true">
+ <nunit2report
out="${build.dir}/testDataMapperResults/UnitTests.html" verbose="true">
<fileset>
- <include
name="${build.dir}/testResults/*-results.xml"/>
+ <include
name="${build.dir}/testDataMapperResults/*-results.xml"/>
</fileset>
</nunit2report>
</target>
Modified: ibatis/trunk/cs/mapper/iBATIS.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/iBATIS.build?rev=225217&r1=225216&r2=225217&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/iBATIS.build (original)
+++ ibatis/trunk/cs/mapper/iBATIS.build Mon Jul 25 18:55:20 2005
@@ -108,13 +108,13 @@
<target name="test" depends="build">
<!-- test IBatisNet.Common assembly -->
- <!-- <nant
buildfile="IBatisNet.Common.Test/IBatisNet.Common.Test.build" target="test" />
-->
+ <nant buildfile="IBatisNet.Common.Test/IBatisNet.Common.Test.build"
target="test" />
<!-- test IBatisNet.DataMapper assembly -->
<nant
buildfile="IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build"
target="test" />
<!-- test IBatisNet.DataAccess assembly -->
- <!-- <nant
buildfile="IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build"
target="test" /> -->
+ <nant
buildfile="IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build"
target="test" />
</target>
