Skip to content

Commit

Permalink
Clean up Platform Unit Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
cnurse committed Aug 21, 2013
1 parent 43e7a57 commit 0e4f10e
Show file tree
Hide file tree
Showing 50 changed files with 340 additions and 94 deletions.
12 changes: 7 additions & 5 deletions DNN Platform/Tests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
<section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
</configSections>
<connectionStrings>
<add name="SiteSqlServer" connectionString="Server=(local);Database=DotNetNukeTrunk;Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="SiteSqlServer" connectionString="Server=(local);Database=DNN_Platform;Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="PetaPoco" connectionString="Data Source=|DataDirectory|Test.sdf" providerName="System.Data.SqlServerCe.4.0" />
<add name="Test" connectionString="Data Source=|DataDirectory|Test.sdf" providerName="System.Data.SqlServerCe.4.0" />
</connectionStrings>
<appSettings>
<add key="SiteSqlServer" value="Server=(local);Database=DotNetNukeTrunk;Integrated Security=True" />
Expand All @@ -47,11 +49,11 @@
<add key="TimeOut" value="100000" />
<add key="SiteURL" value="dotnetnuketrunk.dnndev.me" />
<add key="CloseWindow" value="false" />
<add key="DefaultPhysicalAppPath" value="C:\DotNetNuke\TFS\DotNetNuke\src\DotNetNuke_CS\Website" />
<add key="UrlTestFilesPath" value="C:\DotNetNuke\TFS\DotNetNuke\src\DotNetNuke_CS\Community\Tests\DotNetNuke.Tests.Urls\TestFiles" />
<add key="ScreenShotPath" value="C:\DotNetNuke\TFS\DotNetNuke\src\DotNetNuke_CS\Community\Tests\ScreenCaptures" />
<add key="DefaultPhysicalAppPath" value="D:\GitHub\Dnn.Platform\Website" />
<add key="UrlTestFilesPath" value="D:\GitHub\Dnn.Platform\Tests\DotNetNuke.Tests.Urls\TestFiles" />
<add key="ScreenShotPath" value="D:\GitHub\Dnn.Platform\Tests\ScreenCaptures" />
<!-- PreviewProfileManagement settings -->
<add key="HighlightDataPath" value="X:\DotNetNuke\TFS\DotNetNuke\src\DotNetNuke_CS\Modules\PreviewProfileManagement\Resources\highlightDevices.xml" />
<add key="HighlightDataPath" value="D:\GitHub\Dnn.Platform\DNN Platform\Modules\PreviewProfileManagement\Resources\highlightDevices.xml" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<!-- The system.webServer section is required for IIS7 compatability It is ignored by IIS6-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
<Compile Include="EscapedStringTest.cs" />
<Compile Include="RetryableActionTests.cs" />
<Compile Include="Services\ClientCapability\FacebookRequestControllerTests.cs" />
<Compile Include="Services\Installer\XmlMergeTests.cs" />
<Compile Include="Services\Localization\LocalizationTests.cs" />
<Compile Include="Services\Mail\MailTests.cs" />
<Compile Include="Services\Mobile\PreviewProfileControllerTests.cs" />
Expand Down Expand Up @@ -199,40 +198,6 @@
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Services\Installer\MergeFiles\AddWithLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertAfterInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertAttributeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertBeforeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\RemoveAttributeFromLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\RemoveFromLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleAddMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleAddTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAfterMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAfterTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAttributeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAttributeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertBeforeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertBeforeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveAttributeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveAttributeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateInLocationWithDistractingLocationsTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateWithKeyMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateWithKeyTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateAttributeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInLocationWithTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithKeyInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithTargetPathMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithTargetPathTarget.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@
<Compile Include="Models\CacheableCat.cs" />
<Compile Include="Models\Dog.cs" />
<Compile Include="Models\Person.cs" />
<Compile Include="PetaPocoDataContextTests.cs" />
<Compile Include="PetaPocoIntegrationTests.cs" />
<Compile Include="PetaPocoMapperTests.cs" />
<Compile Include="PetaPocoRepositoryTests.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="DataResources.resx">
Expand Down
58 changes: 58 additions & 0 deletions DNN Platform/Tests/DotNetNuke.Tests.Integration/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#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 System.Reflection;
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("DotNetNuke.Library.Tests")]
[assembly: AssemblyDescription("Open Source Web Application Framework - Test Project")]

[assembly: AssemblyCompany("DotNetNuke Corporation")]
[assembly: AssemblyProduct("http://www.dotnetnuke.com")]
[assembly: AssemblyCopyright("DotNetNuke is copyright 2002-2013 by DotNetNuke Corporation. All Rights Reserved.")]
[assembly: AssemblyTrademark("DotNetNuke")]


// Setting ComVisible to false makes the types in this assembly not visible
// to COM componenets. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.

[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM

[assembly: Guid("87fa9a95-fc7c-43d9-b548-a43988fcd5c1")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6629A64D-58B9-48B9-B932-15AF193C2212}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DotNetNuke.Tests.Integration</RootNamespace>
<AssemblyName>DotNetNuke.Tests.Integration</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591, 0618</NoWarn>
<LangVersion>default</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591, 0618</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke.Log4Net">
<HintPath>..\..\Components\Log4Net\bin\DotNetNuke.Log4Net.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\..\Components\Lucene.Net\bin\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net.Contrib.FastVectorHighlighter, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Moq">
<HintPath>..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PetaPoco">
<HintPath>..\..\Components\PetaPoco\bin\PetaPoco.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Externals\AJAX\bin\System.Web.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="Data\PetaPocoDataContextTests.cs" />
<Compile Include="Data\PetaPocoMapperTests.cs" />
<Compile Include="Data\PetaPocoRepositoryTests.cs" />
<Compile Include="Data\PetaPocoIntegrationTests.cs" />
<Compile Include="Services\Installer\XmlMergeTests.cs" />
<Compile Include="TestSetup.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Instrumentation\DotNetNuke.Instrumentation.csproj">
<Project>{ddf18e36-41a0-4ca7-a098-78ca6e6f41c1}</Project>
<Name>DotNetNuke.Instrumentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\HttpModules\DotNetNuke.HttpModules.csproj">
<Project>{6f0a5b23-e09f-431a-879a-993cb77e23d8}</Project>
<Name>DotNetNuke.HttpModules</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Data\DotNetNuke.Tests.Data.csproj">
<Project>{2595aade-d3e0-4205-b8af-109cb23f4223}</Project>
<Name>DotNetNuke.Tests.Data</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Utilities\DotNetNuke.Tests.Utilities.csproj">
<Project>{68368906-57dd-40d1-ac10-35211a17d617}</Project>
<Name>DotNetNuke.Tests.Utilities</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="..\App.config">
<Link>App.config</Link>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Services\Installer\MergeFiles\AddWithLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertAfterInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertAttributeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\InsertBeforeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\RemoveAttributeFromLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\RemoveFromLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleAddMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleAddTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAfterMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAfterTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAttributeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertAttributeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertBeforeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleInsertBeforeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveAttributeMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveAttributeTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleRemoveTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateInLocationWithDistractingLocationsTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateWithKeyMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\SimpleUpdateWithKeyTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateAttributeInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInFirstLocationWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInLocationWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateInLocationWithTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithDistractingLocationAndTargetPathTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithKeyInLocationTarget.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithTargetPathMerge.xml" />
<EmbeddedResource Include="Services\Installer\MergeFiles\UpdateWithTargetPathTarget.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading

0 comments on commit 0e4f10e

Please sign in to comment.