trackler 2.2.1.44 → 2.2.1.45

data/tracks/fsharp/exercises/gigasecond/Example.fs

@@ -2,6 +2,4 @@
 
 open System
 
-let gigasecond (beginDate: DateTime) = 
-    let gigaSecondDateTime = beginDate.AddSeconds(1000000000.0) 
-    gigaSecondDateTime.Date
+let add (beginDate: DateTime) = beginDate.AddSeconds(1000000000.0)

data/tracks/fsharp/exercises/gigasecond/Gigasecond.fs

@@ -1,3 +1,3 @@
 module Gigasecond
 
-let gigasecond beginDate = failwith "You need to implement this function."
+let add beginDate = failwith "You need to implement this function."

data/tracks/fsharp/exercises/gigasecond/Gigasecond.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/gigasecond/GigasecondTest.fs

@@ -1,21 +1,30 @@
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
 module GigasecondTest
 
-open Xunit
 open FsUnit.Xunit
-open Gigasecond
+open Xunit
 open System
-    
+
+open Gigasecond
+
 [<Fact>]
-let ``First date`` () =
-    let input = DateTime(2011, 4, 25)
-    gigasecond input |> should equal (DateTime(2043, 1, 1))
+let ``Date only specification of time`` () =
+    add (DateTime(2011, 4, 25)) |> should equal (DateTime(2043, 1, 1, 1, 46, 40))
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Second test for date only specification of time`` () =
+    add (DateTime(1977, 6, 13)) |> should equal (DateTime(2009, 2, 19, 1, 46, 40))
 
 [<Fact(Skip = "Remove to run test")>]
-let ``Another date`` () =
-    let input = DateTime(1977, 6, 13)
-    gigasecond input |> should equal (DateTime(2009, 2, 19))
+let ``Third test for date only specification of time`` () =
+    add (DateTime(1959, 7, 19)) |> should equal (DateTime(1991, 3, 27, 1, 46, 40))
 
 [<Fact(Skip = "Remove to run test")>]
-let ``Yet another date`` () =
-    let input = DateTime(1959, 7, 19)
-    gigasecond input |> should equal (DateTime(1991, 3, 27))
+let ``Full time specified`` () =
+    add (DateTime(2015, 1, 24, 22, 0, 0)) |> should equal (DateTime(2046, 10, 2, 23, 46, 40))
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full time with day roll-over`` () =
+    add (DateTime(2015, 1, 24, 23, 59, 59)) |> should equal (DateTime(2046, 10, 3, 1, 46, 39))
+

data/tracks/fsharp/exercises/go-counting/GoCounting.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/grade-school/GradeSchool.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/grains/Grains.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/grep/Grep.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/hamming/Hamming.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/hangman/Hangman.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/hello-world/HelloWorld.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/hello-world/HelloWorldTest.fs

@@ -1,10 +1,13 @@
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
 module HelloWorldTest
 
-open Xunit
 open FsUnit.Xunit
+open Xunit
 
 open HelloWorld
 
 [<Fact>]
-let ``Say hi!`` () =
-    hello |> should equal "Hello, World!"
+let ``Say Hi!`` () =
+    hello |> should equal "Hello, World!"
+

data/tracks/fsharp/exercises/house/House.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/isogram/Example.fs

@@ -4,6 +4,6 @@ open System
 
 let normalize str = str |> Seq.filter Char.IsLetter |> Seq.map Char.ToLower |> Seq.toList
 
-let isogram str = 
+let isIsogram str = 
     let normalized = normalize str
     Seq.length normalized = (normalized |> Seq.distinct |> Seq.length) 

data/tracks/fsharp/exercises/isogram/Isogram.fs

@@ -1,3 +1,3 @@
 module Isogram
 
-let isogram str = failwith "You need to implement this function."
+let isIsogram str = failwith "You need to implement this function."

data/tracks/fsharp/exercises/isogram/Isogram.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/isogram/IsogramTest.fs

@@ -1,69 +1,45 @@
+// This file was auto-generated based on version 1.2.0 of the canonical data.
+
 module IsogramTest
-    
-open Xunit
+
 open FsUnit.Xunit
+open Xunit
 
 open Isogram
 
 [<Fact>]
 let ``Empty string`` () =
