Merge pull request #362 from hazzik/NH-3725

NH-3725 - Remove SharpTestsEx

Author: hazzik

lib/net/SharpTestsEx.NUnit.dll

@@ -25,7 +25,6 @@
 			<include name="NHibernate.DomainModel.dll" />
 			<include name="NHibernate.dll" />
 			<include name="nunit.framework.dll" />
-			<include name="SharpTestsEx.NUnit.dll" />
  			<include name="System.Linq.Dynamic.dll" />
 		</assemblyfileset>
 		<resourcefileset id="project.resources" prefix="NHibernate.Test.VisualBasic" dynamicprefix="false">

lib/net/SharpTestsEx.NUnit.xml

@@ -15,7 +15,7 @@ public void NotConfiguredProxyFactoryFactory()
 		{
 			var bcp = new BytecodeProviderImpl();
 			IProxyFactoryFactory p = bcp.ProxyFactoryFactory;
-			p.Should().Be.InstanceOf<DefaultProxyFactoryFactory>();
+			Assert.That(p, Is.InstanceOf<DefaultProxyFactoryFactory>());
 		}
 
 		[Test]

lib/net/SharpTestsEx_License.txt

@@ -13,23 +13,23 @@ public class AccessorsSerializableTest
 		[Test, TestCaseSource("accessors")]
 		public void AllAccessorsAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
-			concreteAccessor.Should().Have.Attribute<SerializableAttribute>();
+			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] setters = typeof(ISetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(ISetter).Namespace && t.GetInterfaces().Contains(typeof(ISetter))).ToArray();
 
 		[Test, TestCaseSource("setters")]
 		public void AllSettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
-			concreteAccessor.Should().Have.Attribute<SerializableAttribute>();
+			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] getters = typeof(IGetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(IGetter).Namespace && t.GetInterfaces().Contains(typeof(IGetter))).ToArray();
 
 		[Test, TestCaseSource("getters")]
 		public void AllGettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
-			concreteAccessor.Should().Have.Attribute<SerializableAttribute>();
+			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 	}
 }

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.build

@@ -45,15 +45,15 @@ public void WhenSubscribedToBeforeBindThenRaiseEventForEachMapping()
 			var listOfCalls = new List<BindMappingEventArgs>();
 			var configuration = new Configuration();
 			configuration.DataBaseIntegration(x => x.Dialect<MsSql2008Dialect>());
-			configuration.BeforeBindMapping += (sender, args) => { sender.Should().Be.SameInstanceAs(configuration); listOfCalls.Add(args); };
+			configuration.BeforeBindMapping += (sender, args) => { Assert.That(sender, Is.SameAs(configuration)); listOfCalls.Add(args); };
 
 			configuration.AddXmlString(ProductLineMapping);
 			configuration.AddXmlString(ModelMapping);
 
-			listOfCalls.Count.Should().Be(2);
-			listOfCalls.Select(x => x.FileName).All(x => x.Satisfy(filename => filename != null));
-			listOfCalls.Select(x => x.Mapping).All(x => x.Satisfy(mappingDoc => mappingDoc != null));
-			listOfCalls.Select(x => x.Dialect).All(x => x.Satisfy(dialect => dialect.GetType() == typeof(MsSql2008Dialect)));
+			Assert.That(listOfCalls.Count, Is.EqualTo(2));
+			Assert.That(listOfCalls.Select(x => x.FileName).All(x => x != null), Is.True);
+			Assert.That(listOfCalls.Select(x => x.Mapping).All(x => x != null), Is.True);
+			Assert.That(listOfCalls.Select(x => x.Dialect).All(x => x.GetType() == typeof (MsSql2008Dialect)), Is.True);
 		}
 
 		[Test]
@@ -62,15 +62,15 @@ public void WhenSubscribedToAfterBindThenRaiseEventForEachMapping()
 			var listOfCalls = new List<BindMappingEventArgs>();
 			var configuration = new Configuration();
 			configuration.DataBaseIntegration(x => x.Dialect<MsSql2008Dialect>());
