Merge

--HG--
branch : dev

src/Orchard.Tests.Modules/Comments/Services/CommentServiceTests.cs

@@ -0,0 +1,211 @@
+using System;
+using System.Collections.Generic;
+using Autofac;
+using JetBrains.Annotations;
+using Moq;
+using NUnit.Framework;
+using Orchard.Comments.Handlers;
+using Orchard.Comments.Models;
+using Orchard.Comments.Services;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.Handlers;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.Records;
+using Orchard.Core.Common.Handlers;
+using Orchard.Core.Common.Models;
+using Orchard.Data;
+using Orchard.DisplayManagement;
+using Orchard.DisplayManagement.Descriptors;
+using Orchard.DisplayManagement.Implementation;
+using Orchard.Environment;
+using Orchard.Environment.Extensions;
+using Orchard.Security;
+using Orchard.Tests.Stubs;
+using Orchard.UI.Notify;
+
+namespace Orchard.Tests.Modules.Comments.Services {
+    [TestFixture]
+    public class CommentServiceTests : DatabaseEnabledTestsBase {
+        private IContentManager _contentManager;
+        private ICommentService _commentService;
+
+        public override void Register(ContainerBuilder builder) {
+            builder.RegisterType<CommentService>().As<ICommentService>();
+            builder.RegisterType<StubCommentValidator>().As<ICommentValidator>();
+            builder.RegisterType<DefaultContentManager>().As<IContentManager>();
+            builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
+            builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
+            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
+            builder.RegisterInstance(new Mock<IAuthorizer>().Object);
+            builder.RegisterInstance(new Mock<INotifier>().Object);
+            builder.RegisterInstance(new Mock<IContentDisplay>().Object);
+            builder.RegisterInstance(new Mock<IAuthenticationService>().Object);
+            builder.RegisterType<OrchardServices>().As<IOrchardServices>();
+            builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
+            builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<CommentedItemHandler>().As<IContentHandler>();
+            builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
+            builder.RegisterType<CommentPartHandler>().As<IContentHandler>();
+            builder.RegisterType<CommonPartHandler>().As<IContentHandler>();
+            builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
+            builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
+            builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
+        }
+
+        public override void Init() {
+            base.Init();
+            _commentService = _container.Resolve<ICommentService>();
+            _contentManager = _container.Resolve<IContentManager>();
+        }
+
+
+        protected override IEnumerable<Type> DatabaseTypes {
+            get {
+                return new[] {
+                    typeof(CommentPartRecord),
+                    typeof(ContentItemRecord),
+                    typeof(ContentItemVersionRecord),
+                    typeof(ContentTypeRecord),
+                };
+            }
+        }
+
+        [Test]
+        public void CommentedItemShouldHaveACommentPart() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+
+            Assert.That(commentedItem.As<CommentPart>(), Is.Not.Null);
+        }
+
+        [Test]
+        public void GetCommentsShouldReturnAllComments() {
+            for (int i = 0; i < 12; i++) {
+                var commentedItem = _contentManager.New("commentedItem");
+                _contentManager.Create(commentedItem);
+                _contentManager.Create(commentedItem, VersionOptions.Published);
+
+            }
+
+            Assert.That(_commentService.GetComments().Count(), Is.EqualTo(12));
+        }
+
+        [Test]
+        public void GetCommentedContentShouldReturnCommentedContentItem() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+
+            Assert.That(_commentService.GetCommentedContent(commentId), Is.Not.Null);
+        }
+
+        [Test]
+        public void UpdateShouldChangeComment() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+
+            Assert.That(_commentService.GetComment(commentId).Record.Author, Is.Null.Or.Empty);
+
+            _commentService.UpdateComment(commentId, "test", "", "", "new text", CommentStatus.Pending);
+
+            Assert.That(_commentService.GetComment(commentId).Record.Author, Is.EqualTo("test"));
+        }
+
+        [Test]
+        public void CommentsShouldBePendingByDefault() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Pending));
+        }
+
+        [Test]
+        public void ApproveShouldUpdateCommentStatus() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+            _commentService.ApproveComment(commentId);
+
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Approved));
+        }
+
+        [Test]
+        public void UnapproveShouldPendComment() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+            _commentService.ApproveComment(commentId);
+
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Approved));
+
+            _commentService.UnapproveComment(commentId);
+            
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Pending));
+        }
+
+        [Test]
+        public void MarkAsSpamShouldFlagComments() {
+            var commentedItem = _contentManager.New("commentedItem");
+            _contentManager.Create(commentedItem);
+            _contentManager.Create(commentedItem, VersionOptions.Published);
+            int commentId = commentedItem.As<CommentPart>().Id;
+            _commentService.ApproveComment(commentId);
+
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Approved));
+
+            _commentService.MarkCommentAsSpam(commentId);
+
+            Assert.That(_commentService.GetComment(commentId).Record.Status, Is.EqualTo(CommentStatus.Spam));
+        }
+
+        [Test]
+        public void DeleteShouldRemoveComments() {
+            var commentIds = new int[12];
+
+            for (int i = 0; i < 12; i++) {
+                var commentedItem = _contentManager.New("commentedItem");
+                _contentManager.Create(commentedItem);
+                _contentManager.Create(commentedItem, VersionOptions.Published);
+                commentIds[i] = commentedItem.As<CommentPart>().Id;
+            }
+
+            Assert.That(_commentService.GetComments().Count(), Is.EqualTo(12));
+
+            for (int i = 0; i < 12; i++) {
+                _commentService.DeleteComment(commentIds[i]);
+            }
+        }
+    }
+
+    [UsedImplicitly]
+    public class CommentedItemHandler : ContentHandler {
+        public CommentedItemHandler() {
+            Filters.Add(new ActivatingFilter<CommentedItem>("commentedItem"));
+            Filters.Add(new ActivatingFilter<CommentPart>("commentedItem"));
+            Filters.Add(new ActivatingFilter<CommonPart>("commentedItem"));
+        }
+    }
+
+    public class CommentedItem : ContentPart {
+    }
+
+    public class CommentedItemDriver : ContentPartDriver<CommentedItem> {
+        public static readonly string ContentTypeName = "commentedItem";
+    }
+
+    public class StubCommentValidator : ICommentValidator {
+        public bool ValidateComment(CommentPart commentPart) {
+            return true;
+        }
+    }
+}

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -135,6 +135,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CodeGeneration\Commands\CodeGenerationCommandsTests.cs" />
+    <Compile Include="Comments\Services\CommentServiceTests.cs" />
     <Compile Include="Scripting\EvaluatorTests.cs" />
     <Compile Include="Scripting\ParserTests.cs" />
     <Compile Include="Scripting\TokenizerTests.cs" />
@@ -179,6 +180,10 @@
       <Project>{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962}</Project>
       <Name>Orchard.CodeGeneration</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Comments\Orchard.Comments.csproj">
+      <Project>{14C049FD-B35B-415A-A824-87F26B26E7FD}</Project>
+      <Name>Orchard.Comments</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Media\Orchard.Media.csproj">
       <Project>{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}</Project>
       <Name>Orchard.Media</Name>
@@ -252,6 +257,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Packaging\Hello.World.csproj.txt" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentPartHandler.cs

@@ -1,8 +1,6 @@
 using JetBrains.Annotations;
-using Orchard.Comments.Drivers;
 using Orchard.Comments.Models;
 using Orchard.ContentManagement.Handlers;
-using Orchard.Core.Common.Models;
 using Orchard.Data;
 
 namespace Orchard.Comments.Handlers {