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

Starts fixing up some tests, un-ignores tests that shouldn't be ignored.

Browse Source
This commit is contained in:
Shannon
2013-11-01 17:32:03 +11:00
parent e4bd459da4
commit 9342a7e897
6 changed files with 28 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Tests/AngularIntegration/JsInitializationTests.cs
View File

@@ -26,9 +26,27 @@ namespace Umbraco.Tests.AngularIntegration
{
var result = JsInitialization.ParseMain(new[] { "[World]", "Hello" });
Assert.IsTrue(result.StartsWith(@"yepnope({
Assert.AreEqual(@"yepnope({
load: [
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/1.1.5/angular.min.js',
'lib/underscore/underscore.js',
],
complete: function () {
yepnope({
load: [World],
complete: function () {
load: [World],"));
//we need to set the legacy UmbClientMgr path
UmbClientMgr.setUmbracoPath('Hello');
jQuery(document).ready(function () {
angular.bootstrap(document, ['umbraco']);
});
}
});
}
});", result);
}
}
}

100
src/Umbraco.Tests/LegacyApi/MediaTypeTests.cs
View File

@@ -1,100 +0,0 @@
using System;
using System.Linq;
using NUnit.Framework;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using umbraco.BusinessLogic;
using umbraco.cms.businesslogic.datatype;
using umbraco.cms.businesslogic.media;
using Umbraco.Core;
namespace Umbraco.Tests.LegacyApi
{
[TestFixture, Ignore]
public class MediaTypeTests : BaseDatabaseFactoryTest
{
[SetUp]
public override void Initialize()
{
base.Initialize();
CreateTestData();
}
[Test]
public void Can_Verify_AllowedChildContentTypes_On_MediaType()
{
// Arrange
var folder = MediaType.GetByAlias(Constants.Conventions.MediaTypes.Folder);
var folderStructure = folder.AllowedChildContentTypeIDs.ToList();
folderStructure.Add(1045);
// Act
folder.AllowedChildContentTypeIDs = folderStructure.ToArray();
folder.Save();
// Assert
var updated = MediaType.GetByAlias(Constants.Conventions.MediaTypes.Folder);
Assert.That(updated.AllowedChildContentTypeIDs.Any(), Is.True);
Assert.That(updated.AllowedChildContentTypeIDs.Any(x => x == 1045), Is.True);
}
[Test]
public void Can_Set_Tab_On_PropertyType()
{
var UPLOAD_DATATYPE_ID = -90;
var CROP_DATATYPE_ID = 1043;
var LABEL_DATATYPE_ID = -92;
var mediaTypeName = "ImageWide";
MediaType mediaType = MediaType.MakeNew(new User(0), mediaTypeName);
int imageTab = mediaType.AddVirtualTab("Image");
int cropTab = mediaType.AddVirtualTab("Crop");
mediaType.AddPropertyType(new DataTypeDefinition(UPLOAD_DATATYPE_ID), Constants.Conventions.Media.File, "Upload image");
mediaType.AddPropertyType(new DataTypeDefinition(LABEL_DATATYPE_ID), Constants.Conventions.Media.Width, "Width");
mediaType.AddPropertyType(new DataTypeDefinition(LABEL_DATATYPE_ID), Constants.Conventions.Media.Height, "Height");
mediaType.AddPropertyType(new DataTypeDefinition(LABEL_DATATYPE_ID), Constants.Conventions.Media.Bytes, "Size");
mediaType.AddPropertyType(new DataTypeDefinition(LABEL_DATATYPE_ID), Constants.Conventions.Media.Extension, "Type");
mediaType.AddPropertyType(new DataTypeDefinition(CROP_DATATYPE_ID), "wideImage", "Wide image");
mediaType.SetTabOnPropertyType(mediaType.getPropertyType(Constants.Conventions.Media.File), imageTab);
mediaType.SetTabOnPropertyType(mediaType.getPropertyType(Constants.Conventions.Media.Width), imageTab);
mediaType.SetTabOnPropertyType(mediaType.getPropertyType(Constants.Conventions.Media.Height), imageTab);
mediaType.SetTabOnPropertyType(mediaType.getPropertyType(Constants.Conventions.Media.Bytes), imageTab);
mediaType.SetTabOnPropertyType(mediaType.getPropertyType(Constants.Conventions.Media.Extension), imageTab);
mediaType.SetTabOnPropertyType(mediaType.getPropertyType("wideImage"), cropTab);
mediaType.Text = mediaTypeName;
mediaType.IconUrl = "mediaPhoto.gif";
mediaType.Save();
Assert.That(mediaType.getVirtualTabs.Count(), Is.EqualTo(2));
Assert.That(mediaType.getVirtualTabs.Any(x => x.Caption.Equals("Image")), Is.True);
Assert.That(mediaType.getVirtualTabs.Any(x => x.Caption.Equals("Crop")), Is.True);
var updated = new MediaType(mediaType.Id);
Assert.That(updated.getVirtualTabs.Count(), Is.EqualTo(2));
Assert.That(updated.getVirtualTabs.Any(x => x.Caption.Equals("Image")), Is.True);
Assert.That(updated.getVirtualTabs.Any(x => x.Caption.Equals("Crop")), Is.True);
Assert.That(updated.ContentTypeItem.PropertyGroups.Count(), Is.EqualTo(2));
Assert.That(updated.ContentTypeItem.PropertyTypes.Count(), Is.EqualTo(6));
}
public void CreateTestData()
{
//Create and Save ContentType "video" -> 1045
var videoMediaType = MockedContentTypes.CreateVideoMediaType();
ServiceContext.ContentTypeService.Save(videoMediaType);
}
[TearDown]
public override void TearDown()
{
base.TearDown();
}
}
}