-    let input = ""
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Isogram with only lower case characters`` () =
-    let input = "isogram"
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "isogram" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Word with one duplicated character`` () =
-    let input = "eleven"
-    let expected = false
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "eleven" |> should equal false
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Longest reported english isogram`` () =
-    let input = "subdermatoglyphic"
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "subdermatoglyphic" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Word with duplicated character in mixed case`` () =
-    let input = "Alphabet"
-    let expected = false
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "Alphabet" |> should equal false
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Hypothetical isogrammic word with hyphen`` () =
-    let input = "thumbscrew-japingly"
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "thumbscrew-japingly" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
-let ``Isogram with duplicated non letter character`` () =
-    let input = "Hjelmqvist-Gryb-Zock-Pfund-Wax"
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+let ``Isogram with duplicated hyphen`` () =
+    isIsogram "six-year-old" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Made-up name that is an isogram`` () =
-    let input = "Emily Jung Schwartzkopf"
-    let expected = true
-    let actual = isogram input
-    actual |> should equal expected
+    isIsogram "Emily Jung Schwartzkopf" |> should equal true
 
 [<Fact(Skip = "Remove to run test")>]
-let ``Word with duplicated accented character`` () =
-    let input = "éléphant"
-    let expected = false
-    let actual = isogram input
-    actual |> should equal expected
+let ``Duplicated character in the middle`` () =
+    isIsogram "accentor" |> should equal false
+

data/tracks/fsharp/exercises/kindergarten-garden/Example.fs

@@ -1,4 +1,4 @@
-module KinderGartenGarden
+module KindergartenGarden
 
 type Plant = Violets | Radishes | Clover | Grass
 
@@ -22,7 +22,7 @@ let private plantsInRow (row: string) =
     |> Seq.chunkBySize plantsPerChildPerRow
     |> Seq.map List.ofArray
 
-let garden children (windowSills: string) =     
+let toGarden children (windowSills: string) =     
     let rows = windowSills.Split rowSeparator
     let row1 = plantsInRow rows.[0]
     let row2 = plantsInRow rows.[1]
@@ -30,6 +30,8 @@ let garden children (windowSills: string) =
     |> Seq.map (fun (child, plants1, plants2) -> (child, plants1 @ plants2))
     |> Map.ofSeq
 
-let defaultGarden windowSills = garden defaultChildren windowSills
+let plantsForCustomStudents diagram student students = 
+    let garden = toGarden students diagram
+    defaultArg (Map.tryFind student garden) []
 
-let lookupPlants child childPlantsMap = defaultArg (Map.tryFind child childPlantsMap) []
+let plantsForDefaultStudents diagram student = plantsForCustomStudents diagram student defaultChildren

data/tracks/fsharp/exercises/kindergarten-garden/KindergartenGarden.fs

@@ -1,9 +1,7 @@
-module KinderGartenGarden
+module KindergartenGarden
 
 // TODO: define the Plant type
 
-let garden children windowSills = failwith "You need to implement this function."
+let plantsForDefaultStudents diagram student = failwith "You need to implement this function."
 
-let defaultGarden windowSills = failwith "You need to implement this function."
-
-let lookupPlants child childPlantsMap = failwith "You need to implement this function."
+let plantsForCustomStudents diagram student students = failwith "You need to implement this function."

data/tracks/fsharp/exercises/kindergarten-garden/KindergartenGarden.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/kindergarten-garden/KindergartenGardenTest.fs

@@ -1,51 +1,104 @@
-module KinderGartenGardenTest
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
+module KindergartenGardenTest
 
-open Xunit
 open FsUnit.Xunit
-open KinderGartenGarden
+open Xunit
+
+open KindergartenGarden
 
 [<Fact>]
