Skip to content
This repository was archived by the owner on Apr 14, 2023. It is now read-only.

Commit 3ea7390

Browse files
lucabriguglialucabriguglia
committed
Fix unit tests
1 parent c4b989f commit 3ea7390

File tree

6 files changed

+109
-25
lines changed

6 files changed

+109
-25
lines changed

‎tests/Weapsy.Domain.Data.SqlServer.Tests/MenuRepositoryTests.cs

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
7+
using AutoMapper;
78
using Weapsy.Domain.Data.SqlServer.Repositories;
89
using Weapsy.Domain.Menus;
910
using Weapsy.Tests.Factories;
@@ -17,6 +18,7 @@ namespace Weapsy.Domain.Data.SqlServer.Tests
1718
public class MenuRepositoryTests
1819
{
1920
private IMenuRepository _sut;
21+
private WeapsyDbContext _dbContext;
2022
private Guid _siteId;
2123
private Guid _menuId1;
2224
private Guid _menuId2;
@@ -29,7 +31,7 @@ public void SetUp()
2931
{
3032
var optionsBuilder = new DbContextOptionsBuilder<WeapsyDbContext>();
3133
optionsBuilder.UseInMemoryDatabase();
32-
var dbContext = new WeapsyDbContext(optionsBuilder.Options);
34+
_dbContext = new WeapsyDbContext(optionsBuilder.Options);
3335

3436
_siteId = Guid.NewGuid();
3537
_menuId1 = Guid.NewGuid();
@@ -38,7 +40,7 @@ public void SetUp()
3840
_menuItemId2 = Guid.NewGuid();
3941
_language1 = Guid.NewGuid();
4042

41-
dbContext.Set<MenuDbEntity>().AddRange(
43+
_dbContext.Set<MenuDbEntity>().AddRange(
4244
new MenuDbEntity
4345
{
4446
SiteId = _siteId,
@@ -91,9 +93,9 @@ public void SetUp()
9193
}
9294
);
9395

94-
dbContext.SaveChanges();
96+
_dbContext.SaveChanges();
9597

96-
var mapperMock = new Mock<AutoMapper.IMapper>();
98+
var mapperMock = new Mock<IMapper>();
9799
mapperMock.Setup(x => x.Map<MenuDbEntity>(It.IsAny<Menu>())).Returns(new MenuDbEntity());
98100
mapperMock.Setup(x => x.Map<Menu>(It.IsAny<MenuDbEntity>())).Returns(new Menu());
99101
mapperMock.Setup(x => x.Map<ICollection<Menu>>(It.IsAny<ICollection<MenuDbEntity>>())).Returns(new List<Menu>
@@ -102,7 +104,7 @@ public void SetUp()
102104
MenuFactory.Menu(_siteId, _menuId2, "Name", "ItemText", "ItemTextLocalised")
103105
});
104106

105-
_sut = new MenuRepository(dbContext, mapperMock.Object);
107+
_sut = new MenuRepository(_dbContext, mapperMock.Object);
106108
}
107109

108110
[Test]
@@ -166,6 +168,18 @@ public void Should_return_all_menus_with_no_deleted_menu_items()
166168
public void Should_save_new_menu()
167169
{
168170
var newMenu = MenuFactory.Menu(_siteId, Guid.NewGuid(), "Menu 3", "Item", "");
171+
var newMenuDbEntity = new MenuDbEntity
172+
{
173+
SiteId = newMenu.SiteId,
174+
Id = newMenu.Id,
175+
Name = newMenu.Name
176+
};
177+
178+
var mapperMock = new Mock<IMapper>();
179+
mapperMock.Setup(x => x.Map<MenuDbEntity>(newMenu)).Returns(newMenuDbEntity);
180+
mapperMock.Setup(x => x.Map<Menu>(newMenuDbEntity)).Returns(newMenu);
181+
182+
_sut = new MenuRepository(_dbContext, mapperMock.Object);
169183

170184
_sut.Create(newMenu);
171185

‎tests/Weapsy.Domain.Data.SqlServer.Tests/ModuleRepositoryTests.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using NUnit.Framework;
33
using System;
44
using System.Collections.Generic;
5+
using AutoMapper;
56
using Moq;
67
using Weapsy.Domain.Data.SqlServer.Repositories;
78
using Weapsy.Domain.Modules;
@@ -14,6 +15,7 @@ namespace Weapsy.Domain.Data.SqlServer.Tests
1415
public class ModuleRepositoryTests
1516
{
1617
private IModuleRepository _sut;
18+
private WeapsyDbContext _dbContext;
1719
private Guid _siteId;
1820
private Guid _moduleId1;
1921
private Guid _moduleId2;
@@ -25,15 +27,15 @@ public void SetUp()
2527
{
2628
var optionsBuilder = new DbContextOptionsBuilder<WeapsyDbContext>();
2729
optionsBuilder.UseInMemoryDatabase();
28-
var dbContext = new WeapsyDbContext(optionsBuilder.Options);
30+
_dbContext = new WeapsyDbContext(optionsBuilder.Options);
2931

3032
_siteId = Guid.NewGuid();
3133
_moduleId1 = Guid.NewGuid();
3234
_moduleId2 = Guid.NewGuid();
3335
_moduleTypeId1 = Guid.NewGuid();
3436
_moduleTypeId2 = Guid.NewGuid();
3537

36-
dbContext.Set<ModuleDbEntity>().AddRange(
38+
_dbContext.Set<ModuleDbEntity>().AddRange(
3739
new ModuleDbEntity
3840
{
3941
SiteId = _siteId,
@@ -56,7 +58,7 @@ public void SetUp()
5658
}
5759
);
5860

59-
dbContext.SaveChanges();
61+
_dbContext.SaveChanges();
6062

6163
var mapperMock = new Mock<AutoMapper.IMapper>();
6264
mapperMock.Setup(x => x.Map<ModuleDbEntity>(It.IsAny<Module>())).Returns(new ModuleDbEntity());
@@ -67,7 +69,7 @@ public void SetUp()
6769
ModuleFactory.Module(_siteId, _moduleTypeId2, _moduleId2, "Title")
6870
});
6971

70-
_sut = new ModuleRepository(dbContext, mapperMock.Object);
72+
_sut = new ModuleRepository(_dbContext, mapperMock.Object);
7173
}
7274

7375
[Test]
@@ -102,6 +104,18 @@ public void Should_return_count_by_module_id()
102104
public void Should_save_new_module()
103105
{
104106
var newModule = ModuleFactory.Module(_siteId, Guid.NewGuid(), Guid.NewGuid(), "Title 3");
107+
var newModuleDbEntity = new ModuleDbEntity
108+
{
109+
SiteId = newModule.SiteId,
110+
Id = newModule.Id,
111+
Title = newModule.Title
112+
};
113+
114+
var mapperMock = new Mock<IMapper>();
115+
mapperMock.Setup(x => x.Map<ModuleDbEntity>(newModule)).Returns(newModuleDbEntity);
116+
mapperMock.Setup(x => x.Map<Module>(newModuleDbEntity)).Returns(newModule);
117+
118+
_sut = new ModuleRepository(_dbContext, mapperMock.Object);
105119

106120
_sut.Create(newModule);
107121

‎tests/Weapsy.Domain.Data.SqlServer.Tests/ModuleTypeRepositoryTests.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using NUnit.Framework;
33
using System;
44
using System.Collections.Generic;
5+
using AutoMapper;
56
using Moq;
67
using Weapsy.Domain.Data.SqlServer.Repositories;
78
using Weapsy.Domain.ModuleTypes;
@@ -14,6 +15,7 @@ namespace Weapsy.Domain.Data.SqlServer.Tests
1415
public class ModuleTypeRepositoryTests
1516
{
1617
private IModuleTypeRepository _sut;
18+
private WeapsyDbContext _dbContext;
1719
private Guid _moduleTypeId1;
1820
private Guid _moduleTypeId2;
1921

@@ -22,12 +24,12 @@ public void SetUp()
2224
{
2325
var optionsBuilder = new DbContextOptionsBuilder<WeapsyDbContext>();
2426
optionsBuilder.UseInMemoryDatabase();
25-
var dbContext = new WeapsyDbContext(optionsBuilder.Options);
27+
_dbContext = new WeapsyDbContext(optionsBuilder.Options);
2628

2729
_moduleTypeId1 = Guid.NewGuid();
2830
_moduleTypeId2 = Guid.NewGuid();
2931

30-
dbContext.Set<ModuleTypeDbEntity>().AddRange(
32+
_dbContext.Set<ModuleTypeDbEntity>().AddRange(
3133
new ModuleTypeDbEntity
3234
{
3335
Id = _moduleTypeId1,
@@ -50,7 +52,7 @@ public void SetUp()
5052
}
5153
);
5254

53-
dbContext.SaveChanges();
55+
_dbContext.SaveChanges();
5456

5557
var mapperMock = new Mock<AutoMapper.IMapper>();
5658
mapperMock.Setup(x => x.Map<ModuleTypeDbEntity>(It.IsAny<ModuleType>())).Returns(new ModuleTypeDbEntity());
@@ -61,7 +63,7 @@ public void SetUp()
6163
ModuleTypeFactory.ModuleType(_moduleTypeId2, "Name", "Title", "Description")
6264
});
6365

64-
_sut = new ModuleTypeRepository(dbContext, mapperMock.Object);
66+
_sut = new ModuleTypeRepository(_dbContext, mapperMock.Object);
6567
}
6668

6769
[Test]
@@ -89,6 +91,18 @@ public void Should_return_all_moduleTypes()
8991
public void Should_save_new_moduleType()
9092
{
9193
var newModuleType = ModuleTypeFactory.ModuleType(Guid.NewGuid(), "Name 3", "Title 3", "Description 3");
94+
var newModuleTypeDbEntity = new ModuleTypeDbEntity
95+
{
96+
Id = newModuleType.Id,
97+
Title = newModuleType.Title,
98+
Name = newModuleType.Name
99+
};
100+
101+
var mapperMock = new Mock<IMapper>();
102+
mapperMock.Setup(x => x.Map<ModuleTypeDbEntity>(newModuleType)).Returns(newModuleTypeDbEntity);
103+
mapperMock.Setup(x => x.Map<ModuleType>(newModuleTypeDbEntity)).Returns(newModuleType);
104+
105+
_sut = new ModuleTypeRepository(_dbContext, mapperMock.Object);
92106

93107
_sut.Create(newModuleType);
94108

‎tests/Weapsy.Domain.Data.SqlServer.Tests/PageRepositoryTests.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System;
44
using System.Collections.Generic;
55
using System.Linq;
6+
using AutoMapper;
67
using Moq;
78
using Weapsy.Domain.Data.SqlServer.Repositories;
89
using Weapsy.Domain.Pages;
@@ -17,6 +18,7 @@ namespace Weapsy.Domain.Data.SqlServer.Tests
1718
public class PageRepositoryTests
1819
{
1920
private IPageRepository _sut;
21+
private WeapsyDbContext _dbContext;
2022
private Guid _siteId;
2123
private Guid _pageId1;
2224
private Guid _pageId2;
@@ -29,7 +31,7 @@ public void SetUp()
2931
{
3032
var optionsBuilder = new DbContextOptionsBuilder<WeapsyDbContext>();
3133
optionsBuilder.UseInMemoryDatabase();
32-
var dbContext = new WeapsyDbContext(optionsBuilder.Options);
34+
_dbContext = new WeapsyDbContext(optionsBuilder.Options);
3335

3436
_siteId = Guid.NewGuid();
3537
_pageId1 = Guid.NewGuid();
@@ -38,7 +40,7 @@ public void SetUp()
3840
_pageModuleId1 = Guid.NewGuid();
3941
_languageId1 = Guid.NewGuid();
4042

41-
dbContext.Set<PageDbEntity>().AddRange(
43+
_dbContext.Set<PageDbEntity>().AddRange(
4244
new PageDbEntity
4345
{
4446
SiteId = _siteId,
@@ -93,7 +95,7 @@ public void SetUp()
9395
}
9496
);
9597

96-
dbContext.SaveChanges();
98+
_dbContext.SaveChanges();
9799

98100
var mapperMock = new Mock<AutoMapper.IMapper>();
99101
mapperMock.Setup(x => x.Map<PageDbEntity>(It.IsAny<Page>())).Returns(new PageDbEntity());
@@ -104,7 +106,7 @@ public void SetUp()
104106
PageFactory.Page(_siteId, _pageId2, "Name")
105107
});
106108

107-
_sut = new PageRepository(dbContext, mapperMock.Object);
109+
_sut = new PageRepository(_dbContext, mapperMock.Object);
108110
}
109111

110112
[Test]
@@ -182,6 +184,18 @@ public void Should_return_all_pages_with_no_deleted_page_modules()
182184
public void Should_save_new_page()
183185
{
184186
var newPage = PageFactory.Page(_siteId, Guid.NewGuid(), "Name 3");
187+
var newPageDbEntity = new PageDbEntity
188+
{
189+
SiteId = newPage.SiteId,
190+
Id = newPage.Id,
191+
Title = newPage.Title
192+
};
193+
194+
var mapperMock = new Mock<IMapper>();
195+
mapperMock.Setup(x => x.Map<PageDbEntity>(newPage)).Returns(newPageDbEntity);
196+
mapperMock.Setup(x => x.Map<Page>(newPageDbEntity)).Returns(newPage);
197+
198+
_sut = new PageRepository(_dbContext, mapperMock.Object);
185199

186200
_sut.Create(newPage);
187201

‎tests/Weapsy.Domain.Data.SqlServer.Tests/SiteRepositoryTests.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
using Weapsy.Tests.Factories;
88
using SiteDbEntity = Weapsy.Domain.Data.SqlServer.Entities.Site;
99
using System.Collections.Generic;
10+
using AutoMapper;
1011

1112
namespace Weapsy.Domain.Data.SqlServer.Tests
1213
{
1314
[TestFixture]
1415
public class SiteRepositoryTests
1516
{
1617
private ISiteRepository _sut;
18+
private WeapsyDbContext _dbContext;
1719
private Guid _siteId1;
1820
private Guid _siteId2;
1921

@@ -22,12 +24,12 @@ public void SetUp()
2224
{
2325
var optionsBuilder = new DbContextOptionsBuilder<WeapsyDbContext>();
2426
optionsBuilder.UseInMemoryDatabase();
25-
var dbContext = new WeapsyDbContext(optionsBuilder.Options);
27+
_dbContext = new WeapsyDbContext(optionsBuilder.Options);
2628

2729
_siteId1 = Guid.NewGuid();
2830
_siteId2 = Guid.NewGuid();
2931

30-
dbContext.Set<SiteDbEntity>().AddRange(
32+
_dbContext.Set<SiteDbEntity>().AddRange(
3133
new SiteDbEntity
3234
{
3335
Id = _siteId1,
@@ -50,7 +52,7 @@ public void SetUp()
5052
}
5153
);
5254

53-
dbContext.SaveChanges();
55+
_dbContext.SaveChanges();
5456

5557
var mapperMock = new Mock<AutoMapper.IMapper>();
5658
mapperMock.Setup(x => x.Map<SiteDbEntity>(It.IsAny<Site>())).Returns(new SiteDbEntity());
@@ -61,7 +63,7 @@ public void SetUp()
6163
SiteFactory.Site(_siteId2, "Name")
6264
});
6365

64-
_sut = new SiteRepository(dbContext, mapperMock.Object);
66+
_sut = new SiteRepository(_dbContext, mapperMock.Object);
6567
}
6668

6769
[Test]
@@ -96,6 +98,17 @@ public void Should_return_all_sites()
9698
public void Should_save_new_site()
9799
{
98100
var newSite = SiteFactory.Site(Guid.NewGuid(), "Name 3");
101+
var newSiteDbEntity = new SiteDbEntity
102+
{
103+
Id = newSite.Id,
104+
Name = newSite.Name
105+
};
106+
107+
var mapperMock = new Mock<IMapper>();
108+
mapperMock.Setup(x => x.Map<SiteDbEntity>(newSite)).Returns(newSiteDbEntity);
109+
mapperMock.Setup(x => x.Map<Site>(newSiteDbEntity)).Returns(newSite);
110+
111+
_sut = new SiteRepository(_dbContext, mapperMock.Object);
99112

100113
_sut.Create(newSite);
101114

0 commit comments

Comments
 (0)