NH-3900 - Update all obsolete NUnit constraints.

Author: ngbrown

src/NHibernate.Test.Linq/Linq/ByMethod/GroupByTests.cs

@@ -63,7 +63,7 @@ into g
 								  select g.Key).ToList();
 
 				Assert.That(orders.Count, Is.EqualTo(481));
-				Assert.That(Regex.Replace(spy.GetWholeLog(), @"\s+", " "), Is.StringContaining("group by order0_.OrderDate"));
+				Assert.That(Regex.Replace(spy.GetWholeLog(), @"\s+", " "), Does.Contain("group by order0_.OrderDate"));
 			}
 		}
 

src/NHibernate.Test.Linq/Linq/LoggingTests.cs

@@ -23,7 +23,7 @@ public void PageBetweenProjections()
 
 				const string expected =
 					"Expression (partially evaluated): value(NHibernate.Linq.NhQueryable`1[NHibernate.DomainModel.Northwind.Entities.Product]).Where(p => value(NHibernate.Linq.NhQueryable`1[NHibernate.DomainModel.Northwind.Entities.Product]).Where(p => (p.ProductId > 5)).Contains(p)).Skip(5).Take(10)";
-				Assert.That(logtext, Is.StringContaining(expected));
+				Assert.That(logtext, Does.Contain(expected));
 			}
 		}
 
@@ -50,7 +50,7 @@ public void CanLogLinqExpressionWithoutInitializingContainedProxy()
 				const string expectedLog =
 					"Expression (partially evaluated): value(NHibernate.Linq.NhQueryable`1[NHibernate.DomainModel.Northwind.Entities.Product])" + 
 					".Where(product => (product == Product#1)).Count()";
-				Assert.That(actualLog, Is.StringContaining(expectedLog));
+				Assert.That(actualLog, Does.Contain(expectedLog));
 
 				// And verify that the proxy in the expression wasn't initialized.
 				Assert.That(NHibernateUtil.IsInitialized(productProxy), Is.False,

src/NHibernate.Test.Linq/Linq/WhereTests.cs

@@ -753,7 +753,7 @@ public void CanUseCompareInQueryWithNonConstantZero()
 				// This should generate SQL with some nested case expressions - it should not be
 				// simplified.
 				string wholeLog = ls.GetWholeLog();
-				Assert.That(wholeLog, Is.StringContaining("when lower(product0_.ProductName)="));
+				Assert.That(wholeLog, Does.Contain("when lower(product0_.ProductName)="));
 			}
 		}
 
@@ -769,7 +769,7 @@ public void CanUseCompareInQuery(Expression<Func<Product, bool>> expression, int
 				Assert.That(result, Has.Count.EqualTo(expectedCount));
 
 				string wholeLog = ls.GetWholeLog();
-				Assert.That(wholeLog, expectCase ? Is.StringContaining("case") : Is.Not.StringContaining("case"));
+				Assert.That(wholeLog, expectCase ? Does.Contain("case") : Does.Not.Contain("case"));
 			}
 		}
 

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -177,9 +177,9 @@ public void SqlLog()
 					sessions.Statistics.Clear();
 					FillDb();
 					string logs = sl.GetWholeLog();
-					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);
+					Assert.That(logs, Does.Not.Contain("Adding to batch").IgnoreCase);
+					Assert.That(logs, Does.Contain("Batch command").IgnoreCase);
+					Assert.That(logs, Does.Contain("INSERT").IgnoreCase);
 				}
 			}
 
@@ -201,13 +201,13 @@ public void AbstractBatcherLog()
 					sessions.Statistics.Clear();
 					FillDb();
 					string logs = sl.GetWholeLog();
-					Assert.That(logs, Is.StringContaining("batch").IgnoreCase);
+					Assert.That(logs, Does.Contain("batch").IgnoreCase);
 					foreach (var loggingEvent in sl.Appender.GetEvents())
 					{
 						string message = loggingEvent.RenderedMessage;
 						if(message.ToLowerInvariant().Contains("insert"))
 						{
-							Assert.That(message, Is.StringContaining("batch").IgnoreCase);
+							Assert.That(message, Does.Contain("batch").IgnoreCase);
 						}
 					}
 				}
@@ -227,7 +227,7 @@ public void SqlLogShouldGetBatchCommandNotification()
 					sessions.Statistics.Clear();
 					FillDb();
 					string logs = sl.GetWholeLog();
-					Assert.That(logs, Is.StringContaining("Batch commands:").IgnoreCase);
+					Assert.That(logs, Does.Contain("Batch commands:").IgnoreCase);
 				}
 			}
 
@@ -257,8 +257,8 @@ public void AbstractBatcherLogFormattedSql()
 							{
 								if(sqlLine.Contains("p0"))
 								{
-									Assert.That(sqlLine, Is.StringContaining("p1"));
-									Assert.That(sqlLine, Is.StringContaining("p2"));
+									Assert.That(sqlLine, Does.Contain("p1"));
+									Assert.That(sqlLine, Does.Contain("p2"));
 								}
 							}
 						}
@@ -270,4 +270,4 @@ public void AbstractBatcherLogFormattedSql()
 			Cleanup();
 		}
 	}
-}
+}

src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs

