Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated xunit to same version as Nancy

  • Loading branch information...
commit 3285dd47f64d21c198901feeba31ab2ee6580547 1 parent 287b087
Andreas Håkansson thecodejunkie authored

Showing 19 changed files with 48 additions and 33 deletions. Show diff stats Hide diff stats

  1. +1 1  dependencies/Nancy
  2. +6 4 src/Nancy.Bootstrappers.Ninject.Tests/Nancy.Bootstrappers.Ninject.Tests.csproj
  3. +25 25 src/Nancy.Bootstrappers.Ninject.Tests/NinjectNancyBootstrapperFixture.cs
  4. +2 2 src/Nancy.Bootstrappers.Ninject.Tests/packages.config
  5. BIN  src/packages/xunit.1.9.0.1566/lib/xunit.dll
  6. BIN  src/packages/xunit.1.9.0.1566/lib/xunit.runner.utility.dll
  7. BIN  src/packages/xunit.1.9.0.1566/xunit.1.9.0.1566.nupkg
  8. BIN  src/packages/xunit.1.9.1/lib/net20/xunit.dll
  9. 0  src/packages/{xunit.1.9.0.1566/lib → xunit.1.9.1/lib/net20}/xunit.dll.tdnet
  10. BIN  src/packages/{xunit.1.9.0.1566/lib → xunit.1.9.1/lib/net20}/xunit.runner.msbuild.dll
  11. BIN  src/packages/{xunit.1.9.0.1566/lib → xunit.1.9.1/lib/net20}/xunit.runner.tdnet.dll
  12. BIN  src/packages/xunit.1.9.1/lib/net20/xunit.runner.utility.dll
  13. +8 1 src/packages/{xunit.1.9.0.1566/lib → xunit.1.9.1/lib/net20}/xunit.xml
  14. BIN  src/packages/xunit.1.9.1/xunit.1.9.1.nupkg
  15. BIN  src/packages/xunit.extensions.1.9.0.1566/lib/xunit.extensions.dll
  16. BIN  src/packages/xunit.extensions.1.9.0.1566/xunit.extensions.1.9.0.1566.nupkg
  17. BIN  src/packages/xunit.extensions.1.9.1/lib/net20/xunit.extensions.dll
  18. +6 0 src/packages/{xunit.extensions.1.9.0.1566/lib → xunit.extensions.1.9.1/lib/net20}/xunit.extensions.xml
  19. BIN  src/packages/xunit.extensions.1.9.1/xunit.extensions.1.9.1.nupkg
2  dependencies/Nancy
... ... @@ -1 +1 @@
1   -Subproject commit 7126711f7306dfcfdf5720c24b962aff94cce1ec
  1 +Subproject commit 30b7bb633b8f30ee77c079fb96e12acca110bf40
10 src/Nancy.Bootstrappers.Ninject.Tests/Nancy.Bootstrappers.Ninject.Tests.csproj
@@ -42,11 +42,13 @@
42 42 <Reference Include="Microsoft.CSharp" />
43 43 <Reference Include="System.Data" />
44 44 <Reference Include="System.Xml" />
45   - <Reference Include="xunit">
46   - <HintPath>..\packages\xunit.1.9.0.1566\lib\xunit.dll</HintPath>
  45 + <Reference Include="xunit, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
  46 + <SpecificVersion>False</SpecificVersion>
  47 + <HintPath>..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
47 48 </Reference>
48   - <Reference Include="xunit.extensions">
49   - <HintPath>..\packages\xunit.extensions.1.9.0.1566\lib\xunit.extensions.dll</HintPath>
  49 + <Reference Include="xunit.extensions, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
  50 + <SpecificVersion>False</SpecificVersion>
  51 + <HintPath>..\packages\xunit.extensions.1.9.1\lib\net20\xunit.extensions.dll</HintPath>
50 52 </Reference>
51 53 </ItemGroup>
52 54 <ItemGroup>
50 src/Nancy.Bootstrappers.Ninject.Tests/NinjectNancyBootstrapperFixture.cs
... ... @@ -1,29 +1,29 @@
1   -namespace Nancy.Bootstrappers.Ninject.Tests
  1 +namespace Nancy.Bootstrappers.Ninject.Tests
2 2 {
3 3 using System.Linq;
4 4 using Nancy.Tests;
5 5 using Routing;
6   - using Xunit;
7   -
8   - public class NinjectNancyBootstrapperFixture
9   - {
10   - private readonly FakeNinjectNancyBootstrapper bootstrapper;
11   -
12   - public NinjectNancyBootstrapperFixture()
13   - {
14   - this.bootstrapper = new FakeNinjectNancyBootstrapper();
15   - this.bootstrapper.Initialise();
16   - }
17   -
18   - [Fact]
19   - public void Should_be_able_to_resolve_engine()
20   - {
21   - // Given
22   - // When
23   - var engine = bootstrapper.GetEngine();
24   -
25   - // Then
26   - engine.ShouldNotBeNull();
  6 + using Xunit;
  7 +
  8 + public class NinjectNancyBootstrapperFixture
  9 + {
  10 + private readonly FakeNinjectNancyBootstrapper bootstrapper;
  11 +
  12 + public NinjectNancyBootstrapperFixture()
  13 + {
  14 + this.bootstrapper = new FakeNinjectNancyBootstrapper();
  15 + this.bootstrapper.Initialise();
  16 + }
  17 +
  18 + [Fact]
  19 + public void Should_be_able_to_resolve_engine()
  20 + {
  21 + // Given
  22 + // When
  23 + var engine = bootstrapper.GetEngine();
  24 +
  25 + // Then
  26 + engine.ShouldNotBeNull();
27 27 }
28 28
29 29 [Fact]
@@ -112,6 +112,6 @@ public void Should_not_return_the_same_instance_when_getmodule_is_called_multipl
112 112 result.FooDependency.ShouldNotBeNull();
113 113 result2.FooDependency.ShouldNotBeNull();
114 114 result.FooDependency.ShouldNotBeSameAs(result2.FooDependency);
115   - }
116   - }
117   -}
  115 + }
  116 + }
  117 +}
