Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4959] trunk/nhibernate
|
From: <ste...@us...> - 2010-03-17 15:35:40
|
Revision: 4959
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4959&view=rev
Author: steverstrong
Date: 2010-03-17 15:35:33 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
Added test to drop & recreate nhibernate database
Modified Paths:
--------------
trunk/nhibernate/default.build
trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/TestCase.cs
trunk/nhibernate/src/NHibernate.sln
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/App.config
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build 2010-03-17 14:18:03 UTC (rev 4958)
+++ trunk/nhibernate/default.build 2010-03-17 15:35:33 UTC (rev 4959)
@@ -23,6 +23,7 @@
<include name="Iesi.Collections/Iesi.Collections.build" />
<include name="Iesi.Collections.Test/Iesi.Collections.Test.build" />
<include name="NHibernate/NHibernate.build" />
+ <include name="NHibernate.TestDatabaseSetup/TestDatabaseSetup.build" />
<include name="NHibernate.ByteCode.LinFu/ByteCode.build" />
<include name="NHibernate.ByteCode.LinFu.Tests/ByteCode.Test.build" />
<include name="NHibernate.ByteCode.Castle/ByteCode.build" />
@@ -35,6 +36,7 @@
</fileset>
<fileset id="buildfiles.tests" basedir="src">
+ <include name="NHibernate.TestDatabaseSetup/TestDatabaseSetup.build" />
<include name="Iesi.Collections.Test/Iesi.Collections.Test.build" />
<include name="NHibernate.ByteCode.LinFu.Tests/ByteCode.Test.build" />
<include name="NHibernate.ByteCode.Castle.Tests/ByteCode.Test.build" />
Modified: trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/TestCase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/TestCase.cs 2010-03-17 14:18:03 UTC (rev 4958)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/TestCase.cs 2010-03-17 15:35:33 UTC (rev 4959)
@@ -197,7 +197,6 @@
private void CreateSchema()
{
- new SchemaExport(cfg).Drop(OutputDdl, true);
new SchemaExport(cfg).Create(OutputDdl, true);
}
Property changes on: trunk/nhibernate/src/NHibernate.TestDatabaseSetup
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Added: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/App.config
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/App.config (rev 0)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/App.config 2010-03-17 15:35:33 UTC (rev 4959)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="hibernate-configuration"
+ type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
+ </configSections>
+
+ <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+ <session-factory name="NHibernate.TestDatabaseSetup">
+ <property name="connection.connection_string">
+ Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
+ </property>
+ </session-factory>
+ </hibernate-configuration>
+</configuration>
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build (rev 0)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build 2010-03-17 15:35:33 UTC (rev 4959)
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<project name="NHibernate.Test" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+ <property name="root.dir" value="../.." />
+ <property name="config.FileName" value="hibernate.cfg.xml" />
+ <include buildfile="${root.dir}/build-common/common-project.xml" />
+ <target name="init" depends="common.init">
+ <property name="assembly.description" value="Test Database Setup for NHibernate." />
+ <property name="assembly.is-cls-compliant" value="true" />
+ <property name="clover.instrument" value="false" />
+ <assemblyfileset id="project.references" basedir="${bin.dir}">
+ <include name="System.dll" />
+ <include name="System.Core.dll" />
+ <include name="System.Data.dll" />
+ <include name="NHibernate.dll" />
+ <include name="nunit.framework.dll" />
+ </assemblyfileset>
+ <resourcefileset id="project.resources" prefix="NHibernate.Test" dynamicprefix="true">
+ <include name="**/*.xml" />
+ <exclude name="bin/**/*.xml" />
+ </resourcefileset>
+ </target>
+ <target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" />
+ <target name="build" depends="init generate-assemblyinfo common.compile-tests">
+
+
+ <if test="${file::exists(config.FileName)}">
+ <copy file="hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
+ </if>
+ </target>
+ <target name="test" depends="init build common.run-database-tests" />
+</project>
Added: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs 2010-03-17 15:35:33 UTC (rev 4959)
@@ -0,0 +1,39 @@
+using System;
+using NUnit.Framework;
+using Sql=System.Data.SqlClient;
+
+namespace NHibernate.TeamCity.TestDatabaseSetup
+{
+ [TestFixture]
+ public class DatabaseSetup
+ {
+ [Test]
+ public void SetupDatabase()
+ {
+ var cfg = new Cfg.Configuration();
+
+ using (var conn = new Sql.SqlConnection(cfg.Properties["connection.connection_string"]))
+ {
+ conn.Open();
+
+ using (var cmd = new Sql.SqlCommand("use master", conn))
+ {
+ cmd.ExecuteNonQuery();
+
+ cmd.CommandText = "drop database nhibernate";
+
+ try
+ {
+ cmd.ExecuteNonQuery();
+ }
+ catch(Exception)
+ {
+ }
+
+ cmd.CommandText = "create database nhibernate";
+ cmd.ExecuteNonQuery();
+ }
+ }
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.sln
===================================================================
--- trunk/nhibernate/src/NHibernate.sln 2010-03-17 14:18:03 UTC (rev 4958)
+++ trunk/nhibernate/src/NHibernate.sln 2010-03-17 15:35:33 UTC (rev 4959)
@@ -3,6 +3,8 @@
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{593DCEA7-C933-46F3-939F-D8172399AB05}"
ProjectSection(SolutionItems) = preProject
..\default.build = ..\default.build
+ LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
+ NHibernate.vsmdi = NHibernate.vsmdi
..\releasenotes.txt = ..\releasenotes.txt
EndProjectSection
EndProject
@@ -22,7 +24,12 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.Castle.Tests", "NHibernate.ByteCode.Castle.Tests\NHibernate.ByteCode.Castle.Tests.csproj", "{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.TestDatabaseSetup", "NHibernate.TestDatabaseSetup\NHibernate.TestDatabaseSetup.csproj", "{BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}"
+EndProject
Global
+ GlobalSection(TestCaseManagementSettings) = postSolution
+ CategoryFile = NHibernate.vsmdi
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
@@ -60,6 +67,10 @@
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BEEC1564-6FB6-49F7-BBE5-8EBD2F0F6E8A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