@@ -28,9 +28,9 @@ public void UnableToLoadProxyFactoryFactory()
 			}
 			catch (HibernateByteCodeException e)
 			{
-				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"));
+				Assert.That(e.Message, Does.StartWith("Unable to load type"));
+				Assert.That(e.Message, Does.Contain("Possible causes"));
+				Assert.That(e.Message, Does.Contain("Confirm that your deployment folder contains"));
 			}
 		}
 
@@ -62,7 +62,7 @@ public void CantCreateProxyFactoryFactory()
 			}
 			catch (HibernateByteCodeException e)
 			{
-				Assert.That(e.Message,Is.StringStarting("Failed to create an instance of"));
+				Assert.That(e.Message,Does.StartWith("Failed to create an instance of"));
 			}
 		}
 
@@ -156,4 +156,4 @@ public void ShouldNotThrownAnExceptionWithTheSameTypeOfCollectionTypeFactory()
 			Assert.DoesNotThrow(() => bcp.SetCollectionTypeFactoryClass(typeof (Type.DefaultCollectionTypeFactory)));
 		}
 	}
-}
+}

src/NHibernate.Test/CacheTest/QueryKeyFixture.cs

@@ -114,15 +114,15 @@ public void ToStringWithFilters()
 			var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
 			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
-			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']",fk)));
+			Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}']",fk)));
 
 			filterName = "DescriptionEqualAndValueGT";
 			f = new FilterImpl(sessions.GetFilterDefinition(filterName));
 			f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
 			fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			fks = new HashSet<FilterKey> { fk };
 			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
-			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']", fk)));
+			Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}']", fk)));
 		}
 
 		[Test]
@@ -140,7 +140,7 @@ public void ToStringWithMoreFilters()
 
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk, fvk };
 			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
-			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
+			Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
 		}
 	}
-}
+}

src/NHibernate.Test/CfgTest/CustomBytecodeProviderTest.cs

@@ -55,7 +55,7 @@ public void WhenNoDefaultCtorThenThrow()
 		{
 			var properties = new Dictionary<string, string> { { Environment.PropertyBytecodeProvider, typeof(InvalidNoCtorByteCodeProvider).AssemblyQualifiedName } };
 			Assert.That(() => Environment.BuildBytecodeProvider(properties), Throws.TypeOf<HibernateByteCodeException>()
-																				   .And.InnerException.Message.ContainsSubstring("constructor was not found"));
+																				   .And.InnerException.Message.Contains("constructor was not found"));
 		}
 	}
-}
+}

src/NHibernate.Test/CfgTest/Loquacious/EntityCacheConfigurationFixture.cs

@@ -77,7 +77,7 @@ public void NotAllowRelatedCollections()
 			var exception =
 				Assert.Throws<ArgumentOutOfRangeException>(
 					() => configure.EntityCache<EntityToCache>(ce => ce.Collection(e => e.Relation.Elements, cc => { })));
-			Assert.That(exception.Message, Is.StringContaining("Collection not owned by"));
+			Assert.That(exception.Message, Does.Contain("Collection not owned by"));
 		}
 	}
-}
+}

src/NHibernate.Test/Component/Basic/ComponentWithUniqueConstraintTests.cs

@@ -84,9 +84,9 @@ public void CannotBePersistedWithNonUniqueValues()
 					});
 				Assert.That(exception.InnerException, Is.AssignableTo<DbException>());
 				Assert.That(exception.InnerException.Message,
-					Is.StringContaining("unique").IgnoreCase.And.StringContaining("constraint").IgnoreCase
-					.Or.StringContaining("duplicate entry").IgnoreCase);
+					Does.Contain("unique").IgnoreCase.And.Contains("constraint").IgnoreCase
+					.Or.Contains("duplicate entry").IgnoreCase);
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Events/PostEvents/PostUpdateFixture.cs

@@ -40,7 +40,7 @@ public void ImplicitFlush()
 						tx.Commit();
 					}
 				}
-				Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
+				Assert.That(ls.GetWholeLog(), Does.Contain(AssertOldStatePostListener.LogMessage));
 			}
 
 			DbCleanup();
@@ -69,7 +69,7 @@ public void ExplicitUpdate()
 						tx.Commit();
 					}
 				}
-				Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
+				Assert.That(ls.GetWholeLog(), Does.Contain(AssertOldStatePostListener.LogMessage));
 			}
 
 			DbCleanup();
@@ -107,7 +107,7 @@ public void WithDetachedObject()
 						tx.Commit();
 					}
 				}
-				Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
+				Assert.That(ls.GetWholeLog(), Does.Contain(AssertOldStatePostListener.LogMessage));
 			}
 
 			DbCleanup();
@@ -147,7 +147,7 @@ public void UpdateDetachedObject()
 						tx.Commit();
 					}
 				}
-				Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
+				Assert.That(ls.GetWholeLog(), Does.Contain(AssertOldStatePostListener.LogMessage));
 			}
 
 			DbCleanup();
@@ -186,7 +186,7 @@ public void UpdateDetachedObjectWithLock()
 						tx.Commit();
 					}
 				}
-				Assert.That(ls.GetWholeLog(), Is.StringContaining(AssertOldStatePostListener.LogMessage));
+				Assert.That(ls.GetWholeLog(), Does.Contain(AssertOldStatePostListener.LogMessage));
 			}
 
 			DbCleanup();
@@ -216,4 +216,4 @@ private void FillDb()
 			}
 		}
 	}
-}
+}