diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
index 0fc80c2e9..a88627cea 100644
--- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
+++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
@@ -14,7 +14,7 @@ using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.Records;
using Orchard.Security;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
namespace Orchard.Core.Tests.Common.Providers {
[TestFixture]
diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
index 06dc85b54..1b9a4e7ae 100644
--- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
+++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
@@ -10,7 +10,7 @@ using Orchard.ContentManagement.Records;
using Orchard.Core.Common.Models;
using Orchard.Core.Common.Records;
using Orchard.Core.Common.Services;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
namespace Orchard.Core.Tests.Common.Services {
[TestFixture]
diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
index 2feba552c..942464521 100644
--- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
+++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
@@ -19,7 +19,7 @@ using Orchard.Core.Feeds.Models;
using Orchard.Core.Feeds.Rss;
using Orchard.Core.Feeds.StandardBuilders;
using Orchard.Mvc.Results;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
using Orchard.Tests.Stubs;
namespace Orchard.Core.Tests.Feeds.Controllers {
diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
index 3b50bf5e0..fbc741551 100644
--- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
+++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
@@ -85,9 +85,9 @@
-
+
{6CB3EB30-F725-45C0-9742-42599BA8E8D2}
- Orchard.Tests.Packages
+ Orchard.Tests.Modules
{ABC826D4-2FA1-4F2F-87DE-E6095F653810}
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
index 1b387239f..4e1b01bae 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
@@ -10,7 +10,7 @@ using Orchard.Core.Scheduling.Services;
using Orchard.Data;
using Orchard.Tasks;
using Orchard.Tasks.Scheduling;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
namespace Orchard.Core.Tests.Scheduling {
[TestFixture]
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
index da31bd4b3..4a158a919 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
@@ -11,7 +11,7 @@ using Orchard.Core.Scheduling.Services;
using Orchard.Data;
using Orchard.Tasks;
using Orchard.Tasks.Scheduling;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
namespace Orchard.Core.Tests.Scheduling {
[TestFixture]
diff --git a/src/Orchard.Tests.Packages/DatabaseEnabledTestsBase.cs b/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
similarity index 94%
rename from src/Orchard.Tests.Packages/DatabaseEnabledTestsBase.cs
rename to src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
index 29c8deef3..be38447bf 100644
--- a/src/Orchard.Tests.Packages/DatabaseEnabledTestsBase.cs
+++ b/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
@@ -12,7 +12,7 @@ using Orchard.Services;
using Orchard.Tests.Data;
using Orchard.Tests.Stubs;
-namespace Orchard.Tests.Packages {
+namespace Orchard.Tests.Modules {
public abstract class DatabaseEnabledTestsBase {
protected IContainer _container;
diff --git a/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
similarity index 93%
rename from src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj
rename to src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
index c900560bc..a28202ae1 100644
--- a/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj
+++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
@@ -105,15 +105,15 @@
{9916839C-39FC-4CEB-A5AF-89CA7E87119F}
Orchard.Core
-
+
{4A9C04A6-0986-4A92-A610-5F59FF273FB9}
Orchard.Pages
-
+
{D10AD48F-407D-4DB5-A328-173EC7CB010F}
Orchard.Roles
-
+
{79AED36E-ABD0-4747-93D3-8722B042454B}
Orchard.Users
diff --git a/src/Orchard.Tests.Packages/Properties/AssemblyInfo.cs b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
similarity index 93%
rename from src/Orchard.Tests.Packages/Properties/AssemblyInfo.cs
rename to src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
index 9267927cb..b196c5dc9 100644
--- a/src/Orchard.Tests.Packages/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Orchard.Tests.Packages")]
+[assembly: AssemblyTitle("Orchard.Tests.Modules")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
diff --git a/src/Orchard.Tests.Packages/Roles/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Modules/Roles/Controllers/AdminControllerTests.cs
similarity index 67%
rename from src/Orchard.Tests.Packages/Roles/Controllers/AdminControllerTests.cs
rename to src/Orchard.Tests.Modules/Roles/Controllers/AdminControllerTests.cs
index 580cd5031..e48dfbe00 100644
--- a/src/Orchard.Tests.Packages/Roles/Controllers/AdminControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Roles/Controllers/AdminControllerTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
-namespace Orchard.Tests.Packages.Roles.Controllers {
+namespace Orchard.Tests.Modules.Roles.Controllers {
class AdminControllerTests {
}
}
diff --git a/src/Orchard.Tests.Packages/Roles/Services/RoleServiceTests.cs b/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs
similarity index 95%
rename from src/Orchard.Tests.Packages/Roles/Services/RoleServiceTests.cs
rename to src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs
index 845fe270a..8d5908699 100644
--- a/src/Orchard.Tests.Packages/Roles/Services/RoleServiceTests.cs
+++ b/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
using Orchard.Roles.Records;
using Orchard.Roles.Services;
-namespace Orchard.Tests.Packages.Roles.Services {
+namespace Orchard.Tests.Modules.Roles.Services {
[TestFixture]
public class RoleServiceTests : DatabaseEnabledTestsBase{
public override void Register(ContainerBuilder builder) {
diff --git a/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
similarity index 96%
rename from src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs
rename to src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
index 70ded2775..2200557e2 100644
--- a/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
@@ -22,7 +22,7 @@ using Orchard.Users.Models;
using Orchard.Users.Services;
using Orchard.Users.ViewModels;
-namespace Orchard.Tests.Packages.Users.Controllers {
+namespace Orchard.Tests.Modules.Users.Controllers {
[TestFixture]
public class AdminControllerTests : DatabaseEnabledTestsBase {
private AdminController _controller;
diff --git a/src/Orchard.Tests.Packages/Users/Services/MembershipServiceTests.cs b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
similarity index 96%
rename from src/Orchard.Tests.Packages/Users/Services/MembershipServiceTests.cs
rename to src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
index 74b363067..e9ae9d6cd 100644
--- a/src/Orchard.Tests.Packages/Users/Services/MembershipServiceTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
@@ -16,7 +16,7 @@ using Orchard.Security;
using Orchard.Users.Models;
using Orchard.Users.Services;
-namespace Orchard.Tests.Packages.Users.Services {
+namespace Orchard.Tests.Modules.Users.Services {
[TestFixture]
public class MembershipServiceTests {
private IMembershipService _membershipService;
diff --git a/src/Orchard.Tests.Packages/Values.cs b/src/Orchard.Tests.Modules/Values.cs
similarity index 94%
rename from src/Orchard.Tests.Packages/Values.cs
rename to src/Orchard.Tests.Modules/Values.cs
index 6ab28b8fd..3e6bf9146 100644
--- a/src/Orchard.Tests.Packages/Values.cs
+++ b/src/Orchard.Tests.Modules/Values.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Web.Mvc;
-namespace Orchard.Tests.Packages {
+namespace Orchard.Tests.Modules {
public static class Values {
public static IValueProvider From(T obj) {
if (obj is IDictionary) {
diff --git a/src/Orchard.Tests.Packages/XmlRpc/Controllers/HomeControllerTests.cs b/src/Orchard.Tests.Modules/XmlRpc/Controllers/HomeControllerTests.cs
similarity index 94%
rename from src/Orchard.Tests.Packages/XmlRpc/Controllers/HomeControllerTests.cs
rename to src/Orchard.Tests.Modules/XmlRpc/Controllers/HomeControllerTests.cs
index 63e3bfd12..576424a9e 100644
--- a/src/Orchard.Tests.Packages/XmlRpc/Controllers/HomeControllerTests.cs
+++ b/src/Orchard.Tests.Modules/XmlRpc/Controllers/HomeControllerTests.cs
@@ -7,7 +7,7 @@ using Orchard.Core.XmlRpc.Controllers;
using Orchard.Core.XmlRpc.Models;
using Orchard.Core.XmlRpc.Services;
-namespace Orchard.Tests.Packages.XmlRpc.Controllers {
+namespace Orchard.Tests.Modules.XmlRpc.Controllers {
[TestFixture]
public class HomeControllerTests {
[Test]
diff --git a/src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcReaderTests.cs b/src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcReaderTests.cs
similarity index 96%
rename from src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcReaderTests.cs
rename to src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcReaderTests.cs
index 3fb36a2e0..8122ba015 100644
--- a/src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcReaderTests.cs
+++ b/src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcReaderTests.cs
@@ -4,7 +4,7 @@ using NUnit.Framework;
using Orchard.Core.XmlRpc.Models;
using Orchard.Core.XmlRpc.Services;
-namespace Orchard.Tests.Packages.XmlRpc.Services {
+namespace Orchard.Tests.Modules.XmlRpc.Services {
[TestFixture]
public class XmlRpcReaderTests {
private IMapper _methodCallMapper;
diff --git a/src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcWriterTests.cs b/src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcWriterTests.cs
similarity index 94%
rename from src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcWriterTests.cs
rename to src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcWriterTests.cs
index ad5b24122..dfc91a6ef 100644
--- a/src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcWriterTests.cs
+++ b/src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcWriterTests.cs
@@ -3,7 +3,7 @@ using NUnit.Framework;
using Orchard.Core.XmlRpc.Models;
using Orchard.Core.XmlRpc.Services;
-namespace Orchard.Tests.Packages.XmlRpc.Services {
+namespace Orchard.Tests.Modules.XmlRpc.Services {
[TestFixture]
public class XmlRpcWriterTests {
[Test]
diff --git a/src/Orchard.Tests/Extensions/ExtensionFoldersTests.cs b/src/Orchard.Tests/Extensions/ExtensionFoldersTests.cs
index 526dda3b6..d5a020ae6 100644
--- a/src/Orchard.Tests/Extensions/ExtensionFoldersTests.cs
+++ b/src/Orchard.Tests/Extensions/ExtensionFoldersTests.cs
@@ -48,8 +48,8 @@ namespace Orchard.Tests.Extensions {
}
[Test]
- public void NamesFromFoldersWithPackageTxtShouldBeListed() {
- var folders = new PackageFolders(new[] { _tempFolderName });
+ public void NamesFromFoldersWithModuleTxtShouldBeListed() {
+ var folders = new ModuleFolders(new[] { _tempFolderName });
var names = folders.ListNames();
Assert.That(names.Count(), Is.EqualTo(2));
Assert.That(names, Has.Some.EqualTo("Sample1"));
@@ -57,8 +57,8 @@ namespace Orchard.Tests.Extensions {
}
[Test]
- public void PackageTxtShouldBeParsedAndReturnedAsYamlDocument() {
- var folders = new PackageFolders(new[] { _tempFolderName });
+ public void ModuleTxtShouldBeParsedAndReturnedAsYamlDocument() {
+ var folders = new ModuleFolders(new[] { _tempFolderName });
var sample1 = folders.ParseManifest("Sample1");
var mapping = (Mapping)sample1.YamlDocument.Root;
var entities = mapping.Entities
diff --git a/src/Orchard.Tests/Extensions/FoldersData/Sample1/Package.txt b/src/Orchard.Tests/Extensions/FoldersData/Sample1/Module.txt
similarity index 100%
rename from src/Orchard.Tests/Extensions/FoldersData/Sample1/Package.txt
rename to src/Orchard.Tests/Extensions/FoldersData/Sample1/Module.txt
diff --git a/src/Orchard.Tests/Extensions/FoldersData/Sample3/Package.txt b/src/Orchard.Tests/Extensions/FoldersData/Sample3/Module.txt
similarity index 100%
rename from src/Orchard.Tests/Extensions/FoldersData/Sample3/Package.txt
rename to src/Orchard.Tests/Extensions/FoldersData/Sample3/Module.txt
diff --git a/src/Orchard.Tests/Orchard.Tests.csproj b/src/Orchard.Tests/Orchard.Tests.csproj
index fddacf379..60ca7b993 100644
--- a/src/Orchard.Tests/Orchard.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Tests.csproj
@@ -184,9 +184,9 @@
-
+
-
+