From c5ad14af4dd0c375c5488daac733a0715247e2c1 Mon Sep 17 00:00:00 2001
From: Matthew MacFarland <macfarmw@gmail.com>
Date: Tue, 24 May 2016 19:13:47 -0500
Subject: [PATCH] (GH-240) Trim version file contents

Added Trim to TextVerisonResolver class where it reads the version to remove any leading or trailing whitespace that may been added to the file.
---
 .../resolvers/TextVersionResolverSpecs.cs     | 57 +++++++++++++++++++
 .../roundhouse.tests/roundhouse.tests.csproj  |  1 +
 .../resolvers/TextVersionResolver.cs          |  2 +-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 product/roundhouse.tests/resolvers/TextVersionResolverSpecs.cs

diff --git a/product/roundhouse.tests/resolvers/TextVersionResolverSpecs.cs b/product/roundhouse.tests/resolvers/TextVersionResolverSpecs.cs
new file mode 100644
index 00000000..f9b58771
--- /dev/null
+++ b/product/roundhouse.tests/resolvers/TextVersionResolverSpecs.cs
@@ -0,0 +1,57 @@
+namespace roundhouse.tests.resolvers
+{
+    using System;
+    using bdddoc.core;
+    using developwithpassion.bdd.contexts;
+    using developwithpassion.bdd.mbunit;
+    using developwithpassion.bdd.mbunit.standard;
+    using developwithpassion.bdd.mbunit.standard.observations;
+    using roundhouse.infrastructure.filesystem;
+    using roundhouse.resolvers;
+    using Rhino.Mocks;
+
+    public class TextVersionResolverSpecs
+    {
+        public abstract class concern_for_textversion_resolver : observations_for_a_sut_with_a_contract<VersionResolver, TextVersionResolver>
+        {
+            [CLSCompliant(false)]
+            protected static VersionResolver the_resolver;
+        }
+
+        public abstract class concerns_using_a_fake_filesystem : concern_for_textversion_resolver
+        {
+            protected static FileSystemAccess the_filesystem;
+            protected static string the_versionfile;
+            private context c = () =>
+            {
+                the_filesystem = an<FileSystemAccess>();
+                the_versionfile = string.Format(@"{0}.txt", Guid.NewGuid());
+                provide_a_basic_sut_constructor_argument(the_filesystem);
+                provide_a_basic_sut_constructor_argument(the_versionfile);
+            };
+        }
+
+        [Concern(typeof(TextVersionResolver))]
+        public class when_asking_the_resolver_for_the_version_the_version_text_is_trimmed : concerns_using_a_fake_filesystem
+        {
+            private const string untrimmed = " 1.3.837.1342 \r\n";
+            private const string trimmed = "1.3.837.1342";
+            private static string result;
+            private context c =
+                () =>
+                {
+                    the_filesystem.Stub(x => x.file_exists(the_versionfile)).Return(true);
+                    the_filesystem.Stub(x => x.read_file_text(the_versionfile)).Return(untrimmed);
+                    the_filesystem.Stub(x => x.get_full_path(the_versionfile)).Return(the_versionfile);
+                };
+
+            private because b = () => { result = sut.resolve_version(); };
+
+            [Observation]
+            public void untrimmed_version_from_file_is_trimmed_when_resolved()
+            {
+                result.should_be_equal_to(trimmed);
+            }
+        }
+    }
+} 
\ No newline at end of file
diff --git a/product/roundhouse.tests/roundhouse.tests.csproj b/product/roundhouse.tests/roundhouse.tests.csproj
index 2a3d3216..831a7547 100644
--- a/product/roundhouse.tests/roundhouse.tests.csproj
+++ b/product/roundhouse.tests/roundhouse.tests.csproj
@@ -123,6 +123,7 @@
     <Compile Include="migrators\DefaultDatabaseMigratorSpecs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="infrastructure\filesystem\DotNetFileSystemAccessSpecs.cs" />
+    <Compile Include="resolvers\TextVersionResolverSpecs.cs" />
     <Compile Include="sqlsplitters\SplitterContext.cs" />
     <Compile Include="sqlsplitters\StatementSplitterSpecs.cs" />
     <Compile Include="TestExtensions.cs" />
diff --git a/product/roundhouse/resolvers/TextVersionResolver.cs b/product/roundhouse/resolvers/TextVersionResolver.cs
index 56420055..dd6f6656 100644
--- a/product/roundhouse/resolvers/TextVersionResolver.cs
+++ b/product/roundhouse/resolvers/TextVersionResolver.cs
@@ -31,7 +31,7 @@ public string resolve_version()
             {
                 try
                 {
-                    version = file_system.read_file_text(version_file);
+                    version = file_system.read_file_text(version_file).Trim();
                     Log.bound_to(this).log_an_info_event_containing(" Found version {0} from {1}.", version, version_file);
                 }
                 catch (Exception e)