Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4224] trunk/nhibernate
|
From: <fab...@us...> - 2009-05-02 21:53:50
|
Revision: 4224
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4224&view=rev
Author: fabiomaulo
Date: 2009-05-02 21:53:39 +0000 (Sat, 02 May 2009)
Log Message:
-----------
NUnit2.5.0RC1
Modified Paths:
--------------
trunk/nhibernate/lib/net/2.0/nunit.framework.dll
trunk/nhibernate/lib/net/3.5/nunit.framework.dll
trunk/nhibernate/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs
trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs
trunk/nhibernate/src/NHibernate.Test/Cascade/RefreshFixture.cs
trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs
trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs
trunk/nhibernate/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs
trunk/nhibernate/src/NHibernate.Test/Deletetransient/DeleteTransientEntityTest.cs
trunk/nhibernate/src/NHibernate.Test/DriverTest/NullReferenceFixture.cs
trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Multi/MultiRepresentationFixture.cs
trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Accessors/XmlAccessorFixture.cs
trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Basic/XmlFixture.cs
trunk/nhibernate/src/NHibernate.Test/Events/Collections/AbstractCollectionEventFixture.cs
trunk/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs
trunk/nhibernate/src/NHibernate.Test/Extendshbm/ExtendsFixture.cs
trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs
trunk/nhibernate/src/NHibernate.Test/FilterTest/FilterConfig.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
trunk/nhibernate/src/NHibernate.Test/HQL/HQLFunctions.cs
trunk/nhibernate/src/NHibernate.Test/HQL/SqlCommentsFixture.cs
trunk/nhibernate/src/NHibernate.Test/IdGen/Enhanced/SequenceStyleConfigUnitFixture.cs
trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs
trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs
trunk/nhibernate/src/NHibernate.Test/IdTest/IdentifierGeneratorFactoryFixture.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/CriteriaTest.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
trunk/nhibernate/src/NHibernate.Test/MappingExceptions/MissingDefCtorFixture.cs
trunk/nhibernate/src/NHibernate.Test/MappingTest/ForeignKeyFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHAssert.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Docs/Associations/BiM21/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/EmptyMappingsFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FallbackFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/LazyLoadBugTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1326/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1349/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1488/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1515/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1533/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1608/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1621/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1640/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1675/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1713/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1741/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH350/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH496/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH593/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH606/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH712/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/OptimisticConcurrencyFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ProxyValidator/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/src/NHibernate.Test/Naturalid/Immutable/ImmutableNaturalIdFixture.cs
trunk/nhibernate/src/NHibernate.Test/Naturalid/Mutable/MutableNaturalIdFixture.cs
trunk/nhibernate/src/NHibernate.Test/Operations/AbstractOperationTestCase.cs
trunk/nhibernate/src/NHibernate.Test/Operations/MergeFixture.cs
trunk/nhibernate/src/NHibernate.Test/Pagination/PaginationFixture.cs
trunk/nhibernate/src/NHibernate.Test/PropertyTest/BackFieldAccessorFixture.cs
trunk/nhibernate/src/NHibernate.Test/PropertyTest/BasicSetterExceptionFixture.cs
trunk/nhibernate/src/NHibernate.Test/PropertyTest/FieldSetterExceptionFixture.cs
trunk/nhibernate/src/NHibernate.Test/PropertyTest/ReadonlyAccessorFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/NamedParametersFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/PositionalParametersFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/QueryParametersFixture.cs
trunk/nhibernate/src/NHibernate.Test/ReflectionOptimizerTest/LcgFixture.cs
trunk/nhibernate/src/NHibernate.Test/SecondLevelCacheTest/QueryCacheFixture.cs
trunk/nhibernate/src/NHibernate.Test/Stateless/StatelessWithRelationsFixture.cs
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTagFixture.cs
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs
trunk/nhibernate/src/NHibernate.Test/TransactionTest/TransactionFixture.cs
trunk/nhibernate/src/NHibernate.Test/TransformTests/AliasToBeanResultTransformerFixture.cs
trunk/nhibernate/src/NHibernate.Test/TypesTest/CurrencyTypeFixture.cs
trunk/nhibernate/src/NHibernate.Test/TypesTest/PersistentEnumTypeFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/AssemblyQualifiedTypeNameFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/LinkedHashMapFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/ReflectHelperFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/SingletonEnumerableFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/SoftLimitMRUCacheFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/MsSQL/GeneratedBinaryVersionFixture.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/Assertions/
Modified: trunk/nhibernate/lib/net/2.0/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/nhibernate/lib/net/3.5/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/nhibernate/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.BulkManipulation
{
Modified: trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using NHibernate.Bytecode;
using NHibernate.Bytecode.Lightweight;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Bytecode.Lightweight
{
Modified: trunk/nhibernate/src/NHibernate.Test/Cascade/RefreshFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Cascade/RefreshFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Cascade/RefreshFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Data;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Cascade
{
Modified: trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -161,7 +161,6 @@
}
[Test]
- [ExpectedException(typeof(HibernateConfigException))]
public void CacheConfigurationForUnmappedClass()
{
string cfgString =
@@ -173,11 +172,10 @@
</hibernate-configuration>";
Configuration cfg = new Configuration();
- cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null));
+ Assert.Throws<HibernateConfigException>(()=>cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null)));
}
[Test]
- [ExpectedException(typeof(HibernateConfigException))]
public void CacheConfigurationForUnmappedCollection()
{
string cfgString =
@@ -190,17 +188,16 @@
</hibernate-configuration>";
Configuration cfg = new Configuration();
- cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null));
+ Assert.Throws<HibernateConfigException>(()=>cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null)));
}
[Test]
- [ExpectedException(typeof(HibernateConfigException))]
public void NoSessionFactoriesInConfiguration()
{
string cfgString = @"<?xml version='1.0' encoding='utf-8' ?><someElement />";
Configuration cfg = new Configuration();
- cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null));
+ Assert.Throws<HibernateConfigException>(()=>cfg.Configure(new XmlTextReader(cfgString, XmlNodeType.Document, null)));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -11,7 +11,7 @@
[TestFixture]
public class ConfigurationSchemaFixture
{
- [Test, ExpectedException(typeof(HibernateConfigException))]
+ [Test]
public void InvalidConfig()
{
string xml =
@@ -21,7 +21,7 @@
</hibernate-configuration>";
XmlTextReader xtr = new XmlTextReader(xml, XmlNodeType.Document, null);
- HibernateConfiguration hc = new HibernateConfiguration(xtr);
+ Assert.Throws<HibernateConfigException>(()=>new HibernateConfiguration(xtr));
}
[Test]
@@ -52,7 +52,7 @@
Assert.AreEqual(hc.UseReflectionOptimizer, newhc.UseReflectionOptimizer);
}
- [Test, ExpectedException(typeof(HibernateConfigException))]
+ [Test]
public void EmptyFactoryNotAllowed()
{
// session-factory omission not allowed out of App.config
@@ -63,7 +63,7 @@
</hibernate-configuration>";
XmlTextReader xtr = new XmlTextReader(xml, XmlNodeType.Document, null);
- HibernateConfiguration hc = new HibernateConfiguration(xtr);
+ Assert.Throws<HibernateConfigException>(()=> new HibernateConfiguration(xtr));
}
[Test]
@@ -148,7 +148,7 @@
(new MappingConfiguration("AAssembly", null))));
}
- [Test, ExpectedException(typeof(HibernateConfigException))]
+ [Test]
public void NotAllowedMappings()
{
string xml =
@@ -160,7 +160,7 @@
</hibernate-configuration>";
XmlTextReader xtr = new XmlTextReader(xml, XmlNodeType.Document, null);
- HibernateConfiguration hc = new HibernateConfiguration(xtr);
+ Assert.Throws<HibernateConfigException>(()=>new HibernateConfiguration(xtr));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -5,7 +5,6 @@
using NHibernate.DomainModel;
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.CfgTest
{
Modified: trunk/nhibernate/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -11,13 +11,12 @@
public class NamedConnectionStringFixture
{
[Test]
- [ExpectedException(typeof(HibernateException), "Could not find named connection string MyConStr")]
public void InvalidNamedConnectedStringThrows()
{
Dictionary<string, string> settings = new Dictionary<string, string>();
settings.Add(Environment.ConnectionStringName, "MyConStr");
ConnectionProvider cp = new MockConnectionProvider();
- cp.Configure(settings);
+ Assert.Throws<HibernateException>(()=>cp.Configure(settings), "Could not find named connection string MyConStr");
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -7,7 +7,6 @@
using NHibernate.Type;
using NHibernate.Util;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Criteria
{
@@ -1434,14 +1433,14 @@
session.Close();
}
- [Test, ExpectedException(typeof(QueryException))]
+ [Test]
public void TypeMismatch()
{
using (ISession session = OpenSession())
{
- session.CreateCriteria(typeof(Enrolment))
+ Assert.Throws<QueryException>(() => session.CreateCriteria(typeof(Enrolment))
.Add(Expression.Eq("Student", 10)) // Type mismatch!
- .List();
+ .List());
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Deletetransient/DeleteTransientEntityTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Deletetransient/DeleteTransientEntityTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Deletetransient/DeleteTransientEntityTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,5 @@
using System.Collections;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Deletetransient
{
Modified: trunk/nhibernate/src/NHibernate.Test/DriverTest/NullReferenceFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DriverTest/NullReferenceFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/DriverTest/NullReferenceFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -24,28 +24,21 @@
/// but all properties were null.
/// </remarks>
/// TODO: I think this fixture is redundant now due to the QueryTest fixtures, just mark it so that it catches the new exception type for now
- [Test, ExpectedException(typeof(QueryException))]
+ [Test]
public void NoParameterNameNullReference()
{
ISession s = null;
try
{
s = OpenSession();
- Console.WriteLine("about to run query");
IQuery q = s.CreateQuery("from Simple s where s.Name = :missing");
Assert.IsNotNull(q);
q.List();
}
- catch (ADOException ae)
+ catch (QueryException ae)
{
- Assert.IsTrue(ae.InnerException is QueryException);
- Assert.IsTrue(ae.InnerException.Message.StartsWith("No value assigned to parameter"));
+ Assert.IsTrue(ae.Message.StartsWith("Not all named parameters have been set"));
}
- catch (Exception e)
- {
- Console.WriteLine(e.ToString());
- throw;
- }
finally
{
s.Close();
Modified: trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Multi/MultiRepresentationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Multi/MultiRepresentationFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Multi/MultiRepresentationFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Xml;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.EntityModeTest.Multi
{
Modified: trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Accessors/XmlAccessorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Accessors/XmlAccessorFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Accessors/XmlAccessorFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Mapping;
using NHibernate.Properties;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.EntityModeTest.Xml.Accessors
{
Modified: trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Basic/XmlFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Basic/XmlFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Xml/Basic/XmlFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -5,7 +5,6 @@
using NHibernate.Criterion;
using NHibernate.Transform;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using Environment=NHibernate.Cfg.Environment;
namespace NHibernate.Test.EntityModeTest.Xml.Basic
Modified: trunk/nhibernate/src/NHibernate.Test/Events/Collections/AbstractCollectionEventFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Events/Collections/AbstractCollectionEventFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Events/Collections/AbstractCollectionEventFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -4,7 +4,6 @@
using NHibernate.Event;
using NHibernate.Test.Events.Collections.Association.Bidirectional.ManyToMany;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Events.Collections
{
Modified: trunk/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -71,7 +71,6 @@
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void MisspelledPropertyWithNormalizedEntityPersister()
{
using (ISession session = factory.OpenSession())
@@ -79,7 +78,7 @@
CreateObjects(typeof(Multi), session);
ICriterion expression = Expression.Eq("MisspelledProperty", DateTime.Now);
- expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>());
+ Assert.Throws<QueryException>(() =>expression.ToSqlString(criteria, criteriaQuery, new CollectionHelper.EmptyMapClass<string, IFilter>()));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Extendshbm/ExtendsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Extendshbm/ExtendsFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Extendshbm/ExtendsFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,5 @@
using NHibernate.Cfg;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Extendshbm
{
Modified: trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,5 @@
using System.Collections;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Extralazy
{
Modified: trunk/nhibernate/src/NHibernate.Test/FilterTest/FilterConfig.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/FilterTest/FilterConfig.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/FilterTest/FilterConfig.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -55,7 +55,6 @@
[Test]
- [ExpectedException(typeof(HibernateException))]
public void TestFilterThrowsWithNoParameterSet()
{
Configuration cfg = new Configuration();
@@ -65,7 +64,7 @@
ISession session = factory.OpenSession();
IFilter filter = session.EnableFilter("LiveFilter");
- filter.Validate();
+ Assert.Throws<HibernateException>(() => filter.Validate());
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.HQL.Ast
{
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/HQLFunctions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/HQLFunctions.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/HQLFunctions.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Dialect;
using NHibernate.Dialect.Function;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.Hql
{
@@ -186,7 +185,7 @@
}
}
- [Test, ExpectedException(typeof(QueryException))]
+ [Test]
public void AggregateSumNH1100()
{
using (ISession s = OpenSession())
@@ -199,7 +198,7 @@
}
using (ISession s = OpenSession())
{
- s.CreateQuery("select distinct new SummaryItem(a.Description, sum(BodyWeight)) from Animal a").List<SummaryItem>();
+ Assert.Throws<QueryException>(() => s.CreateQuery("select distinct new SummaryItem(a.Description, sum(BodyWeight)) from Animal a").List<SummaryItem>());
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/SqlCommentsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/SqlCommentsFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/SqlCommentsFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System.Collections;
using NHibernate.Cfg;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.HQL
{
Modified: trunk/nhibernate/src/NHibernate.Test/IdGen/Enhanced/SequenceStyleConfigUnitFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/Enhanced/SequenceStyleConfigUnitFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/Enhanced/SequenceStyleConfigUnitFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using NHibernate.Id.Enhanced;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.IdGen.Enhanced
{
Modified: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,5 @@
using System.Collections;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.IdGen.NativeGuid
{
Modified: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Engine;
using NHibernate.Id;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.IdGen.NativeGuid
{
Modified: trunk/nhibernate/src/NHibernate.Test/IdTest/IdentifierGeneratorFactoryFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdTest/IdentifierGeneratorFactoryFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/IdTest/IdentifierGeneratorFactoryFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -12,10 +12,10 @@
/// caught with a bad class name passed in.
/// </summary>
[Test]
- [ExpectedException(typeof(IdentifierGenerationException), "Could not interpret id generator strategy: Guid")]
public void NonCreatableStrategy()
{
- IdentifierGeneratorFactory.Create("Guid", NHibernateUtil.Guid, null, new MsSql2000Dialect());
+ Assert.Throws<IdentifierGenerationException>(() => IdentifierGeneratorFactory.Create("Guid", NHibernateUtil.Guid, null, new MsSql2000Dialect()),
+ "Could not interpret id generator strategy: Guid");
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/CriteriaTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/CriteriaTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/CriteriaTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -117,14 +117,13 @@
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void CriteriaTypeMismatch()
{
using (ISession s = OpenSession())
{
- s.CreateCriteria(typeof(Master))
+ Assert.Throws<QueryException>(() =>s.CreateCriteria(typeof(Master))
.Add(Expression.Like("Details", "SomeString"))
- .List();
+ .List());
}
}
@@ -144,14 +143,13 @@
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void CriteriaCompositeProperty()
{
using (ISession s = OpenSession())
{
- s.CreateCriteria(typeof(Master))
+ Assert.Throws<QueryException>(() =>s.CreateCriteria(typeof(Master))
.Add(Expression.Eq("Details.I", 10))
- .List();
+ .List());
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1985,24 +1985,22 @@
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void VerifyParameterNamedMissing()
{
using (ISession s = OpenSession())
{
IQuery q = s.CreateQuery("select bar from Bar as bar where bar.X > :myX");
- q.List();
+ Assert.Throws<QueryException>(() =>q.List());
}
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void VerifyParameterPositionalMissing()
{
using (ISession s = OpenSession())
{
IQuery q = s.CreateQuery("select bar from Bar as bar where bar.X > ?");
- q.List();
+ Assert.Throws<QueryException>(() =>q.List());
}
}
@@ -2028,7 +2026,6 @@
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void VerifyParameterPositionalMissing2()
{
using (ISession s = OpenSession())
@@ -2036,7 +2033,7 @@
IQuery q = s.CreateQuery("select bar from Bar as bar where bar.String = ? or bar.String = ? or bar.String = ?");
q.SetParameter(0, "bull");
q.SetParameter(2, "shit");
- q.List();
+ Assert.Throws<QueryException>(() =>q.List());
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/MappingExceptions/MissingDefCtorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingExceptions/MissingDefCtorFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/MappingExceptions/MissingDefCtorFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -11,14 +11,14 @@
[TestFixture]
public class MissingDefCtorFixture
{
- [Test, ExpectedException(typeof(InstantiationException))]
+ [Test]
public void ClassMissingDefaultCtor()
{
// add a resource that doesn't exist
string resource = "NHibernate.Test.MappingExceptions.MissingDefCtor.hbm.xml";
Configuration cfg = new Configuration();
- cfg.AddResource(resource, this.GetType().Assembly);
- cfg.BuildSessionFactory();
+ cfg.AddResource(resource, this.GetType().Assembly);
+ Assert.Throws<InstantiationException>(() =>cfg.BuildSessionFactory());
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/MappingTest/ForeignKeyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingTest/ForeignKeyFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/MappingTest/ForeignKeyFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -7,7 +7,6 @@
public class ForeignKeyFixture
{
[Test]
- [ExpectedException(typeof(FKUnmatchingColumnsException))]
public void UnmatchingColumns()
{
Table primaryTable = new Table("pktable");
@@ -38,7 +37,7 @@
fk.Table = fkTable;
fk.ReferencedTable = primaryTable;
- fk.AlignColumns();
+ Assert.Throws<FKUnmatchingColumnsException>(() => fk.AlignColumns());
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHAssert.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHAssert.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHAssert.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,8 @@
using System;
-using NHibernate.Test.Assertions;
+using System.Reflection;
+using System.Text;
using NUnit.Framework;
+using System.Collections.Generic;
namespace NHibernate.Test
{
@@ -15,7 +17,7 @@
public static void HaveSerializableAttribute(System.Type clazz, string message, params object[] args)
{
- Assert.DoAssert(new HaveSerializableAttributeAsserter(clazz, message, args));
+ Assert.That(clazz, Has.Attribute<SerializableAttribute>(), message, args);
}
public static void InheritedAreMarkedSerializable(System.Type clazz)
@@ -25,7 +27,20 @@
public static void InheritedAreMarkedSerializable(System.Type clazz, string message, params object[] args)
{
- Assert.DoAssert(new InheritedAreMarkedSerializable(clazz, message, args));
+ var sb = new StringBuilder();
+ int failedCount = 0;
+ Assembly nhbA = Assembly.GetAssembly(clazz);
+ IList<System.Type> types = ClassList(nhbA, clazz);
+ foreach (System.Type tp in types)
+ {
+ object[] atts = tp.GetCustomAttributes(typeof(SerializableAttribute), false);
+ if (atts.Length == 0)
+ {
+ sb.AppendLine(string.Format(" class {0} is not marked as Serializable", tp.FullName));
+ failedCount++;
+ }
+ }
+ Assert.That(failedCount, Is.EqualTo(0));
}
public static void IsSerializable(object obj)
@@ -35,9 +50,23 @@
public static void IsSerializable(object obj, string message, params object[] args)
{
- Assert.DoAssert(new IsSerializable(obj, message, args));
+ Assert.That(obj, Is.BinarySerializable, message, args);
}
#endregion
+ private static IList<System.Type> ClassList(Assembly assembly, System.Type type)
+ {
+ IList<System.Type> result = new List<System.Type>();
+ if (assembly != null)
+ {
+ System.Type[] types = assembly.GetTypes();
+ foreach (System.Type tp in types)
+ {
+ if (tp != type && type.IsAssignableFrom(tp) && !tp.IsInterface)
+ result.Add(tp);
+ }
+ }
+ return result;
+ }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Docs/Associations/BiM21/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Docs/Associations/BiM21/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Docs/Associations/BiM21/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -46,7 +46,6 @@
}
[Test]
- [ExpectedException(typeof(PropertyValueException))]
public void TestErrorUsage()
{
using (ISession session = OpenSession())
@@ -59,7 +58,7 @@
fred.Address = flinstoneWay;
wilma.Address = flinstoneWay;
- session.Save(fred);
+ Assert.Throws<PropertyValueException>(() => session.Save(fred));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/EmptyMappingsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/EmptyMappingsFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/EmptyMappingsFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -30,13 +30,13 @@
}
}
- [Test, ExpectedException(typeof(ObjectDisposedException))]
+ [Test]
public void ReconnectAfterClose()
{
using (ISession s = OpenSession())
{
s.Close();
- s.Reconnect();
+ Assert.Throws<ObjectDisposedException>(() => s.Reconnect());
}
}
@@ -56,11 +56,11 @@
}
}
- [Test, ExpectedException(typeof(ArgumentNullException))]
+ [Test]
public void NullInterceptor()
{
IInterceptor nullInterceptor = null;
- sessions.OpenSession(nullInterceptor).Close();
+ Assert.Throws<ArgumentNullException>(() => sessions.OpenSession(nullInterceptor).Close());
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FallbackFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FallbackFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FallbackFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -5,7 +5,6 @@
using NHibernate.Driver;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using Environment=NHibernate.Cfg.Environment;
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/LazyLoadBugTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/LazyLoadBugTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/LazyLoadBugTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -14,7 +14,6 @@
}
[Test]
- [ExpectedException(typeof(LazyInitializationException))]
public void TestLazyLoad()
{
int parentId = 0;
@@ -45,7 +44,7 @@
// Because it maintains logic to maintain the collection during the property set it should
// tell NHibernate to skip the setter and access the field. If it doesn't, then throw
// a LazyInitializationException.
- int count = parent2.Children.Count;
+ Assert.Throws<LazyInitializationException>(() => { int count = parent2.Children.Count; });
}
}
finally
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using System.Text;
using Iesi.Collections.Generic;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1289
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1326/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1326/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1326/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,7 @@
using System;
using NHibernate.Cfg;
using NHibernate.Event;
+using NHibernate.Id;
using NHibernate.Transaction;
using NUnit.Framework;
@@ -16,14 +17,12 @@
[Test]
- [ExpectedException(typeof(InvalidOperationException),
- "Disconnect cannot be called while a transaction is in progress.")]
public void ShouldThrowIfCallingDisconnectInsideTransaction()
{
using (ISession s = OpenSession())
using (ITransaction tx = s.BeginTransaction())
{
- s.Disconnect();
+ Assert.Throws<InvalidOperationException>(() => s.Disconnect(), "Disconnect cannot be called while a transaction is in progress.");
tx.Commit();
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1349/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1349/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1349/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Text;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1349
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System;
using NHibernate.Criterion;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1413
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -2,7 +2,6 @@
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1443
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System;
using NHibernate.Proxy;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using System.Collections.Generic;
namespace NHibernate.Test.NHSpecificTest.NH1464
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1488/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1488/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1488/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,6 +1,5 @@
using System.Collections;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1488
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using NHibernate.Dialect;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1490
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -43,7 +43,6 @@
}
}
[Test]
- [ExpectedException(typeof(QueryException))]
public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestriction()
{
using (ISession session = OpenSession())
@@ -56,7 +55,7 @@
Property.ForName("Title").Eq("Spec"),
Property.ForName("Person").Eq(detached)
));
- IList<Document> results = criteria.List<Document>();
+ Assert.Throws<QueryException>(() => criteria.List<Document>());
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -66,32 +66,26 @@
}
[Test]
- [ExpectedException(typeof(NotSupportedException))]
public void ThrowsExceptionWhenSqlQueryIsGiven()
{
using (ISession session = OpenSession())
using (ITransaction tx = session.BeginTransaction())
{
ISQLQuery sqlQuery = session.CreateSQLQuery("select * from Document");
- IMultiQuery q = session
- .CreateMultiQuery()
- .Add(sqlQuery);
- q.List();
+ Assert.Throws<NotSupportedException>(() => session.CreateMultiQuery().Add(sqlQuery));
}
}
[Test]
- [ExpectedException(typeof(NotSupportedException))]
public void ThrowsExceptionWhenNamedSqlQueryIsGiven()
{
using (ISession session = OpenSession())
using (ITransaction tx = session.BeginTransaction())
{
- IMultiQuery q = session
+ Assert.Throws<NotSupportedException>(() =>session
.CreateMultiQuery()
- .AddNamedQuery("SampleSqlQuery");
- q.List();
+ .AddNamedQuery("SampleSqlQuery"));
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1515/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1515/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1515/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using NHibernate.Proxy;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1515
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Dialect;
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1521
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1533/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1533/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1533/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Text;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1533
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -4,7 +4,6 @@
using System.Text;
using NHibernate.Dialect;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1552
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1593
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1608/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1608/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1608/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using NHibernate.Util;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1608
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using NHibernate.Dialect;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1612
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1621/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1621/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1621/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1621
{
@@ -32,7 +31,7 @@
var nums = session.CreateQuery("from Nums b where b.Sum > 4").List<Nums>();
- Assert.That(nums, Has.Count(1));
+ Assert.That(nums.Count, Is.EqualTo(1));
Assert.That(nums[0].Sum, Is.EqualTo(7));
session.Delete("from Nums");
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1632
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,7 +1,6 @@
using System.Text;
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1635
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1640/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1640/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1640/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1640
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1675/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1675/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1675/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1675
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1693
{
@@ -43,7 +42,7 @@
var list = session.CreateQuery(q1)
.SetParameter("cat", 10)
.List<Invoice>();
- Assert.That(list, Has.Count(2));
+ Assert.That(list.Count, Is.EqualTo(2));
Assert.That(list[0].Num == 2 && list[0].Mode == "a");
Assert.That(list[1].Num == 4 && list[1].Mode == "a");
@@ -64,7 +63,7 @@
var list = session.CreateQuery(q1)
.SetParameter("cat", 10)
.List<Invoice>();
- Assert.That(list, Has.Count(2));
+ Assert.That(list.Count, Is.EqualTo(2));
Assert.That(list[0].Num == 2 && list[0].Mode == "a");
Assert.That(list[1].Num == 4 && list[1].Mode == "a");
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -2,7 +2,6 @@
using NHibernate.Criterion;
using NHibernate.Dialect;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1694
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Engine;
using NHibernate.Tool.hbm2ddl;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1710
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1713/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1713/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1713/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -2,7 +2,6 @@
using NHibernate.Dialect;
using NHibernate.Util;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1713
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1741/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1741/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1741/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -3,7 +3,6 @@
using NHibernate.Impl;
using NUnit.Framework;
using NHibernate.Util;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH1741
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -55,12 +55,12 @@
}
}
- [Test, ExpectedException(typeof(NHibernate.QueryException))]
+ [Test]
public void TokenUnknow()
{
using (ISession s = OpenSession())
{
- IList l = s.CreateQuery("select 123, notRecognized, f.Description from Foo f").List();
+ Assert.Throws<QueryException>(() =>s.CreateQuery("select 123, notRecognized, f.Description from Foo f").List());
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH350/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH350/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH350/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -13,7 +13,7 @@
// We pass an Int32 id to Load and expect an exception, since the class
// uses Int64 ids.
- [Test, ExpectedException(typeof(TypeMismatchException))]
+ [Test]
public void Loading()
{
object parentId;
@@ -31,9 +31,7 @@
{
using (ISession session = OpenSession())
{
- SecurityDomain aDomain = (SecurityDomain) session.Load(typeof(SecurityDomain), 1);
- Assert.AreEqual("Name", aDomain.Name);
- Assert.IsTrue(aDomain.ChildDomains.Count > 0);
+ Assert.Throws<TypeMismatchException>(() => session.Load(typeof(SecurityDomain), 1));
}
}
finally
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH496/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH496/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH496/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -36,8 +36,7 @@
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
{
- obj = (WronglyMappedClass) s.Get(typeof(WronglyMappedClass), obj.Id);
- Assert.AreEqual(10, obj.SomeInt);
+ Assert.Throws<PropertyAccessException>(() => s.Get(typeof(WronglyMappedClass), obj.Id));
t.Commit();
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH593/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH593/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH593/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -6,16 +6,16 @@
[TestFixture]
public class Fixture : BugTestCase
{
- [Test, ExpectedException(typeof(QueryException))]
+ [Test]
public void Bug()
{
using (ISession session = OpenSession())
{
User user = new User("test");
user.UserId = 10;
- session.CreateCriteria(typeof(Blog))
+ Assert.Throws<QueryException>(() => session.CreateCriteria(typeof(Blog))
.Add(Expression.In("Users", new User[] {user}))
- .List();
+ .List());
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH606/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH606/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH606/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -26,13 +26,13 @@
[TestFixture]
public class Fixture
{
- [Test, ExpectedException(typeof(MappingException))]
+ [Test]
public void InvalidGenericMapping()
{
- ISessionFactory sf = new Configuration()
- .AddResource(typeof (Fixture).Namespace + ".Mapping.hbm.xml", typeof (Fixture).Assembly)
- .BuildSessionFactory();
- sf.Close();
+ Assert.Throws<MappingException>(
+ () =>
+ new Configuration().AddResource(typeof (Fixture).Namespace + ".Mapping.hbm.xml", typeof (Fixture).Assembly).
+ BuildSessionFactory());
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Fixture.cs 2009-05-02 05:10:00 UTC (rev 4223)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Fixture.cs 2009-05-02 21:53:39 UTC (rev 4224)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
namespace NHibernate.Test.NHSpecificTest.NH662
{
Modified: trunk/nhiber...
[truncated message content] |