-			configuration.AfterBindMapping += (sender, args) => { sender.Should().Be.SameInstanceAs(configuration); listOfCalls.Add(args); };
+			configuration.AfterBindMapping += (sender, args) => { Assert.That(sender, Is.SameAs(configuration)); listOfCalls.Add(args); };
 
 			configuration.AddXmlString(ProductLineMapping);
 			configuration.AddXmlString(ModelMapping);
 
-			listOfCalls.Count.Should().Be(2);
-			listOfCalls.Select(x => x.FileName).All(x => x.Satisfy(filename => filename != null));
-			listOfCalls.Select(x => x.Mapping).All(x => x.Satisfy(mappingDoc => mappingDoc != null));
-			listOfCalls.Select(x => x.Dialect).All(x => x.Satisfy(dialect => dialect.GetType() == typeof(MsSql2008Dialect)));
+			Assert.That(listOfCalls.Count, Is.EqualTo(2));
+			Assert.That(listOfCalls.Select(x => x.FileName).All(x => x != null), Is.True);
+			Assert.That(listOfCalls.Select(x => x.Mapping).All(x => x != null), Is.True);
+			Assert.That(listOfCalls.Select(x => x.Dialect).All(x => x.GetType() == typeof(MsSql2008Dialect)), Is.True);
 		}
 	}
 }

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

@@ -29,7 +29,7 @@ public void InvalidConfig()
 		public void FromAppConfigTest()
 		{
 			IHibernateConfiguration hc = ConfigurationManager.GetSection("hibernate-configuration") as IHibernateConfiguration;
-			hc.ByteCodeProviderType.Should().Be("lcg");
+			Assert.That(hc.ByteCodeProviderType, Is.EqualTo("lcg"));
 			Assert.IsTrue(hc.UseReflectionOptimizer);
 			Assert.AreEqual("NHibernate.Test", hc.SessionFactory.Name);
 		}

src/NHibernate.Test/CfgTest/AccessorsSerializableTest.cs

@@ -34,29 +34,29 @@ public override IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, I
 		public void WhenNoShortCutUsedThenCanBuildBytecodeProvider()
 		{
 			var properties = new Dictionary<string, string> { { Environment.PropertyBytecodeProvider, typeof(MyByteCodeProvider).AssemblyQualifiedName } };
-			Executing.This(() => Environment.BuildBytecodeProvider(properties)).Should().NotThrow();
+			Assert.That(() => Environment.BuildBytecodeProvider(properties), Throws.Nothing);
 		}
 
 		[Test]
 		public void WhenNoShortCutUsedThenCanBuildInstanceOfConfiguredBytecodeProvider()
 		{
 			var properties = new Dictionary<string, string> { { Environment.PropertyBytecodeProvider, typeof(MyByteCodeProvider).AssemblyQualifiedName } };
-			Environment.BuildBytecodeProvider(properties).Should().Be.InstanceOf<MyByteCodeProvider>();
+			Assert.That(Environment.BuildBytecodeProvider(properties), Is.InstanceOf<MyByteCodeProvider>());
 		}
 
 		[Test]
 		public void WhenInvalidThenThrow()
 		{
 			var properties = new Dictionary<string, string> { { Environment.PropertyBytecodeProvider, typeof(InvalidByteCodeProvider).AssemblyQualifiedName } };
-			Executing.This(() => Environment.BuildBytecodeProvider(properties)).Should().Throw<HibernateByteCodeException>();
+			Assert.That(() => Environment.BuildBytecodeProvider(properties), Throws.TypeOf<HibernateByteCodeException>());
 		}
 
 		[Test]
 		public void WhenNoDefaultCtorThenThrow()
 		{
 			var properties = new Dictionary<string, string> { { Environment.PropertyBytecodeProvider, typeof(InvalidNoCtorByteCodeProvider).AssemblyQualifiedName } };
-			Executing.This(() => Environment.BuildBytecodeProvider(properties)).Should().Throw<HibernateByteCodeException>()
-				.And.Exception.InnerException.Message.Should().Contain("constructor was not found");
+			Assert.That(() => Environment.BuildBytecodeProvider(properties), Throws.TypeOf<HibernateByteCodeException>()
+																				   .And.InnerException.Message.ContainsSubstring("constructor was not found"));
 		}
 	}
 }

