Merge branch 'NH-3679'

Author: oskarb

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1237,6 +1237,7 @@
     <Compile Include="TestDialects\MsSql2008TestDialect.cs" />
     <Compile Include="TestDialects\PostgreSQL82TestDialect.cs" />
     <Compile Include="TestDialects\SQLiteTestDialect.cs" />
+    <Compile Include="Tools\hbm2ddl\SchemaExportTests\ExportToFileFixture.cs" />
     <Compile Include="TransformTests\ImplementationOfEqualityTests.cs" />
     <Compile Include="TypesTest\CharClass.cs" />
     <Compile Include="TypesTest\CharClassFixture.cs" />

src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/ExportToFileFixture.cs

@@ -0,0 +1,44 @@
+using System.IO;
+using NHibernate.Tool.hbm2ddl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.Tools.hbm2ddl.SchemaExportTests
+{
+    public class ExportToFileFixture
+    {
+        [Test]
+        public void ExportToFileUsingSetOutputFileAndCreate()
+        {
+            var configuration = TestConfigurationHelper.GetDefaultConfiguration();
+
+            configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
+                                                                GetType().Assembly);
+            
+            var outputFileName = Path.GetTempFileName();
+            var export = new SchemaExport(configuration);
+            export.SetOutputFile(outputFileName);
+
+            export.Create(false, false);
+
+            Assert.IsTrue(File.Exists(outputFileName));
+            Assert.IsTrue(new FileInfo(outputFileName).Length > 0);
+        }
+
+        [Test]
+        public void ExportToFileUsingExecute()
+        {
+            var configuration = TestConfigurationHelper.GetDefaultConfiguration();
+
+            configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
+                                                                GetType().Assembly);
+            
+            var outputFileName = Path.GetTempFileName();
+            var export = new SchemaExport(configuration);
+
+            export.Execute(null, false, false, new StreamWriter(outputFileName));
+
+            Assert.IsTrue(File.Exists(outputFileName));
+            Assert.IsTrue(new FileInfo(outputFileName).Length > 0);
+        }
+    }
+}

src/NHibernate/Tool/hbm2ddl/SchemaExport.cs

@@ -344,7 +344,7 @@ public void Execute(Action<string> scriptAction, bool execute, bool justDrop, Te
 
 			try
 			{
-				if (fileOutput != null && outputFile != null)
+				if (fileOutput == null && outputFile != null)
 				{
 					fileOutput = new StreamWriter(outputFile);
 				}