yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes up the unit tests

Browse Source
This commit is contained in:
Shannon
2014-01-08 17:08:13 +11:00
parent 056b13eb98
commit cdbf89ee57
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Properties/AssemblyInfo.cs
View File

@@ -44,4 +44,7 @@ using System.Security.Permissions;
[assembly: InternalsVisibleTo("Concorde.Sync")]
[assembly: InternalsVisibleTo("Umbraco.Belle")]
[assembly: InternalsVisibleTo("Umbraco.VisualStudio")]
[assembly: InternalsVisibleTo("umbraco.providers")]
[assembly: InternalsVisibleTo("umbraco.providers")]
//allow this to be mocked in our unit tests
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

3
src/Umbraco.Tests/BusinessLogic/ApplicationTest.cs
View File

@@ -1,4 +1,5 @@
using NUnit.Framework;
using Umbraco.Tests.TestHelpers;
using umbraco.BusinessLogic;
using System;
using System.Linq;
@@ -11,7 +12,7 @@ namespace Umbraco.Tests.BusinessLogic
///to contain all ApplicationTest Unit Tests
///</summary>
[TestFixture()]
public class ApplicationTest : BaseTest
public class ApplicationTest : BaseDatabaseFactoryTest
{
/// <summary>

14
src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
View File

@@ -59,7 +59,7 @@ namespace Umbraco.Tests.Membership
provider.Initialize("test", new NameValueCollection());
MembershipCreateStatus status;
var user = provider.CreateUser("test", "test", "test", "test@test.com", "test", "test", true, "test", out status);
var user = provider.CreateUser("test", "test", "testtest$1", "test@test.com", "test", "test", true, "test", out status);
Assert.IsNull(user);
}
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Membership
provider.Initialize("test", new NameValueCollection { { "requiresUniqueEmail", "true" } });
MembershipCreateStatus status;
var user = provider.CreateUser("test", "test", "test", "test@test.com", "test", "test", true, "test", out status);
var user = provider.CreateUser("test", "test", "testtest$1", "test@test.com", "test", "test", true, "test", out status);
Assert.IsNull(user);
}
@@ -105,7 +105,7 @@ namespace Umbraco.Tests.Membership
MembershipCreateStatus status;
provider.CreateUser("test", "test", "test", "test@test.com", "test", "test", true, "test", out status);
provider.CreateUser("test", "test", "testtest$1", "test@test.com", "test", "test", true, "test", out status);
Assert.AreNotEqual("test", createdMember.PasswordAnswer);
Assert.AreEqual(provider.EncryptString("test"), createdMember.PasswordAnswer);
@@ -137,11 +137,11 @@ namespace Umbraco.Tests.Membership
MembershipCreateStatus status;
provider.CreateUser("test", "test", "test", "test@test.com", "test", "test", true, "test", out status);
provider.CreateUser("test", "test", "testtest$1", "test@test.com", "test", "test", true, "test", out status);
Assert.AreNotEqual("test", createdMember.Password);
var decrypted = provider.DecryptPassword(createdMember.Password);
Assert.AreEqual("test", decrypted);
Assert.AreEqual("testtest$1", decrypted);
}
[Test]
@@ -170,13 +170,13 @@ namespace Umbraco.Tests.Membership
MembershipCreateStatus status;
provider.CreateUser("test", "test", "test", "test@test.com", "test", "test", true, "test", out status);
provider.CreateUser("test", "test", "testtest$1", "test@test.com", "test", "test", true, "test", out status);
Assert.AreNotEqual("test", createdMember.Password);
string salt;
var storedPassword = provider.StoredPassword(createdMember.Password, out salt);
var hashedPassword = provider.EncryptOrHashPassword("test", salt);
var hashedPassword = provider.EncryptOrHashPassword("testtest$1", salt);
Assert.AreEqual(hashedPassword, storedPassword);
}

5
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
View File

@@ -134,7 +134,8 @@ namespace Umbraco.Tests.Persistence.Repositories
var resolved = (User)repository.Get((int)user.Id);
resolved.Name = "New Name";
resolved.DefaultPermissions = new[]{"Z", "Y", "X"};
//the db column is not used, default permissions are taken from the user type's permissions, this is a getter only
//resolved.DefaultPermissions = "ZYX";
resolved.Language = "fr";
resolved.IsApproved = false;
resolved.Password = "new";
@@ -153,7 +154,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// Assert
Assert.That(updatedItem.Id, Is.EqualTo(resolved.Id));
Assert.That(updatedItem.Name, Is.EqualTo(resolved.Name));
Assert.That(updatedItem.DefaultPermissions, Is.EqualTo(resolved.DefaultPermissions));
//Assert.That(updatedItem.DefaultPermissions, Is.EqualTo(resolved.DefaultPermissions));
Assert.That(updatedItem.Language, Is.EqualTo(resolved.Language));
Assert.That(updatedItem.IsApproved, Is.EqualTo(resolved.IsApproved));
Assert.That(updatedItem.Password, Is.EqualTo(resolved.Password));