Fixed unit tests failing on build server.

Prepare for SemVer versioning to be generated on AppVeyor.
natsnudasoft · Sep 6, 2016 · 0edf270 · 0edf270
1 parent 4c70689
commit 0edf270
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ StyleCop.Cache
 bin
 obj
 /OpenCover
-/test/unit/TestResult.xml
-/test/unit/coverage
-/test/unit/results.xml
+/tools/TestResult.xml
+/tools/coverage
+/tools/results.xml
+/tools/coverage.xml
diff --git a/AssemblyInfoCommon.cs b/AssemblyInfoCommon.cs
@@ -1,4 +1,4 @@
-// <copyright file="AssemblyInfoCommon.cs" company="natsnudasoft">
+// <copyright file="AssemblyInfoCommon.cs" company="natsnudasoft">
 // Copyright (c) Adrian John Dunstan. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,8 @@
 [assembly: NeutralResourcesLanguage("en-GB")]
 [assembly: AssemblyCompany("natsnudasoft")]
 [assembly: AssemblyCopyright("Copyright © Adrian John Dunstan 2016")]
-[assembly: AssemblyVersion("0.1")]
-[assembly: AssemblyFileVersion("0.1.16249.17")]
-[assembly: AssemblyInformationalVersion("0.1-beta")]
+
+// Version is generated on the build server.
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0")]
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,5 @@
+assembly-versioning-scheme: MajorMinor
+mode: ContinuousDelivery
+branches: {}
+ignore:
+  sha: []
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,20 @@
+environment:
+  COVERALLS_REPO_TOKEN:
+    secure: 01/8Z8oeHBp0GEYJhobtRFiPM/ZUSmkRLgu+BmxV8kgNP752XYu78DTqZB7xct3w
+configuration: Release
+platform: Any CPU
+install:
+  - choco install gitversion.portable -y
+before_build:
+  - cmd: nuget restore
+  - ps: gitversion /l console /output buildserver /updateassemblyinfo ..\AssemblyInfoCommon.cs  /b (get-item env:APPVEYOR_REPO_BRANCH).Value
+build:
+  project: AdiePlayground.sln
+  verbosity: minimal
+after_test:
+  - cmd: packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-filter:+[*]* -[Mehdime.Entity]* -[*Tests]*" -target:packages\NUnit.ConsoleRunner.3.4.1\tools\nunit3-console.exe -targetargs:test\unit\unit-tests.nunit -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*Designer.cs -output:coverage.xml
+  - cmd: packages\coveralls.io.1.3.4\tools\coveralls.net.exe --opencover coverage.xml
+cache:
+  - packages -> **\packages.config
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
diff --git a/src/AdiePlayground/AdiePlayground.csproj b/src/AdiePlayground/AdiePlayground.csproj
@@ -29,13 +29,6 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <AssemblyVersion>0.1.16249.17</AssemblyVersion>
-    <PrimaryVersionType>AssemblyFileVersionAttribute</PrimaryVersionType>
-    <AssemblyInfoFilePath>..\..\AssemblyInfoCommon.cs</AssemblyInfoFilePath>
-    <UpdateAssemblyVersion>False</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyFileVersionSettings>None.None.DateStamp.Increment</AssemblyFileVersionSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/DbContextScope-master/Mehdime.Entity/Mehdime.Entity.csproj b/src/DbContextScope-master/Mehdime.Entity/Mehdime.Entity.csproj
@@ -39,7 +39,7 @@
     <NoWarn>
     </NoWarn>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>

diff --git a/test/unit/AdiePlayground.CommonTests/Iso3166CountryTests.cs b/test/unit/AdiePlayground.CommonTests/Iso3166CountryTests.cs
@@ -29,14 +29,15 @@ namespace AdiePlayground.CommonTests
     public class Iso3166CountryTests
     {
         private const string ConstructorCountryCodeParam = "countryCode";
+        private const string RegionInfoNameParam = "name";
 
         private static readonly IEnumerable<string> InvalidCountryCodes =
             new[] { "Aa", "AA", "aa", string.Empty, "AAAA" };
 
         private static readonly IEnumerable<KeyValuePair<string, string>> ValidCountries =
             new[]
             {
-                new KeyValuePair<string, string>("GB", "United Kingdom"),
+                new KeyValuePair<string, string>("gB", "United Kingdom"),
                 new KeyValuePair<string, string>("gb", "United Kingdom"),
                 new KeyValuePair<string, string>("Gb", "United Kingdom"),
                 new KeyValuePair<string, string>("PA", "Panama"),
@@ -47,9 +48,6 @@ public class Iso3166CountryTests
         private static readonly IEnumerable<KeyValuePair<string, string>> ValidCountriesNoRegion =
             new[]
             {
-                new KeyValuePair<string, string>("AX", "Åland Islands"),
-                new KeyValuePair<string, string>("KP", "Korea"),
-                new KeyValuePair<string, string>("MG", "Madagascar"),
                 new KeyValuePair<string, string>("ZZ", "Unknown")
             };
 
@@ -63,9 +61,6 @@ public class Iso3166CountryTests
         {
             var ex = Assert.Throws<ArgumentException>(() => new Iso3166Country(countryCode));
             Assert.That(ex.ParamName, Is.EqualTo(ConstructorCountryCodeParam));
-            Assert.That(
-                ex.Message,
-                Does.StartWith(Common.Properties.Resources.Iso3166CountryCodeInvalid));
         }
 
         /// <summary>
@@ -76,9 +71,6 @@ public void Constructor_NullCountryCode_ArgumentNullException()
         {
             var ex = Assert.Throws<ArgumentNullException>(() => new Iso3166Country(null));
             Assert.That(ex.ParamName, Is.EqualTo(ConstructorCountryCodeParam));
-            Assert.That(
-                ex.Message,
-                Does.StartWith(Common.Properties.Resources.Iso3166CountryCodeInvalid));
         }
 
         /// <summary>
@@ -125,10 +117,7 @@ public void Constructor_NullCountryCode_ArgumentNullException()
             Assert.That(
                 country.CountryName,
                 Is.EqualTo(countryCode.Value).And.EqualTo(countryName));
-            Assert.That(ex.Message, Is.EqualTo(string.Format(
-                CultureInfo.InvariantCulture,
-                Properties.Resources.UnsupportedRegionInfo,
-                upperCountryCode)));
+            Assert.That(ex.ParamName, Is.EqualTo(RegionInfoNameParam));
         }
     }
 }
