Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated xunit to same version as Nancy

  • Loading branch information...
commit 3285dd47f64d21c198901feeba31ab2ee6580547 1 parent 287b087
@thecodejunkie thecodejunkie authored
Showing with 48 additions and 33 deletions.
  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 @@
-Subproject commit 7126711f7306dfcfdf5720c24b962aff94cce1ec
+Subproject commit 30b7bb633b8f30ee77c079fb96e12acca110bf40
View
10 src/Nancy.Bootstrappers.Ninject.Tests/Nancy.Bootstrappers.Ninject.Tests.csproj
@@ -42,11 +42,13 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
- <Reference Include="xunit">
- <HintPath>..\packages\xunit.1.9.0.1566\lib\xunit.dll</HintPath>
+ <Reference Include="xunit, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
</Reference>
- <Reference Include="xunit.extensions">
- <HintPath>..\packages\xunit.extensions.1.9.0.1566\lib\xunit.extensions.dll</HintPath>
+ <Reference Include="xunit.extensions, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\xunit.extensions.1.9.1\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
View
50 src/Nancy.Bootstrappers.Ninject.Tests/NinjectNancyBootstrapperFixture.cs
@@ -1,29 +1,29 @@
-namespace Nancy.Bootstrappers.Ninject.Tests
+namespace Nancy.Bootstrappers.Ninject.Tests
{
using System.Linq;
using Nancy.Tests;
using Routing;
- using Xunit;
-
- public class NinjectNancyBootstrapperFixture
- {
- private readonly FakeNinjectNancyBootstrapper bootstrapper;
-
- public NinjectNancyBootstrapperFixture()
- {
- this.bootstrapper = new FakeNinjectNancyBootstrapper();
- this.bootstrapper.Initialise();
- }
-
- [Fact]
- public void Should_be_able_to_resolve_engine()
- {
- // Given
- // When
- var engine = bootstrapper.GetEngine();
-
- // Then
- engine.ShouldNotBeNull();
+ using Xunit;
+
+ public class NinjectNancyBootstrapperFixture
+ {
+ private readonly FakeNinjectNancyBootstrapper bootstrapper;
+
+ public NinjectNancyBootstrapperFixture()
+ {
+ this.bootstrapper = new FakeNinjectNancyBootstrapper();
+ this.bootstrapper.Initialise();
+ }
+
+ [Fact]
+ public void Should_be_able_to_resolve_engine()
+ {
+ // Given
+ // When
+ var engine = bootstrapper.GetEngine();
+
+ // Then
+ engine.ShouldNotBeNull();
}
[Fact]
@@ -112,6 +112,6 @@ public void Should_not_return_the_same_instance_when_getmodule_is_called_multipl
result.FooDependency.ShouldNotBeNull();
result2.FooDependency.ShouldNotBeNull();
result.FooDependency.ShouldNotBeSameAs(result2.FooDependency);
- }
- }
-}
+ }
+ }
+}
View
4 src/Nancy.Bootstrappers.Ninject.Tests/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ninject" version="3.0.1.10" />
- <package id="xunit" version="1.9.0.1566" />
- <package id="xunit.extensions" version="1.9.0.1566" />
+ <package id="xunit" version="1.9.1" targetFramework="net40" />
+ <package id="xunit.extensions" version="1.9.1" targetFramework="net40" />
</packages>
View
BIN  src/packages/xunit.1.9.0.1566/lib/xunit.dll
Binary file not shown
View
BIN  src/packages/xunit.1.9.0.1566/lib/xunit.runner.utility.dll
Binary file not shown
View
BIN  src/packages/xunit.1.9.0.1566/xunit.1.9.0.1566.nupkg
Binary file not shown
View
BIN  src/packages/xunit.1.9.1/lib/net20/xunit.dll
Binary file not shown
View
0  ...ages/xunit.1.9.0.1566/lib/xunit.dll.tdnet → ...ges/xunit.1.9.1/lib/net20/xunit.dll.tdnet
File renamed without changes
View
BIN  ...t.1.9.0.1566/lib/xunit.runner.msbuild.dll → ....1.9.1/lib/net20/xunit.runner.msbuild.dll
Binary file not shown
View
BIN  ...nit.1.9.0.1566/lib/xunit.runner.tdnet.dll → ...it.1.9.1/lib/net20/xunit.runner.tdnet.dll
Binary file not shown
View
BIN  src/packages/xunit.1.9.1/lib/net20/xunit.runner.utility.dll
Binary file not shown
View
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 @@
Creates a new instance of the <see cref="T:Xunit.Sdk.PropertyChangedException"/> class. Call this constructor
when no exception was thrown.
</summary>
- <param name="propertyName">The name of the property that was expected.</param>
+ <param name="propertyName">The name of the property that was expected to be changed.</param>
</member>
<member name="M:Xunit.Sdk.PropertyChangedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
<inheritdoc/>
@@ -1140,6 +1140,13 @@
<param name="name">The child element name.</param>
<returns>The new child XML element.</returns>
</member>
+ <member name="M:Xunit.Sdk.XmlUtility.SetInnerText(System.Xml.XmlNode,System.String)">
+ <summary>
+ Sets the inner text of the XML node, properly escaping it as necessary.
+ </summary>
+ <param name="element">The element whose inner text will be set.</param>
+ <param name="value">The inner text to be escaped and then set.</param>
+ </member>
<member name="T:Xunit.Sdk.TraceAssertException">
<summary>
Exception that is thrown when a call to Debug.Assert() fails.
View
BIN  src/packages/xunit.1.9.1/xunit.1.9.1.nupkg
Binary file not shown
View
BIN  src/packages/xunit.extensions.1.9.0.1566/lib/xunit.extensions.dll
Binary file not shown
View
BIN  src/packages/xunit.extensions.1.9.0.1566/xunit.extensions.1.9.0.1566.nupkg
Binary file not shown
View
BIN  src/packages/xunit.extensions.1.9.1/lib/net20/xunit.extensions.dll
Binary file not shown
View
6 ...sions.1.9.0.1566/lib/xunit.extensions.xml → ...ions.1.9.1/lib/net20/xunit.extensions.xml
@@ -593,6 +593,12 @@
Gets the property name.
</summary>
</member>
+ <member name="P:Xunit.Extensions.PropertyDataAttribute.PropertyType">
+ <summary>
+ Gets or sets the type to retrieve the property data from. If not set, then the property will be
+ retrieved from the unit test class.
+ </summary>
+ </member>
<member name="T:Xunit.Extensions.SqlServerDataAttribute">
<summary>
Provides a data source for a data theory, with the data coming a Microsoft SQL Server.
View
BIN  src/packages/xunit.extensions.1.9.1/xunit.extensions.1.9.1.nupkg
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.