From 04bbaa256698db96f252c3a798c397c8282ab4af Mon Sep 17 00:00:00 2001 From: transtrike Date: Fri, 8 Jan 2021 23:22:37 +0200 Subject: Tests added to sln file --- src/DevHive.sln | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'src/DevHive.sln') diff --git a/src/DevHive.sln b/src/DevHive.sln index 953fe4b..2b15641 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -9,6 +9,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "DevHive EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "DevHive.Web\DevHive.Web.csproj", "{FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevHive.Tests", "DevHive.Tests", "{7D37479A-BDFB-445F-B1CB-B1817EF36DF1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "DevHive.Tests\API\API.csproj", "{5A2505FE-0C60-44A6-B343-3C850D41289E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "DevHive.Tests\Data\Data.csproj", "{3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "DevHive.Tests\Services\Services.csproj", "{A1D19F10-F838-49F1-8BF5-C77F5410E21D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -58,5 +66,46 @@ Global {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x64.Build.0 = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.ActiveCfg = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.Build.0 = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x64.Build.0 = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x86.ActiveCfg = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x86.Build.0 = Debug|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|Any CPU.Build.0 = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x64.ActiveCfg = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x64.Build.0 = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x86.ActiveCfg = Release|Any CPU + {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x86.Build.0 = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x64.ActiveCfg = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x64.Build.0 = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x86.ActiveCfg = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x86.Build.0 = Debug|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|Any CPU.Build.0 = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x64.ActiveCfg = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x64.Build.0 = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x86.ActiveCfg = Release|Any CPU + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x86.Build.0 = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x64.Build.0 = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x86.Build.0 = Debug|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|Any CPU.Build.0 = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x64.ActiveCfg = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x64.Build.0 = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.ActiveCfg = Release|Any CPU + {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5A2505FE-0C60-44A6-B343-3C850D41289E} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {A1D19F10-F838-49F1-8BF5-C77F5410E21D} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} EndGlobalSection EndGlobal -- cgit v1.2.3 From 0fdc2cc1dd9777b182087cc77c8a86e3cdc75511 Mon Sep 17 00:00:00 2001 From: transtrike Date: Fri, 8 Jan 2021 23:28:06 +0200 Subject: Fixed tests references --- src/DevHive.Tests/API/API.csproj | 7 ---- src/DevHive.Tests/API/Class1.cs | 8 ---- src/DevHive.Tests/Data/Data.csproj | 4 ++ src/DevHive.Tests/Services/Services.csproj | 4 ++ src/DevHive.Tests/Web/Class1.cs | 8 ++++ src/DevHive.Tests/Web/Web.csproj | 11 ++++++ src/DevHive.sln | 60 +++++++++++++++++++++--------- 7 files changed, 69 insertions(+), 33 deletions(-) delete mode 100644 src/DevHive.Tests/API/API.csproj delete mode 100644 src/DevHive.Tests/API/Class1.cs create mode 100644 src/DevHive.Tests/Web/Class1.cs create mode 100644 src/DevHive.Tests/Web/Web.csproj (limited to 'src/DevHive.sln') diff --git a/src/DevHive.Tests/API/API.csproj b/src/DevHive.Tests/API/API.csproj deleted file mode 100644 index 563e6f9..0000000 --- a/src/DevHive.Tests/API/API.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - net5.0 - - - diff --git a/src/DevHive.Tests/API/Class1.cs b/src/DevHive.Tests/API/Class1.cs deleted file mode 100644 index 226144d..0000000 --- a/src/DevHive.Tests/API/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace API -{ - public class Class1 - { - } -} diff --git a/src/DevHive.Tests/Data/Data.csproj b/src/DevHive.Tests/Data/Data.csproj index 563e6f9..760426f 100644 --- a/src/DevHive.Tests/Data/Data.csproj +++ b/src/DevHive.Tests/Data/Data.csproj @@ -1,5 +1,9 @@ + + + + net5.0 diff --git a/src/DevHive.Tests/Services/Services.csproj b/src/DevHive.Tests/Services/Services.csproj index 563e6f9..92058fe 100644 --- a/src/DevHive.Tests/Services/Services.csproj +++ b/src/DevHive.Tests/Services/Services.csproj @@ -1,5 +1,9 @@ + + + + net5.0 diff --git a/src/DevHive.Tests/Web/Class1.cs b/src/DevHive.Tests/Web/Class1.cs new file mode 100644 index 0000000..2ce97ad --- /dev/null +++ b/src/DevHive.Tests/Web/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace Web +{ + public class Class1 + { + } +} diff --git a/src/DevHive.Tests/Web/Web.csproj b/src/DevHive.Tests/Web/Web.csproj new file mode 100644 index 0000000..62ba802 --- /dev/null +++ b/src/DevHive.Tests/Web/Web.csproj @@ -0,0 +1,11 @@ + + + + + + + + net5.0 + + + diff --git a/src/DevHive.sln b/src/DevHive.sln index 2b15641..1f05e75 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -11,11 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "DevHive.Web\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevHive.Tests", "DevHive.Tests", "{7D37479A-BDFB-445F-B1CB-B1817EF36DF1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "DevHive.Tests\API\API.csproj", "{5A2505FE-0C60-44A6-B343-3C850D41289E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "DevHive.Tests\Services\Services.csproj", "{FC05CBD2-187F-481E-9118-B55AA75D70FB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "DevHive.Tests\Data\Data.csproj", "{3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "DevHive.Tests\Web\Web.csproj", "{964A1E31-BA28-49D7-B8B1-52C4CB12AB41}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "DevHive.Tests\Services\Services.csproj", "{A1D19F10-F838-49F1-8BF5-C77F5410E21D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "DevHive.Tests\Data\Data.csproj", "{AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -66,18 +66,6 @@ Global {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x64.Build.0 = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.ActiveCfg = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.Build.0 = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x64.ActiveCfg = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x64.Build.0 = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x86.ActiveCfg = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Debug|x86.Build.0 = Debug|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|Any CPU.Build.0 = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x64.ActiveCfg = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x64.Build.0 = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x86.ActiveCfg = Release|Any CPU - {5A2505FE-0C60-44A6-B343-3C850D41289E}.Release|x86.Build.0 = Release|Any CPU {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -102,10 +90,46 @@ Global {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x64.Build.0 = Release|Any CPU {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.ActiveCfg = Release|Any CPU {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.Build.0 = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x64.ActiveCfg = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x64.Build.0 = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x86.Build.0 = Debug|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|Any CPU.Build.0 = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x64.ActiveCfg = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x64.Build.0 = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x86.ActiveCfg = Release|Any CPU + {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x86.Build.0 = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x64.ActiveCfg = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x64.Build.0 = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x86.ActiveCfg = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x86.Build.0 = Debug|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|Any CPU.ActiveCfg = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|Any CPU.Build.0 = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x64.ActiveCfg = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x64.Build.0 = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x86.ActiveCfg = Release|Any CPU + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x86.Build.0 = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x64.ActiveCfg = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x64.Build.0 = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x86.ActiveCfg = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x86.Build.0 = Debug|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|Any CPU.Build.0 = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x64.ActiveCfg = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x64.Build.0 = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x86.ActiveCfg = Release|Any CPU + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5A2505FE-0C60-44A6-B343-3C850D41289E} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} - {A1D19F10-F838-49F1-8BF5-C77F5410E21D} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {FC05CBD2-187F-481E-9118-B55AA75D70FB} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {964A1E31-BA28-49D7-B8B1-52C4CB12AB41} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} EndGlobalSection EndGlobal -- cgit v1.2.3 From 036aa41657c4ddf35b9c1f1bd43627b22aba23f9 Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Sun, 10 Jan 2021 10:55:01 +0200 Subject: Fixed test projects --- .../Repositories/TechnologyRepository.cs | 3 +- .../Data/TechnologyRepository.Tests.cs | 3 + .../DevHive.Data.Tests/DevHive.Data.Tests.csproj | 20 +++ .../TechnologyRepository.Tests.cs | 121 +++++++++++++++++ .../DevHive.Services.Tests.csproj | 19 +++ .../DevHive.Services.Tests/UnitTest1.cs | 18 +++ .../DevHive.Web.Tests/DevHive.Web.Tests.csproj | 19 +++ src/DevHive.Tests/DevHive.Web.Tests/UnitTest1.cs | 18 +++ src/DevHive.sln | 143 ++++++++++----------- 9 files changed, 288 insertions(+), 76 deletions(-) create mode 100644 src/DevHive.Tests/DevHive.Data.Tests/DevHive.Data.Tests.csproj create mode 100644 src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs create mode 100644 src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj create mode 100644 src/DevHive.Tests/DevHive.Services.Tests/UnitTest1.cs create mode 100644 src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj create mode 100644 src/DevHive.Tests/DevHive.Web.Tests/UnitTest1.cs (limited to 'src/DevHive.sln') diff --git a/src/DevHive.Data/Repositories/TechnologyRepository.cs b/src/DevHive.Data/Repositories/TechnologyRepository.cs index 935582c..492c6d2 100644 --- a/src/DevHive.Data/Repositories/TechnologyRepository.cs +++ b/src/DevHive.Data/Repositories/TechnologyRepository.cs @@ -1,9 +1,10 @@ using System; using System.Threading.Tasks; using Data.Models.Interfaces.Database; +using DevHive.Common.Models.Misc; using DevHive.Data.Models; using Microsoft.EntityFrameworkCore; -using DevHive.Common.Models.Misc; + namespace DevHive.Data.Repositories { diff --git a/src/DevHive.Tests/Data/TechnologyRepository.Tests.cs b/src/DevHive.Tests/Data/TechnologyRepository.Tests.cs index 9a00401..b4a9652 100644 --- a/src/DevHive.Tests/Data/TechnologyRepository.Tests.cs +++ b/src/DevHive.Tests/Data/TechnologyRepository.Tests.cs @@ -98,6 +98,9 @@ namespace DevHive.Tests.Data }).GetAwaiter().GetResult(); } + [Test] + public void + private void AddEntity(string name = TECHNOLOGY_NAME) { Task.Run(async () => diff --git a/src/DevHive.Tests/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/DevHive.Tests/DevHive.Data.Tests/DevHive.Data.Tests.csproj new file mode 100644 index 0000000..c414811 --- /dev/null +++ b/src/DevHive.Tests/DevHive.Data.Tests/DevHive.Data.Tests.csproj @@ -0,0 +1,20 @@ + + + + net5.0 + + false + + + + + + + + + + + + + + diff --git a/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs b/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs new file mode 100644 index 0000000..db07e04 --- /dev/null +++ b/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs @@ -0,0 +1,121 @@ +using DevHive.Data.Models; +using DevHive.Data.Repositories; +using Microsoft.EntityFrameworkCore; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DevHive.Data.Tests +{ + [TestFixture] + public class TechnologyRepositoryTests + { + private const string TECHNOLOGY_NAME = "Technology test name"; + + protected DevHiveContext Context { get; set; } + + protected TechnologyRepository TechnologyRepository { get; set; } + + [SetUp] + public void Setup() + { + var optionsBuilder = new DbContextOptionsBuilder() + .UseInMemoryDatabase(databaseName: "DevHive_Test_Database"); + + this.Context = new DevHiveContext(optionsBuilder.Options); + + TechnologyRepository = new TechnologyRepository(Context); + } + + [TearDown] + public void TearDown() + { + this.Context.Database.EnsureDeleted(); + } + + [Test] + public void AddAsync_AddsTheGivenTechnologyToTheDatabase() + { + AddEntity(); + + int numberOfTechnologies = Context.Technologies.Count(); + + Assert.True(numberOfTechnologies > 0, "Technologies repo does not store Technologies correctly"); + } + + [Test] + public void GetByIdAsync_ReturnsTheCorrectTechnology_IfIdExists() + { + Task.Run(async () => + { + AddEntity(); + Technology technology = this.Context.Technologies.Where(x => x.Name == TECHNOLOGY_NAME).ToList().FirstOrDefault(); + Guid id = technology.Id; + + Technology technologyReturned = await this.TechnologyRepository.GetByIdAsync(id); + + Assert.AreEqual(TECHNOLOGY_NAME, technologyReturned.Name, "GetByIdAsync does not return the correct Technology when id is valid"); + }).GetAwaiter().GetResult(); + } + + [Test] + public void GetByIdAsync_ReturnsNull_IfIdDoesNotExists() + { + Task.Run(async () => + { + Guid id = new Guid(); + + Technology technologyReturned = await this.TechnologyRepository.GetByIdAsync(id); + + Assert.IsNull(technologyReturned, "GetByIdAsync returns Technology when it should be null"); + }).GetAwaiter().GetResult(); + } + + [Test] + public void DoesTechnologyNameExist_ReturnsTrue_IfTechnologyExists() + { + Task.Run(async () => + { + AddEntity(); + + bool result = await this.TechnologyRepository.DoesTechnologyNameExist(TECHNOLOGY_NAME); + + Assert.IsTrue(result, "DoesTechnologyNameExists returns true when technology name does not exist"); + }).GetAwaiter().GetResult(); + } + + [Test] + public void DoesTechnologyNameExist_ReturnsFalse_IfTechnologyDoesNotExists() + { + Task.Run(async () => + { + bool result = await this.TechnologyRepository.DoesTechnologyNameExist(TECHNOLOGY_NAME); + + Assert.False(result, "DoesTechnologyNameExist returns true when tehcnology name does not exist"); + }).GetAwaiter().GetResult(); + } + + + + private void AddEntity(string name = TECHNOLOGY_NAME) + { + Task.Run(async () => + { + Technology technology = new Technology + { + Name = name + }; + + await this.TechnologyRepository.AddAsync(technology); + }).GetAwaiter().GetResult(); + } + + //Task.Run(async () => + //{ + // + //}).GetAwaiter().GetResult(); + } +} diff --git a/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj new file mode 100644 index 0000000..7cc8473 --- /dev/null +++ b/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -0,0 +1,19 @@ + + + + net5.0 + + false + + + + + + + + + + + + + diff --git a/src/DevHive.Tests/DevHive.Services.Tests/UnitTest1.cs b/src/DevHive.Tests/DevHive.Services.Tests/UnitTest1.cs new file mode 100644 index 0000000..b6681da --- /dev/null +++ b/src/DevHive.Tests/DevHive.Services.Tests/UnitTest1.cs @@ -0,0 +1,18 @@ +using NUnit.Framework; + +namespace DevHive.Services.Tests +{ + public class Tests + { + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } + } +} \ No newline at end of file diff --git a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj new file mode 100644 index 0000000..bdcca5d --- /dev/null +++ b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -0,0 +1,19 @@ + + + + net5.0 + + false + + + + + + + + + + + + + diff --git a/src/DevHive.Tests/DevHive.Web.Tests/UnitTest1.cs b/src/DevHive.Tests/DevHive.Web.Tests/UnitTest1.cs new file mode 100644 index 0000000..e6f54b0 --- /dev/null +++ b/src/DevHive.Tests/DevHive.Web.Tests/UnitTest1.cs @@ -0,0 +1,18 @@ +using NUnit.Framework; + +namespace DevHive.Web.Tests +{ + public class Tests + { + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } + } +} \ No newline at end of file diff --git a/src/DevHive.sln b/src/DevHive.sln index 1f05e75..19ebbc2 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -1,21 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30717.126 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data", "DevHive.Data\DevHive.Data.csproj", "{A175F293-9209-46BF-803E-72E39590246F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Data", "DevHive.Data\DevHive.Data.csproj", "{A175F293-9209-46BF-803E-72E39590246F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "DevHive.Services\DevHive.Services.csproj", "{4D4EAC98-A72F-4265-9876-3E87453F80AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Services", "DevHive.Services\DevHive.Services.csproj", "{4D4EAC98-A72F-4265-9876-3E87453F80AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "DevHive.Web\DevHive.Web.csproj", "{FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Web", "DevHive.Web\DevHive.Web.csproj", "{FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevHive.Tests", "DevHive.Tests", "{7D37479A-BDFB-445F-B1CB-B1817EF36DF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Common", "DevHive.Common\DevHive.Common.csproj", "{843BF55D-20AC-41E7-922E-209648625D98}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "DevHive.Tests\Services\Services.csproj", "{FC05CBD2-187F-481E-9118-B55AA75D70FB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevHive.Tests", "DevHive.Tests", "{8ED705F9-7038-472C-B53F-5B1480A74A37}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "DevHive.Tests\Web\Web.csproj", "{964A1E31-BA28-49D7-B8B1-52C4CB12AB41}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "DevHive.Tests\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{346876CE-2C9B-4538-BE82-EA2017F7D405}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "DevHive.Tests\Data\Data.csproj", "{AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "DevHive.Tests\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{9BBB8A48-C5AF-4F35-925F-3404A74E47F4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "DevHive.Tests\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{2574CDBE-CC99-4BF8-BF7F-34C131788036}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -26,9 +28,6 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A175F293-9209-46BF-803E-72E39590246F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A175F293-9209-46BF-803E-72E39590246F}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -66,70 +65,64 @@ Global {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x64.Build.0 = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.ActiveCfg = Release|Any CPU {FF82DC4E-B4C8-4B49-AC73-43A26CFC73DA}.Release|x86.Build.0 = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x64.ActiveCfg = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x64.Build.0 = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x86.ActiveCfg = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Debug|x86.Build.0 = Debug|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|Any CPU.Build.0 = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x64.ActiveCfg = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x64.Build.0 = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x86.ActiveCfg = Release|Any CPU - {3411B3AB-2F07-4551-A4B9-99E7DC5F35D5}.Release|x86.Build.0 = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x64.ActiveCfg = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x64.Build.0 = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x86.ActiveCfg = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Debug|x86.Build.0 = Debug|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x64.ActiveCfg = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x64.Build.0 = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.ActiveCfg = Release|Any CPU - {A1D19F10-F838-49F1-8BF5-C77F5410E21D}.Release|x86.Build.0 = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x64.ActiveCfg = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x64.Build.0 = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x86.ActiveCfg = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Debug|x86.Build.0 = Debug|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|Any CPU.Build.0 = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x64.ActiveCfg = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x64.Build.0 = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x86.ActiveCfg = Release|Any CPU - {FC05CBD2-187F-481E-9118-B55AA75D70FB}.Release|x86.Build.0 = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x64.ActiveCfg = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x64.Build.0 = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x86.ActiveCfg = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Debug|x86.Build.0 = Debug|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|Any CPU.Build.0 = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x64.ActiveCfg = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x64.Build.0 = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x86.ActiveCfg = Release|Any CPU - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41}.Release|x86.Build.0 = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x64.ActiveCfg = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x64.Build.0 = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x86.ActiveCfg = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Debug|x86.Build.0 = Debug|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|Any CPU.Build.0 = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x64.ActiveCfg = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x64.Build.0 = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x86.ActiveCfg = Release|Any CPU - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E}.Release|x86.Build.0 = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|x64.ActiveCfg = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|x64.Build.0 = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|x86.ActiveCfg = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Debug|x86.Build.0 = Debug|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|Any CPU.Build.0 = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|x64.ActiveCfg = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|x64.Build.0 = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|x86.ActiveCfg = Release|Any CPU + {843BF55D-20AC-41E7-922E-209648625D98}.Release|x86.Build.0 = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|Any CPU.Build.0 = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|x64.ActiveCfg = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|x64.Build.0 = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|x86.ActiveCfg = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Debug|x86.Build.0 = Debug|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|Any CPU.ActiveCfg = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|Any CPU.Build.0 = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|x64.ActiveCfg = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|x64.Build.0 = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|x86.ActiveCfg = Release|Any CPU + {346876CE-2C9B-4538-BE82-EA2017F7D405}.Release|x86.Build.0 = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|x64.ActiveCfg = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|x64.Build.0 = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|x86.ActiveCfg = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Debug|x86.Build.0 = Debug|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|Any CPU.Build.0 = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|x64.ActiveCfg = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|x64.Build.0 = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|x86.ActiveCfg = Release|Any CPU + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4}.Release|x86.Build.0 = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|x64.ActiveCfg = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|x64.Build.0 = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|x86.ActiveCfg = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Debug|x86.Build.0 = Debug|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|Any CPU.Build.0 = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|x64.ActiveCfg = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|x64.Build.0 = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|x86.ActiveCfg = Release|Any CPU + {2574CDBE-CC99-4BF8-BF7F-34C131788036}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {FC05CBD2-187F-481E-9118-B55AA75D70FB} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} - {964A1E31-BA28-49D7-B8B1-52C4CB12AB41} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} - {AE4CDE9D-5B37-4AF3-BABF-25867AA6993E} = {7D37479A-BDFB-445F-B1CB-B1817EF36DF1} + {346876CE-2C9B-4538-BE82-EA2017F7D405} = {8ED705F9-7038-472C-B53F-5B1480A74A37} + {9BBB8A48-C5AF-4F35-925F-3404A74E47F4} = {8ED705F9-7038-472C-B53F-5B1480A74A37} + {2574CDBE-CC99-4BF8-BF7F-34C131788036} = {8ED705F9-7038-472C-B53F-5B1480A74A37} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0F5395E8-26FB-40FD-83A1-EE7766C5E398} EndGlobalSection EndGlobal -- cgit v1.2.3 From 6c9719d60ad88368bfa5b62b8133ce065f6cc5eb Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Thu, 14 Jan 2021 17:37:20 +0200 Subject: Refactoed technology service tests to use Assert.Throw instead of try catch --- src/DevHive.Services/Services/TechnologyService.cs | 1 - .../TechnologyServices.Tests.cs | 129 +++++++-------------- .../DevHive.Web.Tests/DevHive.Web.Tests.csproj | 1 + .../TechnologyController.Tests.cs | 55 +++++++++ .../Controllers/TechnologyController.cs | 6 +- src/DevHive.sln | 11 +- 6 files changed, 109 insertions(+), 94 deletions(-) create mode 100644 src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs (limited to 'src/DevHive.sln') diff --git a/src/DevHive.Services/Services/TechnologyService.cs b/src/DevHive.Services/Services/TechnologyService.cs index bdcf70f..7fd0b2f 100644 --- a/src/DevHive.Services/Services/TechnologyService.cs +++ b/src/DevHive.Services/Services/TechnologyService.cs @@ -65,7 +65,6 @@ namespace DevHive.Services.Services #endregion #region Delete - public async Task DeleteTechnology(Guid technologyId) { if (!await this._technologyRepository.DoesTechnologyExistAsync(technologyId)) diff --git a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs index 9e0876d..1f0b01e 100644 --- a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -58,32 +58,23 @@ namespace DevHive.Services.Tests [Test] public void Create_ThrowsArgumentException_WhenEntityAlreadyExists() { - Task.Run(async () => + string exceptionMessage = "Technology already exists!"; + string technologyName = "Gosho Trapov"; + + CreateTechnologyServiceModel createTechnologyServiceModel = new() { - string expectedExceptionMessage = "Technology already exists!"; - string technologyName = "Gosho Trapov"; + Name = technologyName + }; + Technology technology = new() + { + Name = technologyName + }; - CreateTechnologyServiceModel createTechnologyServiceModel = new() - { - Name = technologyName - }; - Technology technology = new() - { - Name = technologyName - }; + this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.Create(createTechnologyServiceModel)); - try - { - await this.TechnologyService.Create(createTechnologyServiceModel); - Assert.Fail("Create does not throw exception when technology already exists"); - } - catch (ArgumentException ex) - { - Assert.AreEqual(expectedExceptionMessage, ex.Message); - } - }).GetAwaiter().GetResult(); + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } #endregion @@ -117,22 +108,13 @@ namespace DevHive.Services.Tests [Test] public void GetTechnologyById_ThrowsException_WhenTechnologyDoesNotExist() { - Task.Run(async () => - { - string exceptionMessage = "The technology does not exist"; - Guid id = new Guid(); - this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + string exceptionMessage = "The technology does not exist"; + Guid id = new Guid(); + this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - try - { - await this.TechnologyService.GetTechnologyById(id); - Assert.Fail("GetTechnologyById does not throw exception when technology does not exist"); - } - catch (ArgumentException ex) - { - Assert.AreEqual(exceptionMessage, ex.Message, "Exception messege is nto correct"); - } - }).GetAwaiter().GetResult(); + Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.GetTechnologyById(id)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } #endregion @@ -170,52 +152,34 @@ namespace DevHive.Services.Tests [Test] public void UpdateTechnology_ThrowsException_WhenTechnologyDoesNotExist() { - Task.Run(async () => + string exceptionMessage = "Technology does not exist!"; + Guid id = new Guid(); + UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel { - string exceptionMessage = "Technology does not exist!"; - Guid id = new Guid(); - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel - { - }; + }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - try - { - await this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel); - Assert.Fail("UpdateTechnology does not throw exception when technology does not exist"); - } - catch (ArgumentException ex) - { - Assert.AreEqual(exceptionMessage, ex.Message, "Exception Message is not correct"); - } - }).GetAwaiter().GetResult(); + Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } [Test] public void UpdateTechnology_ThrowsException_WhenTechnologyNameAlreadyExists() { - Task.Run(async () => + string exceptionMessage = "Technology name already exists!"; + Guid id = new Guid(); + UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel { - string exceptionMessage = "Technology name already exists!"; - Guid id = new Guid(); - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel - { - }; + }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - try - { - await this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel); - Assert.Fail("UpdateTechnology does not throw exception when technology name already exist"); - } - catch (ArgumentException ex) - { - Assert.AreEqual(exceptionMessage, ex.Message, "Exception Message is not correct"); - } - }).GetAwaiter().GetResult(); + Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } #endregion @@ -244,23 +208,14 @@ namespace DevHive.Services.Tests [Test] public void DeleteTechnology_ThrowsException_WhenTechnologyDoesNotExist() { - Task.Run(async () => - { - string exceptionMessage = "Technology does not exist!"; - Guid id = new Guid(); + string exceptionMessage = "Technology does not exist!"; + Guid id = new Guid(); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - try - { - await this.TechnologyService.DeleteTechnology(id); - Assert.Fail("DeleteTechnology does not throw exception when technology does not exist"); - } - catch (ArgumentException ex) - { - Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); - } - }).GetAwaiter().GetResult(); + Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.DeleteTechnology(id)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } #endregion //Task.Run(async () => diff --git a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj index e527713..47f40ee 100644 --- a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj +++ b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -7,6 +7,7 @@ + diff --git a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs new file mode 100644 index 0000000..711f66f --- /dev/null +++ b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -0,0 +1,55 @@ +using AutoMapper; +using DevHive.Services.Interfaces; +using DevHive.Services.Models.Technology; +using DevHive.Web.Controllers; +using DevHive.Web.Models.Technology; +using Microsoft.AspNetCore.Mvc; +using Moq; +using NUnit.Framework; +using System.Threading.Tasks; + +namespace DevHive.Web.Tests +{ + [TestFixture] + public class TechnologyControllerTests + { + private Mock TechnologyServiceMock { get; set; } + private Mock MapperMock { get; set; } + private TechnologyController TechnologyController { get; set; } + + [SetUp] + public void SetUp() + { + this.TechnologyServiceMock = new Mock(); + this.MapperMock = new Mock(); + this.TechnologyController = new TechnologyController(this.TechnologyServiceMock.Object, this.MapperMock.Object); + } + + #region Create + [Test] + public void Create_ReturnsOkObjectResult_WhenTechnologyIsSuccessfullyCreated() + { + string name = "Gosho Trapov"; + + CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel + { + Name = name + }; + CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel + { + Name = name + }; + + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this.TechnologyServiceMock.Setup(p => p.Create(It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result; + + Assert.IsInstanceOf(result); + } + + + #endregion + + } +} diff --git a/src/DevHive.Web/Controllers/TechnologyController.cs b/src/DevHive.Web/Controllers/TechnologyController.cs index ecac318..6c51730 100644 --- a/src/DevHive.Web/Controllers/TechnologyController.cs +++ b/src/DevHive.Web/Controllers/TechnologyController.cs @@ -37,10 +37,10 @@ namespace DevHive.Web.Controllers [HttpGet] public async Task GetById(Guid technologyId) { - TechnologyServiceModel technologyServiceModel = await this._technologyService.GetTechnologyById(technologyId); - TechnologyWebModel technologyWebModel = this._technologyMapper.Map(technologyServiceModel); + CreateTechnologyServiceModel createTechnologyServiceModel = await this._technologyService.GetTechnologyById(technologyId); + CreateTechnologyWebModel createTechnologyWebModel = this._technologyMapper.Map(createTechnologyServiceModel); - return new OkObjectResult(technologyWebModel); + return new OkObjectResult(createTechnologyWebModel); } [HttpPut] diff --git a/src/DevHive.sln b/src/DevHive.sln index 19ebbc2..aa58d9c 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -13,11 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Common", "DevHive.C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevHive.Tests", "DevHive.Tests", "{8ED705F9-7038-472C-B53F-5B1480A74A37}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "DevHive.Tests\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{346876CE-2C9B-4538-BE82-EA2017F7D405}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Data.Tests", "DevHive.Tests\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{346876CE-2C9B-4538-BE82-EA2017F7D405}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "DevHive.Tests\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{9BBB8A48-C5AF-4F35-925F-3404A74E47F4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Services.Tests", "DevHive.Tests\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{9BBB8A48-C5AF-4F35-925F-3404A74E47F4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "DevHive.Tests\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{2574CDBE-CC99-4BF8-BF7F-34C131788036}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHive.Web.Tests", "DevHive.Tests\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{2574CDBE-CC99-4BF8-BF7F-34C131788036}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2E5E3F99-7936-4F3B-974E-A98000D1564B}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution -- cgit v1.2.3