Added Tests project, added repository integration tests

topnax · topnax · commit 582b8e919839 · 2021-04-17T09:29:28.000+02:00
diff --git a/.idea/.idea.CryptoTracker/.idea/riderModule.iml b/.idea/.idea.CryptoTracker/.idea/riderModule.iml
diff --git a/CryptoTracker.sln b/CryptoTracker.sln
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Repository", "Repository\Re
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database", "Database\Database.csproj", "{0FAABB54-8CF7-42E5-9971-3B9E2C9AD24C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{BA8D3187-DED2-467F-AF29-D47C827505A3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,6 +46,10 @@ Global
 		{0FAABB54-8CF7-42E5-9971-3B9E2C9AD24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0FAABB54-8CF7-42E5-9971-3B9E2C9AD24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0FAABB54-8CF7-42E5-9971-3B9E2C9AD24C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA8D3187-DED2-467F-AF29-D47C827505A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA8D3187-DED2-467F-AF29-D47C827505A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA8D3187-DED2-467F-AF29-D47C827505A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA8D3187-DED2-467F-AF29-D47C827505A3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Database/SqlSchema.cs b/Database/SqlSchema.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Database
 {
     public class SqlSchema
diff --git a/Repository/IRepository.cs b/Repository/IRepository.cs
@@ -6,7 +6,9 @@ public interface IRepository<T>
     {
         public object ToRow(T entry);
 
-        public void Add(T entry);
+        public int Add(T entry);
+
+        public T Get(int id);
 
         public void Update(T entry);
 
diff --git a/Repository/Repository.csproj b/Repository/Repository.csproj
@@ -12,7 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.4" />
+       <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.4" />
+       <PackageReference Include="SqlKata" Version="2.3.2" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
       <PackageReference Include="SqlKata.Execution" Version="2.3.2" />
       <PackageReference Include="xunit.assert" Version="2.4.1" />
diff --git a/Repository/SqlKataRepository.cs b/Repository/SqlKataRepository.cs
@@ -23,14 +23,10 @@ public SqlKataRepository(SqlKataDatabase db, string tableName)
 
         protected abstract int _getEntryId(T entry);
 
-        public void Add(T entry)
+        public int Add(T entry)
         {
             var id = Db.Get().Query(_tableName).InsertGetId<int>(ToRow(entry));
-
-            Console.WriteLine($"added! {id}");
-            Db.Get().Query(_tableName).AsInsert(ToRow(entry)).Get();
-            id = Db.Get().Query(_tableName).InsertGetId<int>(ToRow(entry));
-            Console.WriteLine($"added! {id}");
+            return id;
         }
 
         public void Update(T entry)
@@ -43,13 +39,23 @@ public void Delete(T entry)
             Db.Get().Query(_tableName).Where("id", _getEntryId(entry)).AsDelete();
         }
 
+        public T Get(int id)
+        {
+            var result = Db.Get().Query(_tableName).Where("id", id).First();
+            if (result == null)
+            {
+                return default;
+            }
+
+            return FromRow(result);
+        }
+
         public List<T> All()
         {
             List<T> items = new List<T>();
             foreach (var row in Db.Get().Query(_tableName).Select().Get())
             {
                 items.Add(FromRow(row));
-                
             }
 
             return items;
diff --git a/Repository/Tests/Tests.csproj b/Repository/Tests/Tests.csproj
diff --git a/Repository/Tests/UnitTest1.cs b/Repository/Tests/UnitTest1.cs
diff --git a/Tests/Integration/CryptoStatsSource/CryptoStatsSource.cs b/Tests/Integration/CryptoStatsSource/CryptoStatsSource.cs
@@ -1,6 +1,7 @@
+using CryptoStatsSource;
 using Xunit;
 
-namespace CryptoStatsSource.Tests
+namespace Tests.Integration.CryptoStatsSource
 {
     public class GetMarketEntriesTest
     {
@@ -22,7 +23,7 @@ public async void SimpleOneEntry()
         {
             var entries = await _source.GetMarketEntries("usd", "bitcoin");
 
-            Assert.Equal(1, entries.Count);
+            Assert.Single(entries);
             Assert.Equal("btc", entries[0].Symbol);
             // 🙏🏻 
             Assert.True(entries[0].CurrentPrice > 10000);
diff --git a/Tests/Integration/Repository/PortfolioTest.cs b/Tests/Integration/Repository/PortfolioTest.cs
@@ -0,0 +1,72 @@
+using System;
+using Database;
+using Microsoft.Data.Sqlite;
+using Model;
+using Repository;
+using SqlKata.Compilers;
+using Xunit;
+
+namespace Tests.Integration.Repository
+{
+    public class SqlKataPortfolioRepositoryFixture : IDisposable
+    {
+        public SqlKataPortfolioRepository PortfolioRepository;
+        private SqliteConnection _dbConnection;
+
+        public SqlKataPortfolioRepositoryFixture()
+        {
+            _dbConnection = new SqliteConnection("Data Source=:memory:");
+            _dbConnection.Open();
+            var db = new SqlKataDatabase(_dbConnection, new SqliteCompiler());
+            this.PortfolioRepository = new(db);
+        }
+
+        public void Dispose()
+        {
+            _dbConnection.Close();
+        }
+    }
+
+    public class UnitTest1 : IClassFixture<SqlKataPortfolioRepositoryFixture>
+    {
+        private SqlKataPortfolioRepositoryFixture _portfolioFixture;
+
+        public UnitTest1(SqlKataPortfolioRepositoryFixture portfolioFixture)
+        {
+            this._portfolioFixture = portfolioFixture;
+        }
+
+        [Fact]
+        public void Add_ReturnsNonZeroId()
+        {
+            // arrange
+            var portfolio = new Portfolio("My new portfolio", "Lorem ipsum dolor sit amet");
+
+            // act
+            int id = _portfolioFixture.PortfolioRepository.Add(new Portfolio("My new portfolio",
+                "Lorem ipsum dolor sit amet"));
+
+            // assert
+            Assert.True(id > 0);
+        }
+
+        [Fact]
+        public void Added_And_Get_AreEqual()
+        {
+            // arrange
+            var portfolio = new Portfolio("My new portfolio", "Lorem ipsum dolor sit amet");
+
+            // act
+            int id = _portfolioFixture.PortfolioRepository.Add(portfolio);
+            var loaded = _portfolioFixture.PortfolioRepository.Get(id);
+            portfolio = portfolio with
+            {
+                Id = loaded.Id
+            };
+
+            // assert
+            Assert.True(id > 0);
+            Assert.Equal(portfolio, loaded);
+        }
+    }
+}
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="1.3.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+       <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.4" />
+       <PackageReference Include="SqlKata" Version="2.3.2" />
+       <PackageReference Include="SqlKata.Execution" Version="2.3.2" />
+
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\CryptoStatsSource\CryptoStatsSource.csproj" />
+      <ProjectReference Include="..\Repository\Repository.csproj" />
+    </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System;`
	`2`	`+`
`1`	`3`	`namespace Database`
`2`	`4`	`{`
`3`	`5`	`public class SqlSchema`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@ public interface IRepository<T>`
`6`	`6`	`{`
`7`	`7`	`public object ToRow(T entry);`
`8`	`8`
`9`		`- public void Add(T entry);`
	`9`	`+ public int Add(T entry);`
	`10`	`+`
	`11`	`+ public T Get(int id);`
`10`	`12`
`11`	`13`	`public void Update(T entry);`
`12`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
	`1`	`+using CryptoStatsSource;`
`1`	`2`	`using Xunit;`
`2`	`3`
`3`		`-namespace CryptoStatsSource.Tests`
	`4`	`+namespace Tests.Integration.CryptoStatsSource`
`4`	`5`	`{`
`5`	`6`	`public class GetMarketEntriesTest`
`6`	`7`	`{`
`@@ -22,7 +23,7 @@ public async void SimpleOneEntry()`
`22`	`23`	`{`
`23`	`24`	`var entries = await _source.GetMarketEntries("usd", "bitcoin");`
`24`	`25`
`25`		`- Assert.Equal(1, entries.Count);`
	`26`	`+ Assert.Single(entries);`
`26`	`27`	`Assert.Equal("btc", entries[0].Symbol);`
`27`	`28`	`// 🙏🏻`
`28`	`29`	`Assert.True(entries[0].CurrentPrice > 10000);`