-let ``Missing child`` () =
-    let garden = defaultGarden "RC\nGG"
-    let actual = lookupPlants "Potter" garden
-    actual |> should be Empty
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Alice`` () =
-    defaultGarden "RC\nGG" |> lookupPlants "Alice" |> should equal [Plant.Radishes; Plant.Clover; Plant.Grass; Plant.Grass]
-    defaultGarden "VC\nRC" |> lookupPlants "Alice" |> should equal [Plant.Violets; Plant.Clover; Plant.Radishes; Plant.Clover]
-    
-[<Fact(Skip = "Remove to run test")>]
-let ``Small garden`` () =
-    let garden = defaultGarden "VVCG\nVVRC"
-    lookupPlants "Bob" garden |> should equal [Plant.Clover; Plant.Grass; Plant.Radishes; Plant.Clover]
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Medium garden`` () =
-    let garden = defaultGarden "VVCCGG\nVVCCGG"
-    lookupPlants "Bob" garden |> should equal [Plant.Clover; Plant.Clover; Plant.Clover; Plant.Clover]
-    lookupPlants "Charlie" garden |> should equal [Plant.Grass; Plant.Grass; Plant.Grass; Plant.Grass]
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Full garden`` () =
-    let garden = defaultGarden "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"
-    lookupPlants "Alice" garden |> should equal [Plant.Violets; Plant.Radishes; Plant.Violets; Plant.Radishes]
-    lookupPlants "Alice" garden |> should equal [Plant.Violets; Plant.Radishes; Plant.Violets; Plant.Radishes]
-    lookupPlants "Bob" garden |> should equal [Plant.Clover; Plant.Grass; Plant.Clover; Plant.Clover]
-    lookupPlants "David" garden |> should equal [Plant.Radishes; Plant.Violets; Plant.Clover; Plant.Radishes]
-    lookupPlants "Eve" garden |> should equal [Plant.Clover; Plant.Grass; Plant.Radishes; Plant.Grass]
-    lookupPlants "Fred" garden |> should equal [Plant.Grass; Plant.Clover; Plant.Violets; Plant.Clover]
-    lookupPlants "Ginny" garden |> should equal [Plant.Clover; Plant.Grass; Plant.Grass; Plant.Clover]
-    lookupPlants "Harriet" garden |> should equal [Plant.Violets; Plant.Radishes; Plant.Radishes; Plant.Violets]
-    lookupPlants "Ileana" garden |> should equal [Plant.Grass; Plant.Clover; Plant.Violets; Plant.Clover]
-    lookupPlants "Joseph" garden |> should equal [Plant.Violets; Plant.Clover; Plant.Violets; Plant.Grass]
-    lookupPlants "Kincaid" garden |> should equal [Plant.Grass; Plant.Clover; Plant.Clover; Plant.Grass]
-    lookupPlants "Larry" garden |> should equal [Plant.Grass; Plant.Violets; Plant.Clover; Plant.Violets]
-    
-[<Fact(Skip = "Remove to run test")>]
-let ``Surprise garden`` () =
-    let garden = garden ["Samantha"; "Patricia"; "Xander"; "Roger"] "VCRRGVRG\nRVGCCGCV"
-    lookupPlants "Patricia" garden |> should equal [Plant.Violets; Plant.Clover; Plant.Radishes; Plant.Violets]
-    lookupPlants "Roger" garden |> should equal [Plant.Radishes; Plant.Radishes; Plant.Grass; Plant.Clover]
-    lookupPlants "Samantha" garden |> should equal [Plant.Grass; Plant.Violets; Plant.Clover; Plant.Grass]
-    lookupPlants "Xander" garden |> should equal [Plant.Radishes; Plant.Grass; Plant.Clover; Plant.Violets]
+let ``Partial garden - garden with single student`` () =
+    let student = "Alice"
+    let diagram = "RC\nGG"
+    let expected = [Plant.Radishes; Plant.Clover; Plant.Grass; Plant.Grass]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Partial garden - different garden with single student`` () =
+    let student = "Alice"
+    let diagram = "VC\nRC"
+    let expected = [Plant.Violets; Plant.Clover; Plant.Radishes; Plant.Clover]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Partial garden - garden with two students`` () =
+    let student = "Bob"
+    let diagram = "VVCG\nVVRC"
+    let expected = [Plant.Clover; Plant.Grass; Plant.Radishes; Plant.Clover]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Partial garden - multiple students for the same garden with three students - second student's garden`` () =
+    let student = "Bob"
+    let diagram = "VVCCGG\nVVCCGG"
+    let expected = [Plant.Clover; Plant.Clover; Plant.Clover; Plant.Clover]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Partial garden - multiple students for the same garden with three students - third student's garden`` () =
+    let student = "Charlie"
+    let diagram = "VVCCGG\nVVCCGG"
+    let expected = [Plant.Grass; Plant.Grass; Plant.Grass; Plant.Grass]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full garden - first student's garden`` () =
+    let student = "Alice"
+    let diagram = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"
+    let expected = [Plant.Violets; Plant.Radishes; Plant.Violets; Plant.Radishes]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full garden - second student's garden`` () =
+    let student = "Bob"
+    let diagram = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"
+    let expected = [Plant.Clover; Plant.Grass; Plant.Clover; Plant.Clover]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full garden - second to last student's garden`` () =
+    let student = "Kincaid"
+    let diagram = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"
+    let expected = [Plant.Grass; Plant.Clover; Plant.Clover; Plant.Grass]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full garden - last student's garden`` () =
+    let student = "Larry"
+    let diagram = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"
+    let expected = [Plant.Grass; Plant.Violets; Plant.Clover; Plant.Violets]
+    plantsForDefaultStudents diagram student |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Non-alphabetical student list - first student's garden`` () =
+    let student = "Patricia"
+    let students = ["Samantha"; "Patricia"; "Xander"; "Roger"]
+    let diagram = "VCRRGVRG\nRVGCCGCV"
+    let expected = [Plant.Violets; Plant.Clover; Plant.Radishes; Plant.Violets]
+    plantsForCustomStudents diagram student students |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Non-alphabetical student list - second student's garden`` () =
+    let student = "Roger"
+    let students = ["Samantha"; "Patricia"; "Xander"; "Roger"]
+    let diagram = "VCRRGVRG\nRVGCCGCV"
+    let expected = [Plant.Radishes; Plant.Radishes; Plant.Grass; Plant.Clover]
+    plantsForCustomStudents diagram student students |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Non-alphabetical student list - third student's garden`` () =
+    let student = "Samantha"
+    let students = ["Samantha"; "Patricia"; "Xander"; "Roger"]
+    let diagram = "VCRRGVRG\nRVGCCGCV"
+    let expected = [Plant.Grass; Plant.Violets; Plant.Clover; Plant.Grass]
+    plantsForCustomStudents diagram student students |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Non-alphabetical student list - fourth (last) student's garden`` () =
+    let student = "Xander"
+    let students = ["Samantha"; "Patricia"; "Xander"; "Roger"]
+    let diagram = "VCRRGVRG\nRVGCCGCV"
+    let expected = [Plant.Radishes; Plant.Grass; Plant.Clover; Plant.Violets]
+    plantsForCustomStudents diagram student students |> should equal expected
+