src/NHibernate.Test/CfgTest/ConfigurationAddMappingEvents.cs

@@ -39,29 +39,29 @@ public void FullConfiguration()
 													p.ProxyFactoryFactory<DefaultProxyFactoryFactory>();
 												});
 			configure.Mappings(m=>
-			                   	{
-			                   		m.DefaultCatalog = "MyCatalog";
-			                   		m.DefaultSchema = "MySche";
-			                   	});
+								{
+									m.DefaultCatalog = "MyCatalog";
+									m.DefaultSchema = "MySche";
+								});
 			configure.DataBaseIntegration(db =>
-			                              	{
-			                              		db.Dialect<MsSql2000Dialect>();
-			                              		db.KeywordsAutoImport = Hbm2DDLKeyWords.AutoQuote;
-			                              		db.Batcher<SqlClientBatchingBatcherFactory>();
-			                              		db.BatchSize = 15;
-			                              		db.ConnectionProvider<DebugConnectionProvider>();
-			                              		db.Driver<SqlClientDriver>();
-			                              		db.ConnectionReleaseMode = ConnectionReleaseMode.AfterTransaction;
-			                              		db.IsolationLevel = IsolationLevel.ReadCommitted;
-			                              		db.ConnectionString = "The connection string";
-			                              		db.AutoCommentSql = true;
-			                              		db.ExceptionConverter<SQLStateConverter>();
-			                              		db.PrepareCommands = true;
-			                              		db.Timeout = 10;
-			                              		db.MaximumDepthOfOuterJoinFetching = 11;
-			                              		db.HqlToSqlSubstitutions = "true 1, false 0, yes 'Y', no 'N'";
-			                              		db.SchemaAction = SchemaAutoAction.Validate;
-			                              	});
+											{
+												db.Dialect<MsSql2000Dialect>();
+												db.KeywordsAutoImport = Hbm2DDLKeyWords.AutoQuote;
+												db.Batcher<SqlClientBatchingBatcherFactory>();
+												db.BatchSize = 15;
+												db.ConnectionProvider<DebugConnectionProvider>();
+												db.Driver<SqlClientDriver>();
+												db.ConnectionReleaseMode = ConnectionReleaseMode.AfterTransaction;
+												db.IsolationLevel = IsolationLevel.ReadCommitted;
+												db.ConnectionString = "The connection string";
+												db.AutoCommentSql = true;
+												db.ExceptionConverter<SQLStateConverter>();
+												db.PrepareCommands = true;
+												db.Timeout = 10;
+												db.MaximumDepthOfOuterJoinFetching = 11;
+												db.HqlToSqlSubstitutions = "true 1, false 0, yes 'Y', no 'N'";
+												db.SchemaAction = SchemaAutoAction.Validate;
+											});
 
 			Assert.That(configure.Properties[Environment.SessionFactoryName], Is.EqualTo("SomeName"));
 			Assert.That(configure.Properties[Environment.CacheProvider],
@@ -102,7 +102,7 @@ public void FullConfiguration()
 			Assert.That(configure.Properties[Environment.MaxFetchDepth], Is.EqualTo("11"));
 			Assert.That(configure.Properties[Environment.QuerySubstitutions], Is.EqualTo("true 1, false 0, yes 'Y', no 'N'"));
 			Assert.That(configure.Properties[Environment.Hbm2ddlAuto], Is.EqualTo("validate"));
-			configure.Properties[Environment.LinqToHqlGeneratorsRegistry].Should().Be(typeof(DefaultLinqToHqlGeneratorsRegistry).AssemblyQualifiedName);
+			Assert.That(configure.Properties[Environment.LinqToHqlGeneratorsRegistry], Is.EqualTo(typeof(DefaultLinqToHqlGeneratorsRegistry).AssemblyQualifiedName));
 		}
 	}
 }