diff --git a/test/unit/AdiePlayground.CommonTests/packages.config b/test/unit/AdiePlayground.CommonTests/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net462" />
   <package id="codecracker.CSharp" version="1.0.0" targetFramework="net462" />
+  <package id="coveralls.io" version="1.3.4" targetFramework="net462" />
   <package id="Menees.Analyzers" version="1.1.1.0" targetFramework="net462" />
   <package id="Moq" version="4.5.21" targetFramework="net462" />
   <package id="NUnit" version="3.4.1" targetFramework="net462" />

diff --git a/test/unit/AdiePlayground.DataTests/Services/ConnectionStringDbContextFactoryTests.cs b/test/unit/AdiePlayground.DataTests/Services/ConnectionStringDbContextFactoryTests.cs
@@ -38,9 +38,6 @@ public void Constructor_NullConnectionStringFactory_CreateContextCalled()
             var ex = Assert.Throws<ArgumentNullException>(
                 () => new ConnectionStringDbContextFactory(null));
             Assert.That(ex.ParamName, Is.EqualTo(ConstructorConnectionStringFactoryParam));
-            Assert.That(
-                ex.Message,
-                Does.StartWith(Data.Properties.Resources.ConnectionStringFactoryInvalid));
         }
     }
 }
diff --git a/test/unit/AdiePlayground.DataTests/Services/ContextServiceTests.cs b/test/unit/AdiePlayground.DataTests/Services/ContextServiceTests.cs
@@ -72,9 +72,6 @@ public void Constructor_NullDbContextScopeFactory_ArgumentNullException()
         {
             var ex = Assert.Throws<ArgumentNullException>(() => new ContextService(null));
             Assert.That(ex.ParamName, Is.EqualTo(ConstructorDbContextScopeFactoryParam));
-            Assert.That(
-                ex.Message,
-                Does.StartWith(Data.Properties.Resources.DbContextScopeFactoryInvalid));
         }
 
         /// <summary>

diff --git a/test/unit/AdiePlayground.DataTests/packages.config b/test/unit/AdiePlayground.DataTests/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net462" />
   <package id="codecracker.CSharp" version="1.0.0" targetFramework="net462" />
+  <package id="coveralls.io" version="1.3.4" targetFramework="net462" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net462" />
   <package id="Menees.Analyzers" version="1.1.1.0" targetFramework="net462" />
   <package id="Moq" version="4.5.21" targetFramework="net462" />

diff --git a/test/unit/run-test-reports.bat b/test/unit/run-test-reports.bat
diff --git a/test/unit/unit-tests.nunit b/test/unit/unit-tests.nunit
@@ -0,0 +1,11 @@
+<NUnitProject>
+  <Settings activeconfig="Release"/>
+  <Config name="Debug">
+    <assembly path="AdiePlayground.CommonTests\bin\Debug\AdiePlayground.CommonTests.dll"/>
+    <assembly path="AdiePlayground.DataTests\bin\Debug\AdiePlayground.DataTests.dll"/>
+  </Config>
+  <Config name="Release">
+    <assembly path="AdiePlayground.CommonTests\bin\Release\AdiePlayground.CommonTests.dll"/>
+    <assembly path="AdiePlayground.DataTests\bin\Release\AdiePlayground.DataTests.dll"/>
+  </Config>
+</NUnitProject>
diff --git a/tools/run-test-reports.bat b/tools/run-test-reports.bat
@@ -0,0 +1,3 @@
+..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-filter:+[*]* -[Mehdime.Entity]* -[*Tests]*" -target:..\packages\NUnit.ConsoleRunner.3.4.1\tools\nunit3-console.exe -targetargs:..\test\unit\unit-tests.nunit -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*Designer.cs -output:coverage.xml && ^
+..\packages\ReportGenerator.2.4.5.0\tools\ReportGenerator.exe -reports:results.xml -targetdir:coverage && ^
+start coverage\index.htm