From 0e4f10e2888fe3a55a47cf6adfca621fd5cb5717 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Wed, 21 Aug 2013 16:03:14 -0700 Subject: [PATCH] Clean up Platform Unit Tests --- DNN Platform/Tests/App.config | 12 +- .../DotNetNuke.Tests.Core.csproj | 35 --- .../DotNetNuke.Tests.Data.csproj | 4 - .../AssemblyInfo.cs | 58 +++++ .../Data}/PetaPocoDataContextTests.cs | 0 .../Data}/PetaPocoIntegrationTests.cs | 0 .../Data}/PetaPocoMapperTests.cs | 0 .../Data}/PetaPocoRepositoryTests.cs | 0 .../DotNetNuke.Tests.Integration.csproj | 200 ++++++++++++++++++ .../MergeFiles/AddWithLocationTarget.xml | 0 .../InsertAfterInLocationTarget.xml | 0 .../InsertAttributeInLocationTarget.xml | 0 .../InsertBeforeInLocationTarget.xml | 0 .../RemoveAttributeFromLocationTarget.xml | 0 .../MergeFiles/RemoveFromLocationTarget.xml | 0 .../Installer/MergeFiles/SimpleAddMerge.xml | 0 .../Installer/MergeFiles/SimpleAddTarget.xml | 0 .../MergeFiles/SimpleInsertAfterMerge.xml | 0 .../MergeFiles/SimpleInsertAfterTarget.xml | 0 .../MergeFiles/SimpleInsertAttributeMerge.xml | 0 .../SimpleInsertAttributeTarget.xml | 0 .../MergeFiles/SimpleInsertBeforeMerge.xml | 0 .../MergeFiles/SimpleInsertBeforeTarget.xml | 0 .../MergeFiles/SimpleRemoveAttributeMerge.xml | 0 .../SimpleRemoveAttributeTarget.xml | 0 .../MergeFiles/SimpleRemoveMerge.xml | 0 .../MergeFiles/SimpleRemoveTarget.xml | 0 .../SimpleUpdateInLocationTarget.xml | 0 ...LocationWithDistractingLocationsTarget.xml | 0 .../MergeFiles/SimpleUpdateMerge.xml | 0 .../MergeFiles/SimpleUpdateTarget.xml | 0 .../MergeFiles/SimpleUpdateWithKeyMerge.xml | 0 .../MergeFiles/SimpleUpdateWithKeyTarget.xml | 0 .../UpdateAttributeInLocationTarget.xml | 0 ...DistractingLocationAndTargetPathTarget.xml | 0 ...DistractingLocationAndTargetPathTarget.xml | 0 .../UpdateInLocationWithTargetPathTarget.xml | 0 ...DistractingLocationAndTargetPathTarget.xml | 0 .../UpdateWithKeyInLocationTarget.xml | 0 .../MergeFiles/UpdateWithTargetPathMerge.xml | 0 .../MergeFiles/UpdateWithTargetPathTarget.xml | 0 .../Services/Installer/XmlMergeTests.cs | 7 +- .../DotNetNuke.Tests.Integration/TestSetup.cs | 41 ++++ .../packages.config | 6 + .../ProfileManagerPresenterTests.cs | 2 +- .../VocabularyListPresenterTests.cs | 36 +--- .../DotNetNuke.Tests.Utilities/DnnUnitTest.cs | 2 - .../DotNetNuke.Tests.Utilities.csproj | 4 - DNN_Core.sln | 18 +- DNN_Platform.sln | 9 + 50 files changed, 340 insertions(+), 94 deletions(-) create mode 100644 DNN Platform/Tests/DotNetNuke.Tests.Integration/AssemblyInfo.cs rename DNN Platform/Tests/{DotNetNuke.Tests.Data => DotNetNuke.Tests.Integration/Data}/PetaPocoDataContextTests.cs (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Data => DotNetNuke.Tests.Integration/Data}/PetaPocoIntegrationTests.cs (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Data => DotNetNuke.Tests.Integration/Data}/PetaPocoMapperTests.cs (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Data => DotNetNuke.Tests.Integration/Data}/PetaPocoRepositoryTests.cs (100%) create mode 100644 DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/AddWithLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/InsertAfterInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/InsertAttributeInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/InsertBeforeInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/RemoveAttributeFromLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/RemoveFromLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleAddMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleAddTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertAfterMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertAfterTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertAttributeMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertAttributeTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertBeforeMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleInsertBeforeTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleRemoveAttributeMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleRemoveAttributeTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleRemoveMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleRemoveTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateInLocationWithDistractingLocationsTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateWithKeyMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/SimpleUpdateWithKeyTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateAttributeInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateInLocationWithTargetPathTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateWithDistractingLocationAndTargetPathTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateWithKeyInLocationTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateWithTargetPathMerge.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/MergeFiles/UpdateWithTargetPathTarget.xml (100%) rename DNN Platform/Tests/{DotNetNuke.Tests.Core => DotNetNuke.Tests.Integration}/Services/Installer/XmlMergeTests.cs (98%) create mode 100644 DNN Platform/Tests/DotNetNuke.Tests.Integration/TestSetup.cs create mode 100644 DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config diff --git a/DNN Platform/Tests/App.config b/DNN Platform/Tests/App.config index 4704067c63b..d719b23fe46 100644 --- a/DNN Platform/Tests/App.config +++ b/DNN Platform/Tests/App.config @@ -29,7 +29,9 @@
- + + + @@ -47,11 +49,11 @@ - - - + + + - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj index 4d33de1571b..c375fe8bdd0 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj @@ -136,7 +136,6 @@ - @@ -199,40 +198,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/AddWithLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/AddWithLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/AddWithLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/AddWithLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertAfterInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertAfterInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertAfterInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertAfterInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertAttributeInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertAttributeInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertAttributeInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertAttributeInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertBeforeInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertBeforeInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/InsertBeforeInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/InsertBeforeInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/RemoveAttributeFromLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/RemoveAttributeFromLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/RemoveAttributeFromLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/RemoveAttributeFromLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/RemoveFromLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/RemoveFromLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/RemoveFromLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/RemoveFromLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleAddMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleAddMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleAddMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleAddMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleAddTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleAddTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleAddTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleAddTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAfterMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAfterMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAfterMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAfterMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAfterTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAfterTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAfterTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAfterTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAttributeMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAttributeMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAttributeMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAttributeMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAttributeTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAttributeTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertAttributeTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertAttributeTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertBeforeMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertBeforeMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertBeforeMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertBeforeMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertBeforeTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertBeforeTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleInsertBeforeTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleInsertBeforeTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveAttributeMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveAttributeMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveAttributeMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveAttributeMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveAttributeTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveAttributeTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveAttributeTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveAttributeTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleRemoveTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleRemoveTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateInLocationWithDistractingLocationsTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateInLocationWithDistractingLocationsTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateInLocationWithDistractingLocationsTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateInLocationWithDistractingLocationsTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateWithKeyMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateWithKeyMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateWithKeyMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateWithKeyMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateWithKeyTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateWithKeyTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/SimpleUpdateWithKeyTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/SimpleUpdateWithKeyTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateAttributeInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateAttributeInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateAttributeInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateAttributeInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInLocationWithTargetPathTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInLocationWithTargetPathTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateInLocationWithTargetPathTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateInLocationWithTargetPathTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithDistractingLocationAndTargetPathTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithDistractingLocationAndTargetPathTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithDistractingLocationAndTargetPathTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithDistractingLocationAndTargetPathTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithKeyInLocationTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithKeyInLocationTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithKeyInLocationTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithKeyInLocationTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithTargetPathMerge.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithTargetPathMerge.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithTargetPathMerge.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithTargetPathMerge.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithTargetPathTarget.xml b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithTargetPathTarget.xml similarity index 100% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/MergeFiles/UpdateWithTargetPathTarget.xml rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/MergeFiles/UpdateWithTargetPathTarget.xml diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/XmlMergeTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/XmlMergeTests.cs similarity index 98% rename from DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/XmlMergeTests.cs rename to DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/XmlMergeTests.cs index 5d735202cfb..d416595bfaa 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Installer/XmlMergeTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/Services/Installer/XmlMergeTests.cs @@ -28,9 +28,10 @@ using DotNetNuke.Instrumentation; using DotNetNuke.Services.Installer; + using NUnit.Framework; -namespace DotNetNuke.Tests.Core.Services.Installer +namespace DotNetNuke.Tests.Integration.Services.Installer { [TestFixture] public class XmlMergeTests @@ -83,7 +84,7 @@ private string GetTestMethodName() private XmlDocument LoadTargetDoc(string testMethodName) { using (Stream targetStream = - _assembly.GetManifestResourceStream(string.Format("DotNetNuke.Tests.Core.Services.Installer.MergeFiles.{0}Target.xml", + _assembly.GetManifestResourceStream(string.Format("DotNetNuke.Tests.Integration.Services.Installer.MergeFiles.{0}Target.xml", testMethodName))) { Debug.Assert(targetStream != null, @@ -97,7 +98,7 @@ private XmlDocument LoadTargetDoc(string testMethodName) private XmlMerge GetXmlMerge(string fileName) { using (Stream mergeStream = - _assembly.GetManifestResourceStream(string.Format("DotNetNuke.Tests.Core.Services.Installer.MergeFiles.{0}Merge.xml", + _assembly.GetManifestResourceStream(string.Format("DotNetNuke.Tests.Integration.Services.Installer.MergeFiles.{0}Merge.xml", fileName))) { Debug.Assert(mergeStream != null, diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/TestSetup.cs b/DNN Platform/Tests/DotNetNuke.Tests.Integration/TestSetup.cs new file mode 100644 index 00000000000..b0c34fa9950 --- /dev/null +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/TestSetup.cs @@ -0,0 +1,41 @@ +#region Copyright +// +// DotNetNuke® - http://www.dotnetnuke.com +// Copyright (c) 2002-2013 +// by DotNetNuke Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +// documentation files (the "Software"), to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and +// to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial portions +// of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +#endregion +using DotNetNuke.Tests.Utilities.Mocks; + +using NUnit.Framework; + +namespace DotNetNuke.Tests.Core +{ + [SetUpFixture] + internal class TestSetup + { + [SetUp] + public void SetUp() + { + } + + [TearDown] + public void TearDown() + { + MockComponentProvider.ResetContainer(); + } + } +} \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config new file mode 100644 index 00000000000..0c185f3fb45 --- /dev/null +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/ProfileManagerPresenterTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/ProfileManagerPresenterTests.cs index 5659bde6f04..ef326806cab 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/ProfileManagerPresenterTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/ProfileManagerPresenterTests.cs @@ -84,7 +84,7 @@ public void ProfileManagerPresenter_GetHighlightProfiles() { _mockView.Raise(v => v.GetHighlightProfiles += null, EventArgs.Empty); - Assert.AreEqual(33, _mockView.Object.Model.HighlightProfiles.Count); + Assert.AreEqual(10, _mockView.Object.Model.HighlightProfiles.Count); } [Test] diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/VocabularyListPresenterTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/VocabularyListPresenterTests.cs index 17c5d7e0ed3..c6a764ee07c 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/VocabularyListPresenterTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/VocabularyListPresenterTests.cs @@ -120,34 +120,7 @@ public void VocabularyListPresenter_Constructor_Requires_Non_Null_VocabularyCont #endregion - #region View Load Tests - - [Test] - [TestCase(true)] - [TestCase(false)] - public void VocabularyListPresenter_Load_Calls_View_ShowAddButton(bool isEditable) - { - _mockPermission.Setup(p => p.HasModulePermission(It.IsAny(), It.IsAny())).Returns(isEditable); - // Arrange - var mockController = new Mock(); - var view = new Mock(); - view.Setup(v => v.Model).Returns(new VocabularyListModel()); - - var presenter = new VocabularyListPresenter(view.Object, mockController.Object) - { - ModuleContext = CreateModuleContext() - }; - presenter.IsEditable = isEditable; - - // Act (Raise the Load Event) - view.Raise(v => v.Load += null, EventArgs.Empty); - - // Assert - view.Verify(v => v.ShowAddButton(isEditable)); - } - - #endregion - + #region AddVocabulary Tests //[Test] @@ -173,11 +146,14 @@ public void VocabularyListPresenter_Load_Calls_View_ShowAddButton(bool isEditabl #endregion - private ModuleInstanceContext CreateModuleContext() + private ModuleInstanceContext CreateModuleContext(bool isEditable) { var context = new ModuleInstanceContext { Configuration = new ModuleInfo() }; context.Configuration.ModulePermissions = new ModulePermissionCollection(); - context.Configuration.ModulePermissions.Add(new ModulePermissionInfo {PermissionKey = "Edit"}); + if (isEditable) + { + context.Configuration.ModulePermissions.Add(new ModulePermissionInfo { PermissionKey = "Edit" }); + } return context; } } diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DnnUnitTest.cs b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DnnUnitTest.cs index ac579d4c7bd..f1c29b4ddf7 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DnnUnitTest.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DnnUnitTest.cs @@ -32,7 +32,6 @@ using DotNetNuke.ComponentModel; using DotNetNuke.Modules.HTMLEditorProvider; using DotNetNuke.Modules.NavigationProvider; -using DotNetNuke.Providers.FiftyOneClientCapabilityProvider; using DotNetNuke.Security.Membership; using DotNetNuke.Security.Permissions; using DotNetNuke.Security.Profile; @@ -121,7 +120,6 @@ private static void InstallComponents() ComponentFactory.InstallComponents(new ProviderInstaller("htmlEditor", typeof(HtmlEditorProvider), ComponentLifeStyleType.Transient)); ComponentFactory.InstallComponents(new ProviderInstaller("navigationControl", typeof(NavigationProvider), ComponentLifeStyleType.Transient)); ComponentFactory.InstallComponents(new ProviderInstaller("clientcapability", typeof(ClientCapabilityProvider))); - RegisterIfNotAlreadyRegistered("FiftyOneClientCapabilityProvider"); } private static void RegisterIfNotAlreadyRegistered() where TConcrete : class, new() diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj index 84b91769281..590376b4f11 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj @@ -118,10 +118,6 @@ {D391550C-7107-49B2-A6AC-8627C8B06ADC} DotNetNuke.Library - - {7e780100-f200-4720-b362-7c930c0843b8} - Provider.FiftyOneClientCapabilityProvider - diff --git a/DNN_Core.sln b/DNN_Core.sln index f931da0da91..205d87d1d3b 100644 --- a/DNN_Core.sln +++ b/DNN_Core.sln @@ -72,9 +72,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DNN_Platform", "http://loca SlnRelativePath = "Website\" EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Providers", "Providers", "{68F5A9B4-99E1-4FB8-B19C-DCC63C87B4A7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.FiftyOneClientCapabilityProvider", "DNN Platform\Providers\ClientCapabilityProviders\Provider.FiftyOneClientCapabilityProvider\Provider.FiftyOneClientCapabilityProvider.csproj", "{0EB2D920-395F-4DB7-8525-D9712E92FC3E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.Integration", "DNN Platform\Tests\DotNetNuke.Tests.Integration\DotNetNuke.Tests.Integration.csproj", "{6629A64D-58B9-48B9-B932-15AF193C2212}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -188,12 +186,12 @@ Global {6CD360CB-28EF-4727-90D3-06E2741EC568}.Debug|x86.ActiveCfg = Debug|Any CPU {6CD360CB-28EF-4727-90D3-06E2741EC568}.Release|Any CPU.ActiveCfg = Debug|Any CPU {6CD360CB-28EF-4727-90D3-06E2741EC568}.Release|x86.ActiveCfg = Debug|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Debug|x86.ActiveCfg = Debug|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Release|Any CPU.Build.0 = Release|Any CPU - {0EB2D920-395F-4DB7-8525-D9712E92FC3E}.Release|x86.ActiveCfg = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|x86.ActiveCfg = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|Any CPU.Build.0 = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -215,6 +213,6 @@ Global {705708E8-6AD9-4021-9B36-EFC83AD42EE7} = {88E649D7-1379-430F-B794-1F3B9B442C80} {96FD101E-326A-4038-A081-A347061A6B77} = {98739F02-F34A-4427-9A17-C0509E7AAD75} {F9CE7C63-C729-4E3A-A266-6B23D75A1247} = {7E98CA08-903E-45F7-BD83-853763D5E15B} - {0EB2D920-395F-4DB7-8525-D9712E92FC3E} = {68F5A9B4-99E1-4FB8-B19C-DCC63C87B4A7} + {6629A64D-58B9-48B9-B932-15AF193C2212} = {7E98CA08-903E-45F7-BD83-853763D5E15B} EndGlobalSection EndGlobal diff --git a/DNN_Platform.sln b/DNN_Platform.sln index 11945c0bc64..5869a405297 100644 --- a/DNN_Platform.sln +++ b/DNN_Platform.sln @@ -143,6 +143,8 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DNN_Platform", "http://loca EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.Taxonomy", "DNN Platform\Tests\DotNetNuke.Tests.Taxonomy\DotNetNuke.Tests.Taxonomy.csproj", "{86019DD5-96F3-4748-B47C-E51D0E81F219}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.Integration", "DNN Platform\Tests\DotNetNuke.Tests.Integration\DotNetNuke.Tests.Integration.csproj", "{6629A64D-58B9-48B9-B932-15AF193C2212}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -429,6 +431,12 @@ Global {86019DD5-96F3-4748-B47C-E51D0E81F219}.Release|Any CPU.ActiveCfg = Release|Any CPU {86019DD5-96F3-4748-B47C-E51D0E81F219}.Release|Any CPU.Build.0 = Release|Any CPU {86019DD5-96F3-4748-B47C-E51D0E81F219}.Release|x86.ActiveCfg = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Debug|x86.ActiveCfg = Debug|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|Any CPU.Build.0 = Release|Any CPU + {6629A64D-58B9-48B9-B932-15AF193C2212}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -489,5 +497,6 @@ Global {86019DD5-96F3-4748-B47C-E51D0E81F219} = {88E649D7-1379-430F-B794-1F3B9B442C80} {96FD101E-326A-4038-A081-A347061A6B77} = {98739F02-F34A-4427-9A17-C0509E7AAD75} {F9CE7C63-C729-4E3A-A266-6B23D75A1247} = {7E98CA08-903E-45F7-BD83-853763D5E15B} + {6629A64D-58B9-48B9-B932-15AF193C2212} = {7E98CA08-903E-45F7-BD83-853763D5E15B} EndGlobalSection EndGlobal