Fixing test warnings for #44, upgrading test project for .NET 5

andmos · Jan 10, 2021 · 0361c48 · 0361c48
1 parent 387c09b
commit 0361c48
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
+FROM mcr.microsoft.com/dotnet/sdk:5.0 as builder
 
 ARG VERSION_SUFFIX
 

diff --git a/src/BikeshareClient/BikeshareClient/Helpers/SemanticVersion.cs b/src/BikeshareClient/BikeshareClient/Helpers/SemanticVersion.cs
@@ -48,9 +48,7 @@ private SemanticVersion(Version version, string specialVersion, string originalS
         {
             if (version == null)
             {
-                var foo = "bar";
-                throw new ArgumentNullException("version");
-
+                throw new ArgumentNullException("version");                
             }
             Version = NormalizeVersionValue(version);
             SpecialVersion = specialVersion ?? String.Empty;

diff --git a/src/BikeshareClient/TestBikeshareClient/TestBikeShareClient.cs b/src/BikeshareClient/TestBikeshareClient/TestBikeShareClient.cs
@@ -220,7 +220,7 @@ public async Task GetStationsStatusAsync_GivenCorrectBaseUrlWithGbfsDiscoveryFil
 
             var clientRespons = await client.GetStationsStatusAsync();
 
-            Assert.True(clientRespons.Any(s => s.Returning));
+            Assert.Contains(clientRespons, s => s.Returning);
         }
 
         [Theory]
@@ -234,7 +234,7 @@ public async Task GetStationsStatusAsync_GivenCorrectBaseUrlWithGbfsDiscoveryFil
 
             var clientRespons = await client.GetStationsStatusAsync();
 
-            Assert.True(clientRespons.Any(s => s.Renting));
+            Assert.Contains(clientRespons, s => s.Returning);
         }
 
         [Theory]
@@ -245,7 +245,7 @@ public async Task GetStationsStatusAsync_GivenCorrectBaseUrlWithGbfsDiscoveryFil
 
             var clientResponse = await client.GetStationsStatusAsync();
 
-            Assert.NotNull(clientResponse.FirstOrDefault().LastReported);
+            Assert.NotEqual(default(DateTime), clientResponse.FirstOrDefault().LastReported);
         }
 
         [Theory]
@@ -257,14 +257,14 @@ public async Task GetStationsStatusAsync_GivenCorrectBaseUrlWithGbfsDiscoveryFil
             var clientResponse = await client.GetStationsStatusAsync();
             var firstStationStatus = clientResponse.FirstOrDefault();
 
-            Assert.NotNull(firstStationStatus.LastReported);
+            Assert.NotEqual(default(DateTime), firstStationStatus.LastReported);
             Assert.NotEmpty(firstStationStatus.Id);
             Assert.True(firstStationStatus.Installed);
-            Assert.NotNull(firstStationStatus.BikesAvailable);
+            Assert.IsType<int>(firstStationStatus.BikesAvailable);
             Assert.IsType<bool>(firstStationStatus.Renting);
-            Assert.NotNull(firstStationStatus.BikesDisabled);
+            Assert.IsType<int>(firstStationStatus.BikesDisabled);
             Assert.IsType<bool>(firstStationStatus.Returning);
-            Assert.NotNull(firstStationStatus.DocksAvailable);
+            Assert.IsType<int>(firstStationStatus.DocksAvailable);
         }
 
 

diff --git a/src/BikeshareClient/TestBikeshareClient/TestBikeshareClient.csproj b/src/BikeshareClient/TestBikeshareClient/TestBikeshareClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <ReleaseVersion>1.0.1</ReleaseVersion>

diff --git a/src/TestScript/main.csx b/src/TestScript/main.csx
@@ -1,4 +1,4 @@
-#r "nuget: BikeshareClient, 3.2.1"
+#r "nuget: BikeshareClient, 3.2.4"
 
 using BikeshareClient;
 using BikeshareClient.Providers;