@@ -13,7 +13,7 @@ </Regular> </CodeCoverage> <Deployment> - <DeploymentItem filename="Tests\Maverick.Data.NHibernate.Tests\TestFiles\" outputDirectory="TestFiles" /> + <DeploymentItem filename="Libraries\SQLite\System.Data.SQLite.DLL" /> </Deployment> <NamingScheme baseName="CodeCoverageRun" useDefault="false" /> <TestTypeSpecific> CodeCoverageTestRun.testrunconfig @@ -1,4 +1,4 @@ -MaVeriCk is Copyright Andrew Nurse (2009): http://blog.vibrantcode.com +dMaVeriCk is Copyright Andrew Nurse (2009): http://blog.vibrantcode.com Microsoft Public License (Ms-PL) LICENSE.txt @@ -2,7 +2,7 @@ <TestRunConfiguration name="Local Test Run" id="50b16d07-7e3b-4c34-9812-ee41d4ffb78a" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006"> <Description>This is a default test run configuration for a local test run.</Description> <Deployment> - <DeploymentItem filename="Tests\Maverick.Data.NHibernate.Tests\TestFiles\" outputDirectory="TestFiles" /> + <DeploymentItem filename="Libraries\SQLite\System.Data.SQLite.DLL" /> </Deployment> <NamingScheme baseName="NormalTestRun" useDefault="false" /> <TestTypeSpecific> LocalTestRun.testrunconfig @@ -11,6 +11,7 @@ using System; using System.IO; +using System.Reflection; using FluentNHibernate.Cfg; using Maverick.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -19,15 +20,22 @@ using TestUtilities; namespace Maverick.Data.NHibernate.Tests { [TestClass] public class CoreMappingsTests { - private const string MappingFileOutputPath = @"TestOutput\NHibernate\Mappings"; - private const string MappingBaselinePath = @"TestFiles\NHibernate\MappingBaselines"; - + private const string TestFilesPath = "TestFiles"; + private const string MappingFileOutputPath = TestFilesPath + @"\Output\NHibernate\Mappings"; + private const string MappingBaselinePath = TestFilesPath + @"\Input\NHibernate\Baselines"; + private const string MappingBaselineResourceNamespace = MappingBaselineResourceAssembly+"TestFiles.NHibernate.MappingBaselines."; + private const string MappingBaselineResourceAssembly = "Maverick.Data.NHibernate.Tests."; + [TestMethod] public void CoreMappings_Generates_Correct_NHibernate_Mapping_Xml() { if(!Directory.Exists(MappingFileOutputPath)) { Directory.CreateDirectory(MappingFileOutputPath); } + if (!Directory.Exists(MappingBaselinePath)) { + Directory.CreateDirectory(MappingBaselinePath); + } + // Arrange MappingConfiguration configuration = new MappingConfiguration(); CoreMappings mappings = new CoreMappings(); @@ -43,10 +51,18 @@ namespace Maverick.Data.NHibernate.Tests { // Assert #if !GENERATE_BASELINES + foreach(string fullResourceName in Assembly.GetExecutingAssembly().GetManifestResourceNames()) { + if(fullResourceName.StartsWith(MappingBaselineResourceNamespace)) { + string asmRelativeName = fullResourceName.Substring(MappingBaselineResourceAssembly.Length); + string folderRelativeName = fullResourceName.Substring(MappingBaselineResourceNamespace.Length); + TestFileManager.ExtractTestFile(asmRelativeName, Path.Combine(MappingBaselinePath, folderRelativeName)); + } + } TestFileManager.CompareFilesAgainstBaseline(MappingFileOutputPath, MappingBaselinePath, "*.hbm.xml", (e, a) => { FileAssert.TextFilesAreEqual(e, a, TokenTransformer, "The mapping files did not match"); }); #endif + Directory.Delete(TestFilesPath, true); } private static string TokenTransformer(string arg) { Tests/Maverick.Data.NHibernate.Tests/CoreMappingsTests.cs @@ -109,14 +109,14 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <Content Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Module.hbm.xml" /> - <Content Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Page.hbm.xml" /> - <Content Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Portal.hbm.xml" /> - <Content Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.PortalPrefix.hbm.xml" /> + <EmbeddedResource Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Module.hbm.xml" /> + <EmbeddedResource Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Page.hbm.xml" /> + <EmbeddedResource Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.Portal.hbm.xml" /> + <EmbeddedResource Include="TestFiles\NHibernate\MappingBaselines\Maverick.Models.PortalPrefix.hbm.xml" /> </ItemGroup> <ItemGroup> <None Include="App.config" /> - <None Include="TestFiles\NHibernate\NHibernate.config" /> + <EmbeddedResource Include="TestFiles\NHibernate\NHibernate.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Tests/Maverick.Data.NHibernate.Tests/Maverick.Data.NHibernate.Tests.csproj @@ -17,11 +17,14 @@ using NHibernate.Connection; using NHibernate.Dialect; using TestUtilities; using TargetResources = Maverick.Data.NHibernate.Properties.Resources; +using System.IO; namespace Maverick.Data.NHibernate.Tests { [TestClass] public class NHibernateDataContextFactoryTests { - private const string NHibernateConfigurationFilePath = @"TestFiles\NHibernate\NHibernate.config"; + private const string TestFilesPath = "TestFiles"; + private const string NHibernateConfigurationFilePath = NHibernateConfigurationDirectory + "NHibernate.config"; + private const string NHibernateConfigurationDirectory = TestFilesPath + @"\NHibernate\"; [TestMethod] public void CreateDataContext_Guards_Against_Null_ConnectionSource() { @@ -71,8 +74,8 @@ namespace Maverick.Data.NHibernate.Tests { }); SetupMockSessionFactory(factory); - - + + // Act DataContext context = factory.CreateDataContext(); @@ -98,20 +101,26 @@ namespace Maverick.Data.NHibernate.Tests { [TestMethod] public void CreateSessionFactory_Correctly_Configures_NHibernate_SessionFactory() { // Arrange + ExtractConfigurationFile(); + NHibernateDataContextFactory factory = CreateFactory(null); factory.ConfigurationFilePath = NHibernateConfigurationFilePath; // Act ISessionFactory context = factory.CreateSessionFactory(); - + // Assert Assert.IsInstanceOfType(context.Dialect, typeof(SQLiteDialect)); Assert.IsInstanceOfType(context.ConnectionProvider, typeof(DriverConnectionProvider)); + + Directory.Delete("TestFiles", true); } [TestMethod] public void ConfigurationSource_Uses_Configuration_File_Path_If_Provided() { // Arrange + ExtractConfigurationFile(); + Configuration cfg = null; NHibernateDataContextFactory factory = CreateFactory(null); factory.ConfigurationFilePath = NHibernateConfigurationFilePath; @@ -128,6 +137,15 @@ namespace Maverick.Data.NHibernate.Tests { Assert.AreEqual("NHibernate.Driver.SQLite20Driver", cfg.Properties["connection.driver_class"]); Assert.AreEqual("TestConnectionSource", cfg.Properties["connection.connection_string_name"]); Assert.AreEqual("NHibernate.Dialect.SQLiteDialect", cfg.Properties["dialect"]); + + Directory.Delete("TestFiles", true); + } + + private static void ExtractConfigurationFile() { + if (!Directory.Exists(NHibernateConfigurationDirectory)) { + Directory.CreateDirectory(NHibernateConfigurationDirectory); + } + TestFileManager.ExtractTestFile("TestFiles.NHibernate.NHibernate.config", NHibernateConfigurationFilePath); } private static void SetupMockSessionFactory(NHibernateDataContextFactory factory) { @@ -159,7 +177,7 @@ namespace Maverick.Data.NHibernate.Tests { } private static NHibernateDataContextFactory CreateFactory(Func<Configuration> configurationSource, IList<MappingContributor> contributors) { - NHibernateDataContextFactory factory = new Mock<NHibernateDataContextFactory> {CallBase = true}.Object; + NHibernateDataContextFactory factory = new Mock<NHibernateDataContextFactory> { CallBase = true }.Object; factory.ConfigurationSource = configurationSource; factory.MappingContributors = contributors; Tests/Maverick.Data.NHibernate.Tests/NHibernateDataContextFactoryTests.cs @@ -199,6 +199,7 @@ namespace Maverick.Web.Tests { // Assert Assert.AreSame(expected, actual); + MaverickApplication.Routes = null; } private static void PrepareSetupMvcExtensionsTest() { Tests/Maverick.Web.Tests/MaverickApplicationTests.cs @@ -81,7 +81,7 @@ namespace TestUtilities { } public static Stream OpenTestFile(Assembly context, string resourceName) { - Assert.AreNotEqual("DotNetNuke.Integrity.Tests.Utilities", context.GetName().Name, "Test Utility assembly does not contain any test files, did you forget to provide the proper context when writing a custom utility function?"); + Assert.AreNotEqual("TestUtilities", context.GetName().Name, "Test Utility assembly does not contain any test files, did you forget to provide the proper context when writing a custom utility function?"); resourceName = String.Format("{0}.{1}", context.GetName().Name, resourceName); Stream strm = context.GetManifestResourceStream(resourceName); if (strm == null) { Tests/TestUtilities/TestFileManager.cs Tests/Maverick.Data.EntityFramework.Tests/EntityFrameworkDataContextFactoryTests.cs Tests/Maverick.Data.EntityFramework.Tests/EntityFrameworkDataContextTests.cs Tests/Maverick.Data.EntityFramework.Tests/Maverick.Data.EntityFramework.Tests.csproj Tests/Maverick.Data.EntityFramework.Tests/Properties/AssemblyInfo.cs 1b276594ce5a8e5bd76d250e9ea268a07504ce8c Andrew Nurse andrew@andrewnurse.net http://github.com/anurse/MaVeriCk/commit/e93f1317265d6b11b78690ffe92c052a0bacb96d e93f1317265d6b11b78690ffe92c052a0bacb96d 2009-04-26T11:59:48-07:00 2009-04-26T11:59:48-07:00 Tweaked tests to make them independent of deployed files 5759d2530d40b1ba1c81a7a53a8b8ffd99a9a220 Andrew Nurse andrew@andrewnurse.net