12
src/Umbraco.Tests/PluginManagerTests.cs
View File

@@ -268,7 +268,7 @@ namespace Umbraco.Tests
public void Resolves_Assigned_Mappers()
{
var foundTypes1 = PluginManager.Current.ResolveAssignedMapperTypes();
Assert.AreEqual(19, foundTypes1.Count());
Assert.AreEqual(20, foundTypes1.Count());
}
[Test]
@@ -282,21 +282,21 @@ namespace Umbraco.Tests
public void Resolves_Attributed_Trees()
{
var trees = PluginManager.Current.ResolveAttributedTrees();
Assert.AreEqual(20, trees.Count());
Assert.AreEqual(19, trees.Count());
}
[Test]
public void Resolves_Actions()
{
var actions = PluginManager.Current.ResolveActions();
Assert.AreEqual(38, actions.Count());
Assert.AreEqual(36, actions.Count());
}
[Test]
public void Resolves_Trees()
{
var trees = PluginManager.Current.ResolveTrees();
Assert.AreEqual(40, trees.Count());
Assert.AreEqual(39, trees.Count());
}
[Test]
@@ -310,7 +310,7 @@ namespace Umbraco.Tests
public void Resolves_DataTypes()
{
var types = PluginManager.Current.ResolveDataTypes();
Assert.AreEqual(38, types.Count());
Assert.AreEqual(35, types.Count());
}
[Test]
@@ -331,7 +331,7 @@ namespace Umbraco.Tests
public void Resolves_XsltExtensions()
{
var types = PluginManager.Current.ResolveXsltExtensions();
Assert.AreEqual(1, types.Count());
Assert.AreEqual(3, types.Count());
}
[XsltExtension("Blah.Blah")]

5
src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
View File

@@ -38,7 +38,6 @@ namespace Umbraco.Tests.PublishedContent
return xmlContent;
}
[Ignore]
[Test]
public void IsDocumentType_NonRecursive_ActualType_ReturnsTrue()
{
@@ -48,7 +47,6 @@ namespace Umbraco.Tests.PublishedContent
Assert.That(publishedContent.IsDocumentType("inherited", false));
}
[Ignore]
[Test]
public void IsDocumentType_NonRecursive_BaseType_ReturnsFalse()
{
@@ -58,7 +56,6 @@ namespace Umbraco.Tests.PublishedContent
Assert.That(publishedContent.IsDocumentType("base", false), Is.False);
}
[Ignore]
[Test]
public void IsDocumentType_Recursive_ActualType_ReturnsTrue()
{
@@ -68,7 +65,6 @@ namespace Umbraco.Tests.PublishedContent
Assert.That(publishedContent.IsDocumentType("inherited", true));
}
[Ignore]
[Test]
public void IsDocumentType_Recursive_BaseType_ReturnsTrue()
{
@@ -78,7 +74,6 @@ namespace Umbraco.Tests.PublishedContent
Assert.That(publishedContent.IsDocumentType("base", true));
}
[Ignore]
[Test]
public void IsDocumentType_Recursive_InvalidBaseType_ReturnsFalse()
{

4
src/Umbraco.Tests/TypeFinderTests.cs
View File

@@ -85,8 +85,8 @@ namespace Umbraco.Tests
var originalTypesFound = TypeFinderOriginal.FindClassesOfType<IApplicationStartupHandler>(_assemblies);
Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
Assert.AreEqual(6, typesFound.Count());
Assert.AreEqual(6, originalTypesFound.Count());
Assert.AreEqual(5, typesFound.Count());
Assert.AreEqual(5, originalTypesFound.Count());
}
[Test]

1
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -294,7 +294,6 @@
<Compile Include="CoreStrings\DefaultShortStringHelperTests.cs" />
<Compile Include="CoreStrings\LegacyStringExtensionsTests.cs" />
<Compile Include="CoreStrings\MockShortStringHelper.cs" />
<Compile Include="LegacyApi\MediaTypeTests.cs" />
<Compile Include="Macros\MacroTests.cs" />
<Compile Include="Migrations\AlterMigrationTests.cs" />
<Compile Include="Migrations\Upgrades\BaseUpgradeTest.cs" />