Merge pull request #39 from JanBessai/Choice

Test which of a given Choice<...> constructors was selected

NuGet/FsUnit.MbUnit/FsUnit.MbUnit.Sample.nuspec

@@ -16,9 +16,9 @@
 	<tags>F# fsharp MbUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Content\*.pp" target="Content" />
-	  <file src="Lib\Net20\*.*" target="Lib\Net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="content\*.pp" target="content" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.MbUnit/FsUnit.MbUnit.nuspec

@@ -16,8 +16,8 @@
 	<tags>F# fsharp MbUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Lib\Net20\*.*" target="Lib\Net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.MsTest/Fs30Unit.MsTest.Sample.nuspec

@@ -13,8 +13,8 @@
 	<tags>F# fsharp MsTest FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Content\*.pp" target="Content" />
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="content\*.pp" target="content" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.MsTest/Fs30Unit.MsTest.nuspec

@@ -13,7 +13,7 @@
 	<tags>F# fsharp MsTest FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.NUnit/FsUnit.Sample.nuspec

@@ -16,9 +16,9 @@
 	<tags>F# fsharp NUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Content\*.pp" target="Content" />
-	  <file src="Lib\Net20\*.*" target="Lib\Net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="content\*.pp" target="content" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
 </package>

NuGet/FsUnit.NUnit/FsUnit.nuspec

@@ -16,8 +16,8 @@
 	<tags>F# fsharp NUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Lib\Net20\*.*" target="Lib\Net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\Net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
 </package>

NuGet/FsUnit.xUnit/FsUnit.xUnit.Sample.nuspec → NuGet/FsUnit.Xunit/FsUnit.Xunit.Sample.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>FsUnit.xUnit.Sample</id>
+    <id>FsUnit.Xunit.Sample</id>
     <version>1.3.0.1</version>
     <dependencies>
       <group targetFramework="net20">
@@ -24,9 +24,9 @@
 	<tags>F# fsharp xUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Content\*.pp" target="Content" />
-	  <file src="Lib\Net20\*.*" target="Lib\net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="content\*.pp" target="content" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.xUnit/FsUnit.xUnit.nuspec → NuGet/FsUnit.Xunit/FsUnit.Xunit.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>FsUnit.xUnit</id>
+    <id>FsUnit.Xunit</id>
     <version>1.3.0.1</version>
     <dependencies>
       <group targetFramework="net20">
@@ -24,8 +24,8 @@
 	<tags>F# fsharp xUnit FsUnit</tags>
   </metadata>
   <files>
-	  <file src="Lib\Net20\*.*" target="Lib\net20" />
-	  <file src="Lib\Net40\*.*" target="Lib\net40" />
-	  <file src="Tools\*.*" target="tools" />
+	  <file src="lib\net20\*.*" target="lib\net20" />
+	  <file src="lib\net40\*.*" target="lib\net40" />
+	  <file src="tools\*.*" target="tools" />
   </files>
-</package>
+</package>

NuGet/FsUnit.Xunit/build.bat

@@ -0,0 +1,9 @@
+c:\nuget\nuget.exe pack .\FsUnit.Xunit.nuspec
+md c:\nuget\FsUnit.Xunit\
+copy *.nupkg c:\nuget\FsUnit.Xunit\ /Y
+
+c:\nuget\nuget.exe pack .\FsUnit.Xunit.Sample.nuspec
+md c:\nuget\FsUnit.Xunit.Sample\
+copy *.nupkg c:\nuget\FsUnit.Xunit.Sample\ /Y
+
+pause

NuGet/buildAll.bat

@@ -16,10 +16,10 @@ md c:\nuget\FsUnit\
 c:\nuget\nuget.exe pack .\FsUnit.NUnit\FsUnit.Sample.nuspec
 md c:\nuget\FsUnit.Sample\
 
-c:\nuget\nuget.exe pack .\FsUnit.xUnit\FsUnit.xUnit.nuspec
-md c:\nuget\FsUnit.xUnit\
+c:\nuget\nuget.exe pack .\FsUnit.Xunit\FsUnit.Xunit.nuspec
+md c:\nuget\FsUnit.Xunit\
 
-c:\nuget\nuget.exe pack .\FsUnit.xUnit\FsUnit.xUnit.Sample.nuspec
-md c:\nuget\FsUnit.xUnit.Sample\
+c:\nuget\nuget.exe pack .\FsUnit.Xunit\FsUnit.Xunit.Sample.nuspec
+md c:\nuget\FsUnit.Xunit.Sample\
 
-pause
+pause

README.md

@@ -97,6 +97,8 @@ anObj |> should not' (be sameAs otherObj)
 
 1 |> should not' (be ofExactType<obj>)
 
+Choice<int, string>.Choice1Of2(42) |> should be (choice 1)
+
 [] |> should be Empty // NUnit only
 
 [1] |> should not' (be Empty) // NUnit only
@@ -120,7 +122,7 @@ Visual Studio 11 Support
 =======
 
 Visual Studio 11 support is available for all 4 of the targetted testing frameworks. FsUnit.MsTest is supported only in VS11 and no additional steps are required to use it.
-FsUnit for NUnit, FsUnit.MbUnit, and FsUnit.xUnit target F# 2.0 as well as F# 3.0. Because of this, a few additional steps are required
+FsUnit for NUnit, FsUnit.MbUnit, and FsUnit.Xunit target F# 2.0 as well as F# 3.0. Because of this, a few additional steps are required
 in order to use these libraries in VS11. After installing one of these packages, add an `App.config` file to the project (if one doesn't already exist).
 Build the project and then run the command "Add-BindingRedirect projectname" (where projectname is the name of your test project) in the NuGet
 Package Manager Console. This command will update the `App.config` to include binding redirects from previous version of `FSharp.Core` to 
@@ -132,7 +134,7 @@ NuGet
 NuGet packages are available for each of the supported testing frameworks:
 
 * The package with ID FsUnit supports NUnit. It is the original.
-* The package with ID FsUnit.xUnit supports xUnit.NET.
+* The package with ID FsUnit.Xunit supports Xunit.NET.
 * The package with ID FsUnit.MbUnit supports MbUnit.
 * The packager with ID Fs30Unit.MsTest supports MsTest in VS11.