Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22838 Modified Files: ABCProxyTest.cs ABCTest.cs CriteriaTest.cs FumTest.cs ParentChildTest.cs SimpleTest.cs SQLFunctionsTest.cs Log Message: Modified fixtures so they don't recreate the tables for each [Test] Index: CriteriaTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CriteriaTest.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CriteriaTest.cs 17 Nov 2004 01:02:14 -0000 1.7 --- CriteriaTest.cs 1 Jan 2005 20:39:38 -0000 1.8 *************** *** 1,5 **** using System; using System.Collections; - using System.Data; using NHibernate.DomainModel; --- 1,4 ---- *************** *** 12,21 **** public class CriteriaTest : TestCase { [SetUp] public void SetUp() { ! ExportSchema( new string[] { "Simple.hbm.xml"}); } [Test] public void SimpleSelectTest() --- 11,45 ---- public class CriteriaTest : TestCase { + + #region NUnit.Framework.TestFixture Members + + [TestFixtureSetUp] + public void TestFixtureSetUp() + { + ExportSchema( new string[] { "Simple.hbm.xml"}); + } + [SetUp] public void SetUp() { ! // there are test in here where we don't need to resetup the ! // tables - so only set the tables up once ! } ! ! [TearDown] ! public override void TearDown() ! { ! // do nothing except not let the base TearDown get called ! } ! ! [TestFixtureTearDown] ! public void TestFixtureTearDown() ! { ! base.TearDown(); } + #endregion + + [Test] public void SimpleSelectTest() Index: SimpleTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SimpleTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SimpleTest.cs 20 Sep 2004 17:45:58 -0000 1.6 --- SimpleTest.cs 1 Jan 2005 20:39:38 -0000 1.7 *************** *** 10,24 **** public class SimpleTest : TestCase { - private DateTime testDateTime = new DateTime(2003, 8, 16); private DateTime updateDateTime = new DateTime(2003, 8, 17); [SetUp] public void SetUp() { ! ExportSchema( new string[] { "Simple.hbm.xml"} ); } [Test] public void TestCRUD() --- 10,45 ---- public class SimpleTest : TestCase { private DateTime testDateTime = new DateTime(2003, 8, 16); private DateTime updateDateTime = new DateTime(2003, 8, 17); + #region NUnit.Framework.TestFixture Members + + [TestFixtureSetUp] + public void TestFixtureSetUp() + { + ExportSchema( new string[] { "Simple.hbm.xml"} ); + } [SetUp] public void SetUp() { ! // there are test in here where we don't need to resetup the ! // tables - so only set the tables up once } + [TearDown] + public override void TearDown() + { + // do nothing except not let the base TearDown get called + } + + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + base.TearDown(); + } + + #endregion + [Test] public void TestCRUD() Index: SQLFunctionsTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SQLFunctionsTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SQLFunctionsTest.cs 30 Oct 2004 14:41:54 -0000 1.6 --- SQLFunctionsTest.cs 1 Jan 2005 20:39:38 -0000 1.7 *************** *** 14,25 **** public class SQLFunctionsTest : TestCase { ! [SetUp] ! public void SetUp() { ExportSchema( new string[] { "Simple.hbm.xml", ! "Blobber.hbm.xml" } ); } [Test] public void SetProperties() --- 14,48 ---- public class SQLFunctionsTest : TestCase { ! #region NUnit.Framework.TestFixture Members ! ! [TestFixtureSetUp] ! public void TestFixtureSetUp() { ExportSchema( new string[] { "Simple.hbm.xml", ! "Blobber.hbm.xml" } ); } + [SetUp] + public void SetUp() + { + // there are test in here where we don't need to resetup the + // tables - so only set the tables up once + } + + [TearDown] + public override void TearDown() + { + // do nothing except not let the base TearDown get called + } + + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + base.TearDown(); + } + + #endregion + [Test] public void SetProperties() Index: FumTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FumTest.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FumTest.cs 18 Nov 2004 02:46:59 -0000 1.16 --- FumTest.cs 1 Jan 2005 20:39:38 -0000 1.17 *************** *** 17,46 **** protected static short fumKeyShort = 1; [SetUp] ! public void SetUp() { ! ExportSchema(new string[] { ! "FooBar.hbm.xml", ! "Baz.hbm.xml", ! "Qux.hbm.xml", ! "Glarch.hbm.xml", ! "Fum.hbm.xml", ! "Fumm.hbm.xml", ! "Fo.hbm.xml", ! "One.hbm.xml", ! "Many.hbm.xml", ! "Immutable.hbm.xml", ! "Fee.hbm.xml", ! "Vetoer.hbm.xml", ! "Holder.hbm.xml", ! "Location.hbm.xml", ! "Stuff.hbm.xml", ! "Container.hbm.xml", ! "Simple.hbm.xml", ! "Middle.hbm.xml" ! }, true); } public static FumCompositeID FumKey(String str) { --- 17,68 ---- protected static short fumKeyShort = 1; + #region NUnit.Framework.TestFixture Members + + [TestFixtureSetUp] + public void TestFixtureSetUp() + { + ExportSchema(new string[] { + "FooBar.hbm.xml", + "Baz.hbm.xml", + "Qux.hbm.xml", + "Glarch.hbm.xml", + "Fum.hbm.xml", + "Fumm.hbm.xml", + "Fo.hbm.xml", + "One.hbm.xml", + "Many.hbm.xml", + "Immutable.hbm.xml", + "Fee.hbm.xml", + "Vetoer.hbm.xml", + "Holder.hbm.xml", + "Location.hbm.xml", + "Stuff.hbm.xml", + "Container.hbm.xml", + "Simple.hbm.xml", + "Middle.hbm.xml" + }, true); + } + [SetUp] ! public void SetUp() ! { ! // there are test in here where we don't need to resetup the ! // tables - so only set the tables up once ! } ! ! [TearDown] ! public override void TearDown() { + // do nothing except not let the base TearDown get called + } ! [TestFixtureTearDown] ! public void TestFixtureTearDown() ! { ! base.TearDown(); } + #endregion + public static FumCompositeID FumKey(String str) { Index: ParentChildTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ParentChildTest.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ParentChildTest.cs 18 Nov 2004 02:46:59 -0000 1.10 --- ParentChildTest.cs 1 Jan 2005 20:39:38 -0000 1.11 *************** *** 14,19 **** public class ParentChildTest : TestCase { ! [SetUp] ! public void SetUp() { ExportSchema( new string[] { "FooBar.hbm.xml", --- 14,22 ---- public class ParentChildTest : TestCase { ! ! #region NUnit.Framework.TestFixture Members ! ! [TestFixtureSetUp] ! public void TestFixtureSetUp() { ExportSchema( new string[] { "FooBar.hbm.xml", *************** *** 38,41 **** --- 41,65 ---- } + [SetUp] + public void SetUp() + { + // there are test in here where we don't need to resetup the + // tables - so only set the tables up once + } + + [TearDown] + public override void TearDown() + { + // do nothing except not let the base TearDown get called + } + + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + base.TearDown(); + } + + #endregion + [Test] public void CollectionQuery() Index: ABCProxyTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ABCProxyTest.cs 16 Dec 2004 21:56:05 -0000 1.10 --- ABCProxyTest.cs 1 Jan 2005 20:39:37 -0000 1.11 *************** *** 12,21 **** public class ABCProxyTest : TestCase { ! [SetUp] ! public void SetUp() { ExportSchema(new string[] { "ABCProxy.hbm.xml"}); } [Test] //[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")] --- 12,45 ---- public class ABCProxyTest : TestCase { ! ! #region NUnit.Framework.TestFixture Members ! ! [TestFixtureSetUp] ! public void TestFixtureSetUp() { ExportSchema(new string[] { "ABCProxy.hbm.xml"}); } + [SetUp] + public void SetUp() + { + // there are test in here where we don't need to resetup the + // tables - so only set the tables up once + } + + [TearDown] + public override void TearDown() + { + // do nothing except not let the base TearDown get called + } + + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + base.TearDown(); + } + + #endregion + [Test] //[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")] Index: ABCTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCTest.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ABCTest.cs 12 Jul 2004 21:17:06 -0000 1.9 --- ABCTest.cs 1 Jan 2005 20:39:38 -0000 1.10 *************** *** 15,24 **** public class ABCTest : TestCase { ! [SetUp] ! public void SetUp() { ExportSchema(new string[] { "ABC.hbm.xml"}); } [Test] public void Subclassing() --- 15,49 ---- public class ABCTest : TestCase { ! ! #region NUnit.Framework.TestFixture Members ! ! [TestFixtureSetUp] ! public void TestFixtureSetUp() { ExportSchema(new string[] { "ABC.hbm.xml"}); } + [SetUp] + public void SetUp() + { + // there are test in here where we don't need to resetup the + // tables - so only set the tables up once + } + + [TearDown] + public override void TearDown() + { + // do nothing except not let the base TearDown get called + } + + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + base.TearDown(); + } + + #endregion + + [Test] public void Subclassing() |