data/tracks/fsharp/exercises/largest-series-product/LargestSeriesProduct.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/leap/Example.fs

@@ -1,3 +1,3 @@
-module LeapYear
+module Leap
 
-let isLeapYear (year: int) = year % 4 = 0 && (year % 400 = 0 || year % 100 <> 0)
+let leapYear (year: int) = year % 4 = 0 && (year % 400 = 0 || year % 100 <> 0)

data/tracks/fsharp/exercises/leap/Leap.fs

@@ -1,3 +1,3 @@
-module LeapYear
+module Leap
 
-let isLeapYear (year: int): bool = failwith "You need to implement this function."
+let leapYear (year: int): bool = failwith "You need to implement this function."

data/tracks/fsharp/exercises/leap/Leap.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/exercises/leap/LeapTest.fs

@@ -1,21 +1,25 @@
-module LeapYearTest
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
+module LeapTest
 
-open Xunit
 open FsUnit.Xunit
-open LeapYear
-    
+open Xunit
+
+open Leap
+
 [<Fact>]
-let ``Is 1996 a valid leap year`` () = 
-    isLeapYear 1996 |> should equal true
-    
+let ``Year not divisible by 4: common year`` () =
+    leapYear 2015 |> should equal false
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Is 1997 an invalid leap year`` () = 
-    isLeapYear 1997 |> should equal false
-    
+let ``Year divisible by 4, not divisible by 100: leap year`` () =
+    leapYear 2016 |> should equal true
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Is the turn of the 20th century an invalid leap year`` () = 
-    isLeapYear 1900 |> should equal false
-    
+let ``Year divisible by 100, not divisible by 400: common year`` () =
+    leapYear 2100 |> should equal false
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Is the turn of the 25th century a valid leap year`` () = 
-    isLeapYear 2400 |> should equal true
+let ``Year divisible by 400: leap year`` () =
+    leapYear 2000 |> should equal true
+

data/tracks/fsharp/exercises/ledger/Ledger.fsproj

@@ -14,9 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
     <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
 
 </Project>