Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Commit

Permalink
Merge pull request #395 from Sitecore/issue/360/restore-unit-tests
Browse files Browse the repository at this point in the history 
Restore most unit test projects to v9 branch
  • Loading branch information
@nickwesselman
nickwesselman authored Jun 15, 2018
2 parents b9a473f + 97b4d16 commit 81c01a4
Show file tree
Hide file tree
Showing 84 changed files with 754 additions and 891 deletions.
195 changes: 194 additions & 1 deletion Habitat.sln
View file

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sitecore.Feature.Accounts.Tests</RootNamespace>
<AssemblyName>Sitecore.Feature.Accounts.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -72,9 +72,8 @@
<HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
Expand All @@ -89,32 +88,32 @@
<Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
<Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
<Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
<Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
<Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
<Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
<Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
Expand Down
3 changes: 1 addition & 2 deletions src/Feature/Accounts/Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@

<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />

</dependentAssembly>

</assemblyBinding>

</runtime>
Expand Down
18 changes: 9 additions & 9 deletions src/Feature/Accounts/Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
<package id="Moq" version="4.5.30" targetFramework="net46" />
<package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
<package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
<package id="Sitecore.Analytics.Core.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Analytics.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Analytics.DataAccess.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Analytics.Model.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Analytics.Model.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Analytics.Outcome.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
<package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
<package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
<package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
<package id="Sitecore.FakeDb.NSubstitute" version="1.7.0" targetFramework="net46" />
<package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
<package id="System.Collections" version="4.0.11" targetFramework="net46" />
Expand All @@ -38,9 +38,9 @@
<package id="System.Globalization" version="4.0.11" targetFramework="net46" />
<package id="System.Linq" version="4.1.0" targetFramework="net46" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
<package id="System.Reflection" version="4.1.0" targetFramework="net46" />
<package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
<package id="System.Threading" version="4.0.11" targetFramework="net46" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
<package id="xunit" version="2.2.0" targetFramework="net46" />
Expand Down
7 changes: 0 additions & 7 deletions src/Feature/Demo/tests/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@

[assembly: AssemblyTitle("Sitecore.Feature.Accounts.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Sitecore.Feature.Accounts.Tests")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -35,5 +29,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
39 changes: 19 additions & 20 deletions src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sitecore.Feature.Demo.Tests</RootNamespace>
<AssemblyName>Sitecore.Feature.Demo.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -68,9 +68,8 @@
<HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
Expand All @@ -85,38 +84,38 @@
<Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
<Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
<Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
<Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
<Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
<Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
</Reference>
<Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
<Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
<Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
Expand Down Expand Up @@ -196,10 +195,10 @@
<Compile Include="Services\BehaviorProfileDecoratorTests.cs" />
<Compile Include="Services\ProfileProviderTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\..\..\ProductInfo.cs">
<Compile Include="..\..\..\ProductInfo.cs">
<Link>Properties\ProductInfo.cs</Link>
</Compile>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<None Include="app.config">
<SubType>Designer</SubType>
Expand Down
2 changes: 1 addition & 1 deletion src/Feature/Demo/tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />

</dependentAssembly>
</assemblyBinding>
Expand Down
Loading

0 comments on commit 81c01a4

Please sign in to comment.