U4-6992,U4-7046 - more fixes & tests
This commit is contained in:
@@ -4,6 +4,7 @@ using System.Linq;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Cache;
|
||||
using Umbraco.Core.Logging;
|
||||
using Umbraco.Core.Models;
|
||||
|
||||
@@ -18,17 +19,20 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
[TestFixture]
|
||||
public class ServerRegistrationRepositoryTest : BaseDatabaseFactoryTest
|
||||
{
|
||||
private ICacheProvider _staticCache;
|
||||
|
||||
[SetUp]
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
_staticCache = new StaticCacheProvider();
|
||||
CreateTestData();
|
||||
}
|
||||
|
||||
private ServerRegistrationRepository CreateRepositor(IDatabaseUnitOfWork unitOfWork)
|
||||
private ServerRegistrationRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
|
||||
{
|
||||
return new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
|
||||
return new ServerRegistrationRepository(unitOfWork, _staticCache, Mock.Of<ILogger>(), SqlSyntax);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -39,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
|
||||
// Act
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
var server = new ServerRegistration("http://shazwazza.com", "COMPUTER1", DateTime.Now);
|
||||
repository.AddOrUpdate(server);
|
||||
@@ -57,7 +61,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
|
||||
// Act
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
var server = repository.Get(1);
|
||||
server.ServerIdentity = "COMPUTER2";
|
||||
@@ -75,7 +79,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
|
||||
// Act
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Assert
|
||||
Assert.That(repository, Is.Not.Null);
|
||||
@@ -88,7 +92,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var server = repository.Get(1);
|
||||
@@ -108,7 +112,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var servers = repository.GetAll();
|
||||
@@ -119,39 +123,41 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Perform_GetByQuery_On_Repository()
|
||||
{
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var query = Query<IServerRegistration>.Builder.Where(x => x.ServerIdentity.ToUpper() == "COMPUTER3");
|
||||
var result = repository.GetByQuery(query);
|
||||
// queries are not supported due to in-memory caching
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(1, result.Count());
|
||||
}
|
||||
}
|
||||
//[Test]
|
||||
//public void Can_Perform_GetByQuery_On_Repository()
|
||||
//{
|
||||
// // Arrange
|
||||
// var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
// var unitOfWork = provider.GetUnitOfWork();
|
||||
// using (var repository = CreateRepository(unitOfWork))
|
||||
// {
|
||||
// // Act
|
||||
// var query = Query<IServerRegistration>.Builder.Where(x => x.ServerIdentity.ToUpper() == "COMPUTER3");
|
||||
// var result = repository.GetByQuery(query);
|
||||
|
||||
[Test]
|
||||
public void Can_Perform_Count_On_Repository()
|
||||
{
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var query = Query<IServerRegistration>.Builder.Where(x => x.ServerAddress.StartsWith("http://"));
|
||||
int count = repository.Count(query);
|
||||
// // Assert
|
||||
// Assert.AreEqual(1, result.Count());
|
||||
// }
|
||||
//}
|
||||
|
||||
// Assert
|
||||
Assert.That(count, Is.EqualTo(2));
|
||||
}
|
||||
}
|
||||
//[Test]
|
||||
//public void Can_Perform_Count_On_Repository()
|
||||
//{
|
||||
// // Arrange
|
||||
// var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
// var unitOfWork = provider.GetUnitOfWork();
|
||||
// using (var repository = CreateRepository(unitOfWork))
|
||||
// {
|
||||
// // Act
|
||||
// var query = Query<IServerRegistration>.Builder.Where(x => x.ServerAddress.StartsWith("http://"));
|
||||
// int count = repository.Count(query);
|
||||
|
||||
// // Assert
|
||||
// Assert.That(count, Is.EqualTo(2));
|
||||
// }
|
||||
//}
|
||||
|
||||
[Test]
|
||||
public void Can_Perform_Add_On_Repository()
|
||||
@@ -159,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var server = new ServerRegistration("http://shazwazza.com", "COMPUTER4", DateTime.Now);
|
||||
@@ -178,7 +184,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var server = repository.Get(2);
|
||||
@@ -203,7 +209,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var server = repository.Get(3);
|
||||
@@ -224,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
// Arrange
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
var unitOfWork = provider.GetUnitOfWork();
|
||||
using (var repository = CreateRepositor(unitOfWork))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
// Act
|
||||
var exists = repository.Exists(3);
|
||||
@@ -246,7 +252,7 @@ namespace Umbraco.Tests.Persistence.Repositories
|
||||
{
|
||||
var provider = new PetaPocoUnitOfWorkProvider(Logger);
|
||||
using (var unitOfWork = provider.GetUnitOfWork())
|
||||
using (var repository = new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
|
||||
using (var repository = CreateRepository(unitOfWork))
|
||||
{
|
||||
repository.AddOrUpdate(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
|
||||
repository.AddOrUpdate(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
|
||||
|
||||
Reference in New Issue
Block a user