Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5162] trunk/nhibernate/src/NHibernate.Test
|
From: <jul...@us...> - 2010-08-16 15:16:30
|
Revision: 5162
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5162&view=rev
Author: julian-maughan
Date: 2010-08-16 15:16:22 +0000 (Mon, 16 Aug 2010)
Log Message:
-----------
Replaced obsolete NUnit assertions in Tests, e.g. Text.Containing replaced by Is.StringContaining
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs
trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs
trunk/nhibernate/src/NHibernate.Test/CacheTest/QueryKeyFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs
trunk/nhibernate/src/NHibernate.Test/Events/PostEvents/PostUpdateFixture.cs
trunk/nhibernate/src/NHibernate.Test/FilterTest/ConfigFixture.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BulkManipulation.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1054/NH1054Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1069/ImproveLazyExceptionFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1182/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/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/NH1710/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1760/SampleTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1813/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2003/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs
trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.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/UtilityTest/BasicFormatterFixture.cs
Modified: trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -177,9 +177,9 @@
sessions.Statistics.Clear();
FillDb();
string logs = sl.GetWholeLog();
- Assert.That(logs, Text.DoesNotContain("Adding to batch").IgnoreCase);
- Assert.That(logs, Text.Contains("Batch command").IgnoreCase);
- Assert.That(logs, Text.Contains("INSERT").IgnoreCase);
+ Assert.That(logs, Is.Not.StringContaining("Adding to batch").IgnoreCase);
+ Assert.That(logs, Is.StringContaining("Batch command").IgnoreCase);
+ Assert.That(logs, Is.StringContaining("INSERT").IgnoreCase);
}
}
@@ -201,13 +201,13 @@
sessions.Statistics.Clear();
FillDb();
string logs = sl.GetWholeLog();
- Assert.That(logs, Text.Contains("batch").IgnoreCase);
+ Assert.That(logs, Is.StringContaining("batch").IgnoreCase);
foreach (var loggingEvent in sl.Appender.GetEvents())
{
string message = loggingEvent.RenderedMessage;
if(message.ToLowerInvariant().Contains("insert"))
{
- Assert.That(message, Text.Contains("batch").IgnoreCase);
+ Assert.That(message, Is.StringContaining("batch").IgnoreCase);
}
}
}
@@ -227,7 +227,7 @@
sessions.Statistics.Clear();
FillDb();
string logs = sl.GetWholeLog();
- Assert.That(logs, Text.Contains("Batch commands:").IgnoreCase);
+ Assert.That(logs, Is.StringContaining("Batch commands:").IgnoreCase);
}
}
@@ -257,8 +257,8 @@
{
if(sqlLine.Contains("p0"))
{
- Assert.That(sqlLine, Text.Contains("p1"));
- Assert.That(sqlLine, Text.Contains("p2"));
+ Assert.That(sqlLine, Is.StringContaining("p1"));
+ Assert.That(sqlLine, Is.StringContaining("p2"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -20,8 +20,8 @@
}
catch (HibernateByteCodeException e)
{
- Assert.That(e.Message, Text.StartsWith("The ProxyFactoryFactory was not configured"));
- Assert.That(e.Message, Text.Contains("Example"));
+ Assert.That(e.Message, Is.StringStarting("The ProxyFactoryFactory was not configured"));
+ Assert.That(e.Message, Is.StringContaining("Example"));
}
}
@@ -36,9 +36,9 @@
}
catch (HibernateByteCodeException e)
{
- Assert.That(e.Message, Text.StartsWith("Unable to load type"));
- Assert.That(e.Message, Text.Contains("Possible causes"));
- Assert.That(e.Message, Text.Contains("Confirm that your deployment folder contains"));
+ Assert.That(e.Message, Is.StringStarting("Unable to load type"));
+ Assert.That(e.Message, Is.StringContaining("Possible causes"));
+ Assert.That(e.Message, Is.StringContaining("Confirm that your deployment folder contains"));
}
}
@@ -70,7 +70,7 @@
}
catch (HibernateByteCodeException e)
{
- Assert.That(e.Message,Text.StartsWith("Failed to create an instance of"));
+ Assert.That(e.Message,Is.StringStarting("Failed to create an instance of"));
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/CacheTest/QueryKeyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CacheTest/QueryKeyFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/CacheTest/QueryKeyFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -115,7 +115,7 @@
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
ISet<FilterKey> fks = new HashedSet<FilterKey> { fk };
var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), (ISet)fks);
- Assert.That(qk.ToString(), Text.Contains(string.Format("filters: ['{0}']",fk)));
+ Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']",fk)));
filterName = "DescriptionEqualAndValueGT";
f = new FilterImpl(sessions.GetFilterDefinition(filterName));
@@ -123,7 +123,7 @@
fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
fks = new HashedSet<FilterKey> { fk };
qk = new QueryKey(sessions, SqlAll, new QueryParameters(), (ISet)fks);
- Assert.That(qk.ToString(), Text.Contains(string.Format("filters: ['{0}']", fk)));
+ Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']", fk)));
}
[Test]
@@ -141,7 +141,7 @@
ISet<FilterKey> fks = new HashedSet<FilterKey> { fk, fvk };
var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), (ISet)fks);
- Assert.That(qk.ToString(), Text.Contains(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
+ Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -61,7 +61,7 @@
{
Person person = new Person() { Name = null };
ICriterion criterion = ExpressionProcessor.ProcessExpression<Person>(p => p.Name == person.Name);
- Assert.That(criterion, Is.InstanceOfType<NullExpression>());
+ Assert.That(criterion, Is.InstanceOf<NullExpression>());
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/Events/PostEvents/PostUpdateFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Events/PostEvents/PostUpdateFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Events/PostEvents/PostUpdateFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -40,7 +40,7 @@
tx.Commit();
}
}
- Assert.That(ls.GetWholeLog(), Text.Contains(AssertOldStatePostListener.LogMessage));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
}
DbCleanup();
@@ -69,7 +69,7 @@
tx.Commit();
}
}
- Assert.That(ls.GetWholeLog(), Text.Contains(AssertOldStatePostListener.LogMessage));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
}
DbCleanup();
@@ -107,7 +107,7 @@
tx.Commit();
}
}
- Assert.That(ls.GetWholeLog(), Text.Contains(AssertOldStatePostListener.LogMessage));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
}
DbCleanup();
@@ -147,7 +147,7 @@
tx.Commit();
}
}
- Assert.That(ls.GetWholeLog(), Text.Contains(AssertOldStatePostListener.LogMessage));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
}
DbCleanup();
@@ -186,7 +186,7 @@
tx.Commit();
}
}
- Assert.That(ls.GetWholeLog(), Text.Contains(AssertOldStatePostListener.LogMessage));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
}
DbCleanup();
Modified: trunk/nhibernate/src/NHibernate.Test/FilterTest/ConfigFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/FilterTest/ConfigFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/FilterTest/ConfigFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -57,7 +57,7 @@
var cfg = GetConfiguration();
var e = Assert.Throws<MappingException>(() => cfg.AddResource("NHibernate.Test.FilterTest.WrongFilterDefInClass.hbm.xml", GetType().Assembly));
Assert.That(e.InnerException, Is.Not.Null);
- Assert.That(e.InnerException.Message, Text.StartsWith("no filter condition").IgnoreCase);
+ Assert.That(e.InnerException.Message, Is.StringStarting("no filter condition").IgnoreCase);
}
[Test]
@@ -93,7 +93,7 @@
cfg.AddXmlString(wrongClassMap);
cfg.AddXmlString(wrongFilterDef);
var e = Assert.Throws<MappingException>(cfg.BuildMappings);
- Assert.That(e.Message, Text.StartsWith("no filter condition").IgnoreCase);
+ Assert.That(e.Message, Is.StringStarting("no filter condition").IgnoreCase);
}
[Test]
@@ -103,8 +103,8 @@
var cfg = GetConfiguration();
cfg.AddResource("NHibernate.Test.FilterTest.SimpleFiltered.hbm.xml", GetType().Assembly);
var e = Assert.Throws<MappingException>(cfg.BuildMappings);
- Assert.That(e.Message, Text.StartsWith("filter-def for filter named"));
- Assert.That(e.Message, Text.Contains("was not found"));
+ Assert.That(e.Message, Is.StringStarting("filter-def for filter named"));
+ Assert.That(e.Message, Is.StringContaining("was not found"));
}
[Test]
@@ -197,7 +197,7 @@
var cfg = GetConfiguration();
var e = Assert.Throws<MappingException>(() => cfg.AddXmlString(filterDef));
Assert.That(e.InnerException, Is.Not.Null);
- Assert.That(e.InnerException.Message, Text.Contains("Duplicated filter-def"));
+ Assert.That(e.InnerException.Message, Is.StringContaining("Duplicated filter-def"));
}
[Test]
@@ -223,8 +223,8 @@
var cfg = GetConfiguration();
cfg.AddXmlString(classMap);
var e = Assert.Throws<MappingException>(()=>cfg.BuildSessionFactory());
- Assert.That(e.Message, Text.StartsWith("filter-def for filter named"));
- Assert.That(e.Message, Text.Contains("was not found"));
+ Assert.That(e.Message, Is.StringStarting("filter-def for filter named"));
+ Assert.That(e.Message, Is.StringContaining("was not found"));
}
[Test]
@@ -248,8 +248,8 @@
cfg.BuildSessionFactory();
var wholeLog = String.Join("\r\n", memoryAppender.GetEvents().Select(x => x.RenderedMessage).ToArray());
- Assert.That(wholeLog, Text.Contains("filter-def for filter named"));
- Assert.That(wholeLog, Text.Contains("was never used to filter classes nor collections."));
+ Assert.That(wholeLog, Is.StringContaining("filter-def for filter named"));
+ Assert.That(wholeLog, Is.StringContaining("was never used to filter classes nor collections."));
}
finally
{
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BulkManipulation.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BulkManipulation.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BulkManipulation.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -517,7 +517,7 @@
var e =
Assert.Throws<QueryException>(
() => s.CreateQuery("update Human set mother.name.initial = :initial").SetString("initial", "F").ExecuteUpdate());
- Assert.That(e.Message, Text.StartsWith("Implied join paths are not assignable in update"));
+ Assert.That(e.Message, Is.StringStarting("Implied join paths are not assignable in update"));
s.CreateQuery("delete Human where mother is not null").ExecuteUpdate();
s.CreateQuery("delete Human").ExecuteUpdate();
@@ -698,7 +698,7 @@
using (ISession s = OpenSession())
{
var e = Assert.Throws<QueryException>(() => s.CreateQuery("update Vehicle set owner = null where owner = 'Steve'").ExecuteUpdate());
- Assert.That(e.Message, Text.StartsWith("Left side of assigment should be a case sensitive property or a field"));
+ Assert.That(e.Message, Is.StringStarting("Left side of assigment should be a case sensitive property or a field"));
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -10,7 +10,7 @@
{
const string query = "select 123.5, s from SimpleClass s";
- Assert.That(GetSql(query), Text.StartsWith("select 123.5"));
+ Assert.That(GetSql(query), Is.StringStarting("select 123.5"));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -22,8 +22,8 @@
var dialect = new MsSql2005Dialect();
var tg = new TableGenerator();
tg.Configure(NHibernateUtil.Int64, new Dictionary<string, string> {{"where", customWhere}}, dialect);
- Assert.That(selectSql.GetValue(tg).ToString(), Text.Contains(customWhere));
- Assert.That(updateSql.GetValue(tg).ToString(), Text.Contains(customWhere));
+ Assert.That(selectSql.GetValue(tg).ToString(), Is.StringContaining(customWhere));
+ Assert.That(updateSql.GetValue(tg).ToString(), Is.StringContaining(customWhere));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -164,7 +164,7 @@
Property property = cm.GetProperty("SortedEmployee");
var col = (Mapping.Collection)property.Value;
- Assert.That(col.ComparerClassName, Text.StartsWith("NHibernate.Test.MappingTest.NonExistingComparator"));
+ Assert.That(col.ComparerClassName, Is.StringStarting("NHibernate.Test.MappingTest.NonExistingComparator"));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -50,7 +50,7 @@
Assert.AreEqual("1", person.ID);
Assert.AreEqual("John Doe", person.Name);
Assert.AreEqual(1, person.Properties.Count);
- Assert.IsInstanceOfType(typeof(ISet), person.Properties["Phones"]);
+ Assert.That(person.Properties["Phones"], Is.InstanceOf<ISet>());
Assert.IsTrue((person.Properties["Phones"] as ISet).Contains("555-1234"));
Assert.IsTrue((person.Properties["Phones"] as ISet).Contains("555-4321"));
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1054/NH1054Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1054/NH1054Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1054/NH1054Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -17,8 +17,7 @@
ISessionFactoryImplementor sessionFactory = (ISessionFactoryImplementor)configuration.BuildSessionFactory();
- Assert.IsInstanceOfType(typeof(DummyTransactionFactory),
- sessionFactory.Settings.TransactionFactory);
+ Assert.That(sessionFactory.Settings.TransactionFactory, Is.InstanceOf<DummyTransactionFactory>());
}
[Test]
@@ -27,8 +26,7 @@
Configuration configuration = new Configuration();
ISessionFactoryImplementor sessionFactory = (ISessionFactoryImplementor)configuration.BuildSessionFactory();
- Assert.IsInstanceOfType(typeof(NHibernate.Transaction.AdoNetWithDistributedTransactionFactory),
- sessionFactory.Settings.TransactionFactory);
+ Assert.That(sessionFactory.Settings.TransactionFactory, Is.InstanceOf<NHibernate.Transaction.AdoNetWithDistributedTransactionFactory>());
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1069/ImproveLazyExceptionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1069/ImproveLazyExceptionFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1069/ImproveLazyExceptionFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -26,8 +26,8 @@
var ex = Assert.Throws<LazyInitializationException>(() => n= le.Name);
Assert.That(ex.EntityName, Is.EqualTo(typeof (LazyE).FullName));
Assert.That(ex.EntityId, Is.EqualTo(1));
- Assert.That(ex.Message, Text.Contains(typeof(LazyE).FullName));
- Assert.That(ex.Message, Text.Contains("#1"));
+ Assert.That(ex.Message, Is.StringContaining(typeof(LazyE).FullName));
+ Assert.That(ex.Message, Is.StringContaining("#1"));
Console.WriteLine(ex.Message);
using (ISession s = OpenSession())
@@ -57,9 +57,9 @@
var ex = Assert.Throws<LazyInitializationException>(() => le.LazyC.GetEnumerator());
Assert.That(ex.EntityName, Is.EqualTo(typeof(LazyE).FullName));
Assert.That(ex.EntityId, Is.EqualTo(1));
- Assert.That(ex.Message, Text.Contains(typeof(LazyE).FullName));
- Assert.That(ex.Message, Text.Contains("#1"));
- Assert.That(ex.Message, Text.Contains(typeof(LazyE).FullName + ".LazyC"));
+ Assert.That(ex.Message, Is.StringContaining(typeof(LazyE).FullName));
+ Assert.That(ex.Message, Is.StringContaining("#1"));
+ Assert.That(ex.Message, Is.StringContaining(typeof(LazyE).FullName + ".LazyC"));
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -86,7 +86,7 @@
using (var ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
{
base.BuildSessionFactory();
- Assert.That(ls.GetWholeLog(), Text.Contains("Fake cache used"));
+ Assert.That(ls.GetWholeLog(), Is.StringContaining("Fake cache used"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -52,8 +52,8 @@
q.List();
}
string message = ls.GetWholeLog();
- Assert.That(message, Text.Contains("-- Comment with ' number 1"));
- Assert.That(message, Text.Contains("/* Comment with ' number 2 */"));
+ Assert.That(message, Is.StringContaining("-- Comment with ' number 1"));
+ Assert.That(message, Is.StringContaining("/* Comment with ' number 2 */"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1182/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1182/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1182/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -31,8 +31,8 @@
t.Commit();
}
string wholeLog = ls.GetWholeLog();
- Assert.That(wholeLog, Text.DoesNotContain("UPDATE ObjectA"));
- Assert.That(wholeLog, Text.Contains("UPDATE ObjectB"),"should create orphans");
+ Assert.That(wholeLog, Is.Not.StringContaining("UPDATE ObjectA"));
+ Assert.That(wholeLog, Is.StringContaining("UPDATE ObjectB"),"should create orphans");
}
using (ISession s = OpenSession())
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -17,11 +17,11 @@
if (Dialect.Dialect.GetDialect(cfg.Properties).SupportsIfExistsBeforeTableName)
- Assert.That(script, Text.Contains("drop table if exists nhibernate.dbo.Aclass"));
+ Assert.That(script, Is.StringContaining("drop table if exists nhibernate.dbo.Aclass"));
else
- Assert.That(script, Text.Contains("drop table nhibernate.dbo.Aclass"));
+ Assert.That(script, Is.StringContaining("drop table nhibernate.dbo.Aclass"));
- Assert.That(script, Text.Contains("create table nhibernate.dbo.Aclass"));
+ Assert.That(script, Is.StringContaining("create table nhibernate.dbo.Aclass"));
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -22,7 +22,7 @@
.SetParameter("filternull", !filter.HasValue)
.SetParameter("filterval", filter.HasValue ? filter.Value : 0).List<xchild>();
var message = ls.GetWholeLog();
- Assert.That(message, Text.Contains("xchild0_.ParentId=xparent1_.Id and (@p0=1 or xparent1_.A<@p1)"));
+ Assert.That(message, Is.StringContaining("xchild0_.ParentId=xparent1_.Id and (@p0=1 or xparent1_.A<@p1)"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -60,9 +60,9 @@
var scriptB = new StringBuilder();
new SchemaExport(cfg).Create(sl => scriptB.Append(sl), true);
var script = scriptB.ToString();
- Assert.That(script, Text.Contains("unique (A, C)"));
- Assert.That(script, Text.Contains("unique (B, C)"));
- Assert.That(script, Text.DoesNotContain("unique (C)"));
+ Assert.That(script, Is.StringContaining("unique (A, C)"));
+ Assert.That(script, Is.StringContaining("unique (B, C)"));
+ Assert.That(script, Is.Not.StringContaining("unique (C)"));
new SchemaExport(cfg).Drop(false, true);
}
@@ -94,8 +94,8 @@
var scriptB = new StringBuilder();
new SchemaExport(cfg).Create(sl => scriptB.Append(sl), true);
var script = scriptB.ToString();
- Assert.That(script, Text.Contains("create index AC on Entity (A, C)"));
- Assert.That(script, Text.Contains("create index BC on Entity (B, C)"));
+ Assert.That(script, Is.StringContaining("create index AC on Entity (A, C)"));
+ Assert.That(script, Is.StringContaining("create index BC on Entity (B, C)"));
new SchemaExport(cfg).Drop(false, true);
}
@@ -133,8 +133,8 @@
var scriptB = new StringBuilder();
new SchemaExport(cfg).Create(sl => scriptB.Append(sl), true);
var script = scriptB.ToString();
- Assert.That(script, Text.Contains("create index AC on Entity (A, C)"));
- Assert.That(script, Text.Contains("create index BC on Entity (B, C)"));
+ Assert.That(script, Is.StringContaining("create index AC on Entity (A, C)"));
+ Assert.That(script, Is.StringContaining("create index BC on Entity (B, C)"));
new SchemaExport(cfg).Drop(false, true);
}
@@ -166,8 +166,8 @@
var scriptB = new StringBuilder();
new SchemaExport(cfg).Create(sl => scriptB.Append(sl), true);
var script = scriptB.ToString();
- Assert.That(script, Text.Contains("create index IdxId1 on Entity (Id)"));
- Assert.That(script, Text.Contains("create index IdxId2 on Entity (Id)"));
+ Assert.That(script, Is.StringContaining("create index IdxId1 on Entity (Id)"));
+ Assert.That(script, Is.StringContaining("create index IdxId2 on Entity (Id)"));
new SchemaExport(cfg).Drop(false, true);
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1521/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -21,7 +21,7 @@
var sb = new StringBuilder(500);
su.Execute(x => sb.AppendLine(x), false, false);
string script = sb.ToString();
- Assert.That(script, Text.Contains("if exists (select * from dbo.sysobjects where id = object_id(N'nhibernate.dbo.Aclass') and OBJECTPROPERTY(id, N'IsUserTable') = 1)"));
+ Assert.That(script, Is.StringContaining("if exists (select * from dbo.sysobjects where id = object_id(N'nhibernate.dbo.Aclass') and OBJECTPROPERTY(id, N'IsUserTable') = 1)"));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1593/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -17,7 +17,7 @@
var su = new SchemaUpdate(cfg);
var sb = new StringBuilder(500);
su.Execute(x => sb.AppendLine(x), false);
- Assert.That(sb.ToString(), Text.Contains("create index test_index_name on TestIndex (Name)"));
+ Assert.That(sb.ToString(), Is.StringContaining("create index test_index_name on TestIndex (Name)"));
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -38,7 +38,7 @@
using (var tx = new TransactionScope())
{
var generator = sessions.GetIdentifierGenerator(typeof(Person).FullName);
- Assert.IsInstanceOfType(typeof(TableHiLoGenerator), generator);
+ Assert.That(generator, Is.InstanceOf<TableHiLoGenerator>());
using(var session = sessions.OpenSession())
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1635/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -45,7 +45,7 @@
{
var script = new StringBuilder();
new SchemaExport(cfg).Create(sl=> script.Append(sl) , true);
- Assert.That(script.ToString(), Text.DoesNotContain("LatestMessage"));
+ Assert.That(script.ToString(), Is.Not.StringContaining("LatestMessage"));
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -37,7 +37,7 @@
{
var script = new StringBuilder();
new SchemaExport(cfg).Create(sl => script.AppendLine(sl), true);
- Assert.That(script.ToString(), Text.Contains(expectedExportString));
+ Assert.That(script.ToString(), Is.StringContaining(expectedExportString));
new SchemaExport(cfg).Drop(false, true);
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1760/SampleTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1760/SampleTest.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1760/SampleTest.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -71,7 +71,7 @@
{
ICriteria c = session.CreateCriteria(typeof(TestClass));
IList<TestClass> retvalue = c.List<TestClass>();
- Assert.That(ls.GetWholeLog(), Text.DoesNotContain("join"));
+ Assert.That(ls.GetWholeLog(), Is.Not.StringContaining("join"));
criteriaCount = retvalue.Count;
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1813/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1813/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1813/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -26,8 +26,8 @@
{
s.Save(new EntityWithUnique { Id = 2, Description = "algo" });
var exception = Assert.Throws<GenericADOException>(t.Commit);
- Assert.That(exception.Message, Text.Contains("INSERT"), "should contain SQL");
- Assert.That(exception.Message, Text.Contains("#2"), "should contain id");
+ Assert.That(exception.Message, Is.StringContaining("INSERT"), "should contain SQL");
+ Assert.That(exception.Message, Is.StringContaining("#2"), "should contain id");
}
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
@@ -53,7 +53,7 @@
var e = s.Get<EntityWithUnique>(2);
e.Description = "algo";
var exception = Assert.Throws<GenericADOException>(t.Commit);
- Assert.That(exception.Message, Text.Contains("UPDATE"), "should contain SQL");
+ Assert.That(exception.Message, Is.StringContaining("UPDATE"), "should contain SQL");
}
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2003/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2003/Fixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2003/Fixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -22,7 +22,7 @@
new SchemaExport(cfg).Execute(s => script.AppendLine(s), false, false);
string wholeScript = script.ToString();
- Assert.That(wholeScript.ToLower(), Text.Contains("not null"));
+ Assert.That(wholeScript.ToLower(), Is.StringContaining("not null"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -506,23 +506,23 @@
}
}
- [Test]
- public void CanGetResultInAGenericList()
- {
- using (ISession s = OpenSession())
- {
- ICriteria getItems = s.CreateCriteria(typeof(Item));
- ICriteria countItems = s.CreateCriteria(typeof(Item))
- .SetProjection(Projections.RowCount());
+ [Test]
+ public void CanGetResultInAGenericList()
+ {
+ using (ISession s = OpenSession())
+ {
+ ICriteria getItems = s.CreateCriteria(typeof(Item));
+ ICriteria countItems = s.CreateCriteria(typeof(Item))
+ .SetProjection(Projections.RowCount());
- IMultiCriteria multiCriteria = s.CreateMultiCriteria()
- .Add(getItems) // we expect a non-generic result from this (ArrayList)
- .Add<int>(countItems); // we expect a generic result from this (List<int>)
- IList results = multiCriteria.List();
+ IMultiCriteria multiCriteria = s.CreateMultiCriteria()
+ .Add(getItems) // we expect a non-generic result from this (ArrayList)
+ .Add<int>(countItems); // we expect a generic result from this (List<int>)
+ IList results = multiCriteria.List();
- Assert.IsInstanceOfType(typeof(ArrayList), results[0]);
- Assert.IsInstanceOfType(typeof(List<int>), results[1]);
- }
- }
+ Assert.That(results[0], Is.InstanceOf<ArrayList>());
+ Assert.That(results[1], Is.InstanceOf<List<int>>());
+ }
+ }
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -485,23 +485,23 @@
RemoveAllItems();
}
- [Test]
- public void CanGetResultsInAGenericList()
- {
- using (ISession s = OpenSession())
- {
- IQuery getItems = s.CreateQuery("from Item");
- IQuery countItems = s.CreateQuery("select count(*) from Item");
+ [Test]
+ public void CanGetResultsInAGenericList()
+ {
+ using (ISession s = OpenSession())
+ {
+ IQuery getItems = s.CreateQuery("from Item");
+ IQuery countItems = s.CreateQuery("select count(*) from Item");
- IList results = s.CreateMultiQuery()
- .Add(getItems)
- .Add<long>(countItems)
- .List();
+ IList results = s.CreateMultiQuery()
+ .Add(getItems)
+ .Add<long>(countItems)
+ .List();
- Assert.IsInstanceOfType(typeof(ArrayList), results[0]);
- Assert.IsInstanceOfType(typeof(List<long>), results[1]);
- }
- }
+ Assert.That(results[0], Is.InstanceOf<ArrayList>());
+ Assert.That(results[1], Is.InstanceOf<List<long>>());
+ }
+ }
public class ResultTransformerStub : IResultTransformer
{
Modified: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTagFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTagFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTagFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -22,8 +22,8 @@
new SchemaExport(cfg).Execute(s => script.AppendLine(s), false, false);
string wholeScript = script.ToString();
- Assert.That(wholeScript, Text.Contains("default SYSTEM_USER"));
- Assert.That(wholeScript, Text.Contains("default 77"));
+ Assert.That(wholeScript, Is.StringContaining("default SYSTEM_USER"));
+ Assert.That(wholeScript, Is.StringContaining("default 77"));
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -44,7 +44,7 @@
}
catch (HibernateException e)
{
- Assert.That(e.Message, Text.StartsWith("Missing column: Name"));
+ Assert.That(e.Message, Is.StringStarting("Missing column: Name"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/UtilityTest/BasicFormatterFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/UtilityTest/BasicFormatterFixture.cs 2010-08-16 14:02:01 UTC (rev 5161)
+++ trunk/nhibernate/src/NHibernate.Test/UtilityTest/BasicFormatterFixture.cs 2010-08-16 15:16:22 UTC (rev 5162)
@@ -13,11 +13,11 @@
IFormatter formatter = new BasicFormatter();
string sql = @"INSERT INTO Table (Name, id) VALUES (@p0, @p1); @p0 = 'a'(b', @p1 = 1";
Assert.DoesNotThrow(() => formattedSql = formatter.Format(sql));
- Assert.That(formattedSql, Text.Contains("'a'(b'"));
+ Assert.That(formattedSql, Is.StringContaining("'a'(b'"));
sql = @"UPDATE Table SET Column = @p0;@p0 = '(')'";
Assert.DoesNotThrow(() => formattedSql = formatter.Format(sql));
- Assert.That(formattedSql, Text.Contains("'(')'"));
+ Assert.That(formattedSql, Is.StringContaining("'(')'"));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