4 src/Nancy.Bootstrappers.Ninject.Tests/packages.config
... ... @@ -1,6 +1,6 @@
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <packages>
3 3 <package id="Ninject" version="3.0.1.10" />
4   - <package id="xunit" version="1.9.0.1566" />
5   - <package id="xunit.extensions" version="1.9.0.1566" />
  4 + <package id="xunit" version="1.9.1" targetFramework="net40" />
  5 + <package id="xunit.extensions" version="1.9.1" targetFramework="net40" />
6 6 </packages>
BIN  src/packages/xunit.1.9.0.1566/lib/xunit.dll
Binary file not shown
BIN  src/packages/xunit.1.9.0.1566/lib/xunit.runner.utility.dll
Binary file not shown
BIN  src/packages/xunit.1.9.0.1566/xunit.1.9.0.1566.nupkg
Binary file not shown
BIN  src/packages/xunit.1.9.1/lib/net20/xunit.dll
Binary file not shown
0  src/packages/xunit.1.9.0.1566/lib/xunit.dll.tdnet → src/packages/xunit.1.9.1/lib/net20/xunit.dll.tdnet
File renamed without changes
BIN  ...ges/xunit.1.9.0.1566/lib/xunit.runner.msbuild.dll → ...es/xunit.1.9.1/lib/net20/xunit.runner.msbuild.dll
Binary file not shown
BIN  ...kages/xunit.1.9.0.1566/lib/xunit.runner.tdnet.dll → ...ages/xunit.1.9.1/lib/net20/xunit.runner.tdnet.dll
Binary file not shown
BIN  src/packages/xunit.1.9.1/lib/net20/xunit.runner.utility.dll
Binary file not shown
9 src/packages/xunit.1.9.0.1566/lib/xunit.xml → src/packages/xunit.1.9.1/lib/net20/xunit.xml
@@ -768,7 +768,7 @@
768 768 Creates a new instance of the <see cref="T:Xunit.Sdk.PropertyChangedException"/> class. Call this constructor
769 769 when no exception was thrown.
770 770 </summary>
771   - <param name="propertyName">The name of the property that was expected.</param>
  771 + <param name="propertyName">The name of the property that was expected to be changed.</param>
772 772 </member>
773 773 <member name="M:Xunit.Sdk.PropertyChangedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
774 774 <inheritdoc/>
@@ -1140,6 +1140,13 @@
1140 1140 <param name="name">The child element name.</param>
1141 1141 <returns>The new child XML element.</returns>
1142 1142 </member>
  1143 + <member name="M:Xunit.Sdk.XmlUtility.SetInnerText(System.Xml.XmlNode,System.String)">
  1144 + <summary>
  1145 + Sets the inner text of the XML node, properly escaping it as necessary.
  1146 + </summary>
  1147 + <param name="element">The element whose inner text will be set.</param>
  1148 + <param name="value">The inner text to be escaped and then set.</param>
  1149 + </member>
1143 1150 <member name="T:Xunit.Sdk.TraceAssertException">
1144 1151 <summary>
1145 1152 Exception that is thrown when a call to Debug.Assert() fails.
BIN  src/packages/xunit.1.9.1/xunit.1.9.1.nupkg
Binary file not shown
BIN  src/packages/xunit.extensions.1.9.0.1566/lib/xunit.extensions.dll
Binary file not shown
BIN  src/packages/xunit.extensions.1.9.0.1566/xunit.extensions.1.9.0.1566.nupkg
Binary file not shown
BIN  src/packages/xunit.extensions.1.9.1/lib/net20/xunit.extensions.dll
Binary file not shown
6 ...it.extensions.1.9.0.1566/lib/xunit.extensions.xml → ...t.extensions.1.9.1/lib/net20/xunit.extensions.xml
@@ -593,6 +593,12 @@
593 593 Gets the property name.
594 594 </summary>
595 595 </member>
  596 + <member name="P:Xunit.Extensions.PropertyDataAttribute.PropertyType">
  597 + <summary>
  598 + Gets or sets the type to retrieve the property data from. If not set, then the property will be
  599 + retrieved from the unit test class.
  600 + </summary>
  601 + </member>
596 602 <member name="T:Xunit.Extensions.SqlServerDataAttribute">
597 603 <summary>
598 604 Provides a data source for a data theory, with the data coming a Microsoft SQL Server.
BIN  src/packages/xunit.extensions.1.9.1/xunit.extensions.1.9.1.nupkg
Binary file not shown

0 comments on commit 3285dd4

Please sign in to comment.
Something went wrong with that request. Please try again.