trackler 2.2.1.22 → 2.2.1.23

data/tracks/fsharp/exercises/wordy/WordyTest.fs

@@ -1,83 +1,69 @@
 module WordyTest
 
-open NUnit.Framework
+open Xunit
+open FsUnit.Xunit
 open Wordy
 
-[<Test>]
+[<Fact>]
 let ``Can parse and solve addition problems`` () =
-    Assert.That(solve "What is 1 plus 1?", Is.EqualTo(Some 2))
+    solve "What is 1 plus 1?" |> should equal <| Some 2
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add double digit numbers`` () =
-    Assert.That(solve "What is 53 plus 2?", Is.EqualTo(Some 55))
+    solve "What is 53 plus 2?" |> should equal <| Some 55
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add negative numbers`` () =
-    Assert.That(solve "What is -1 plus -10?", Is.EqualTo(Some -11))
+    solve "What is -1 plus -10?" |> should equal <| Some -11
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add large numbers`` () =
-    Assert.That(solve "What is 123 plus 45678?", Is.EqualTo(Some 45801))
+    solve "What is 123 plus 45678?" |> should equal <| Some 45801
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can parse and solve subtraction problems`` () =
-    Assert.That(solve "What is 4 minus -12?", Is.EqualTo(Some 16))
+    solve "What is 4 minus -12?" |> should equal <| Some 16
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can parse and solve multiplication problems`` () =
-    Assert.That(solve "What is -3 multiplied by 25?", Is.EqualTo(Some -75))
+    solve "What is -3 multiplied by 25?" |> should equal <| Some -75
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can parse and solve division problems`` () =
-    Assert.That(solve "What is 33 divided by -3?", Is.EqualTo(Some -11))
+    solve "What is 33 divided by -3?" |> should equal <| Some -11
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add twice`` () =
-    Assert.That(solve "What is 1 plus 1 plus 1?", Is.EqualTo(Some 3))
+    solve "What is 1 plus 1 plus 1?" |> should equal <| Some 3
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add then subtract`` () =
-    Assert.That(solve "What is 1 plus 5 minus -2?", Is.EqualTo(Some 8))
+    solve "What is 1 plus 5 minus -2?" |> should equal <| Some 8
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can subtract twice`` () =
-    Assert.That(solve "What is 20 minus 4 minus 13?", Is.EqualTo(Some 3))
+    solve "What is 20 minus 4 minus 13?" |> should equal <| Some 3
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can subtract then add`` () =
-    Assert.That(solve "What is 17 minus 6 plus 3?", Is.EqualTo(Some 14))
+    solve "What is 17 minus 6 plus 3?" |> should equal <| Some 14
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can multiply twice`` () =
-    Assert.That(solve "What is 2 multiplied by -2 multiplied by 3?", Is.EqualTo(Some -12))
+    solve "What is 2 multiplied by -2 multiplied by 3?" |> should equal <| Some -12
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can add then multiply`` () =
-    Assert.That(solve "What is -3 plus 7 multiplied by -2?", Is.EqualTo(Some -8))
+    solve "What is -3 plus 7 multiplied by -2?" |> should equal <| Some -8
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Can divide twice`` () =
-    Assert.That(solve "What is -12 divided by 2 divided by -3?", Is.EqualTo(Some 2))
+    solve "What is -12 divided by 2 divided by -3?" |> should equal <| Some 2
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Cubed is too advanced`` () =
-    Assert.That(solve "What is 53 cubed?", Is.EqualTo(None))
+    solve "What is 53 cubed?" |> should equal None
     
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Irrelevant problems are not valid`` () =
-    Assert.That(solve "Who is the president of the United States?", Is.EqualTo(None))
+    solve "Who is the president of the United States?" |> should equal None

data/tracks/fsharp/exercises/zebra-puzzle/Example.fs

@@ -74,7 +74,7 @@ let solutions = seq {
             yield { colors = validColors; nationalities = validNationalities; pets = validPets; drinks = validDrinks; smokes = validSmokes }
     }
 
-let solve = Seq.head solutions
+let solve() = Seq.head solutions
 
 let whoDrinksWater solution = List.item (index Water solution.drinks) solution.nationalities
 let whoOwnsZebra solution = List.item (index Zebra solution.pets) solution.nationalities

data/tracks/fsharp/exercises/zebra-puzzle/Program.fs

@@ -0,0 +1 @@
+module Program = let [<EntryPoint>] main _ = 0

data/tracks/fsharp/exercises/zebra-puzzle/ZebraPuzzle.fs

@@ -0,0 +1,3 @@
+module ZebraPuzzle
+
+// TODO: implement this module

data/tracks/fsharp/exercises/zebra-puzzle/ZebraPuzzle.fsproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ZebraPuzzle.fs" />
+    <Compile Include="ZebraPuzzleTest.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <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="FsUnit.xUnit" Version="3.0.0" />
+  </ItemGroup>
+
+</Project>

data/tracks/fsharp/exercises/zebra-puzzle/ZebraPuzzleTest.fs

@@ -1,16 +1,16 @@
-module ZebraPuzzleTest
+module ZebraPuzzleTest
 
-open NUnit.Framework
+open Xunit
+open FsUnit.Xunit
 
 open ZebraPuzzle
 
-[<Test>]
+[<Fact>]
 let ``Who drinks water?`` () =
-    let solution = solve
-    Assert.That(whoDrinksWater solution, Is.EqualTo(Norwegian))
+    let solution = solve()
+    whoDrinksWater solution |> should equal Norwegian
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Who owns the zebra?`` () =
-    let solution = solve
-    Assert.That(whoOwnsZebra solution, Is.EqualTo(Japanese))
+    let solution = solve()
+    whoOwnsZebra solution |> should equal Japanese

data/tracks/fsharp/exercises/zipper/Program.fs

@@ -0,0 +1 @@
+module Program = let [<EntryPoint>] main _ = 0

data/tracks/fsharp/exercises/zipper/Zipper.fs

@@ -0,0 +1,3 @@
+module Zipper
+
+// TODO: implement this module

data/tracks/fsharp/exercises/zipper/Zipper.fsproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Zipper.fs" />
+    <Compile Include="ZipperTest.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <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="FsUnit.xUnit" Version="3.0.0" />
+  </ItemGroup>
+
+</Project>

data/tracks/fsharp/exercises/zipper/ZipperTest.fs

@@ -1,6 +1,7 @@
-module ZipperTest
+module ZipperTest
 
-open NUnit.Framework
+open Xunit
+open FsUnit.Xunit
 
 open Zipper
 
@@ -14,41 +15,34 @@ let t2 = tree 1 (bt 5 empty    (leaf 3)) (leaf 4)
 let t3 = tree 1 (bt 2 (leaf 5) (leaf 3)) (leaf 4)
 let t4 = tree 1 (leaf 2)                 (leaf 4)
 
-[<Test>]
+[<Fact>]
 let ``Data is retained``() =
-    Assert.That(toTree (fromTree t1), Is.EqualTo(t1))
+    toTree (fromTree t1) |> should equal t1
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``left, right and value``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> right |> Option.get |> value, Is.EqualTo(3))
+    t1 |> fromTree |> left |> Option.get |> right |> Option.get |> value |> should equal 3
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Dead end``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> left, Is.EqualTo(None))
+    t1 |> fromTree |> left |> Option.get |> left |> should equal None
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Tree from deep focus``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> right |> Option.get |> toTree, Is.EqualTo(t1))
+    t1 |> fromTree |> left |> Option.get |> right |> Option.get |> toTree |> should equal t1
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``setValue``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> setValue 5 |> toTree, Is.EqualTo(t2))
+    t1 |> fromTree |> left |> Option.get |> setValue 5 |> toTree |> should equal t2
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``setLeft with Some``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> setLeft (tree 5 None None |> Some) |> toTree, Is.EqualTo(t3))
+    t1 |> fromTree |> left |> Option.get |> setLeft (tree 5 None None |> Some) |> toTree |> should equal t3
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``setRight with None``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> setRight None |> toTree, Is.EqualTo(t4))
+    t1 |> fromTree |> left |> Option.get |> setRight None |> toTree |> should equal t4
 
-[<Test>]
-[<Ignore("Remove to run test")>]
+[<Fact(Skip = "Remove to run test")>]
 let ``Different paths to same zipper``() =
-    Assert.That(t1 |> fromTree |> left |> Option.get |> up |> Option.get |> right, Is.EqualTo(t1 |> fromTree |> right))
+    t1 |> fromTree |> left |> Option.get |> up |> Option.get |> right |> should equal (t1 |> fromTree |> right)

data/tracks/javascript/exercises/simple-linked-list/example.js

@@ -97,10 +97,11 @@ List.prototype.reverse = function () {
 
 List.prototype.toArray = function () {
   var array = [];
+  var current = this.head;
 
-  while (this.head) {
-    array.push(this.head.value);
-    this.shift();
+  while (current) {
+    array.push(current.value);
+    current = current.next;
   }
 
   return array;

data/tracks/javascript/exercises/simple-linked-list/simple-linked-list.spec.js

@@ -141,6 +141,9 @@ describe('simple-linked-list', function () {
       expect(a.length).toBe(2);
       expect(a[0]).toBe(1);
       expect(a[1]).toBe(2);
+
+      expect(ll.head.value).toBe(1);
+      expect(ll.head.next.value).toBe(2);
     });
 
     xit('allows you to reverse a List', function () {

data/tracks/nim/docs/SNIPPET.txt

@@ -0,0 +1,2 @@
+proc helloWorld*(name="World"): string =
+  return "Hello, " & name & "!"

data/tracks/perl5/docs/SNIPPET.txt

@@ -0,0 +1,9 @@
+package HelloWorld;
+use strict;
+use warnings;
+
+sub hello {
+  return 'Hello, World!';
+}
+
+1;

data/tracks/php/docs/SNIPPET.txt

@@ -0,0 +1,6 @@
+<?php
+
+function helloWorld($name = 'World')
+{
+    return "Hello, $name!";
+}

data/tracks/pony/docs/SNIPPET.txt

@@ -0,0 +1,2 @@
+primitive HelloWorld
+  fun hello(): String => "Hello, World!"

data/tracks/powershell/docs/SNIPPET.txt

@@ -0,0 +1,4 @@
+function HelloWorld {
+	param( [string]$person = "World")
+	return "Hello $person!"
+}

data/tracks/prolog/docs/SNIPPET.txt

@@ -0,0 +1,6 @@
+hello(Name, Greeting) :-
+  atom_concat('Hello, ', Name, Prefix),
+  atom_concat(Prefix, '!', Greeting).
+
+?- hello('World', Greeting),
+   write(Greeting).

data/tracks/python/exercises/simple-cipher/README.md

@@ -66,7 +66,7 @@ at least 100 characters in length, accessible via Cipher#key (the #
 syntax means instance variable)
 
 If the key submitted has capital letters or numbers, throw an
-ArgumentError with a message to that effect.
+ValueError with a message to that effect.
 
 ## Extensions
 

data/tracks/vimscript/docs/SNIPPET.txt

@@ -0,0 +1,4 @@
+function! Hello(...) abort
+  let name = (a:0 == 1 ? a:1 : 'World')
+  return 'Hello, ' . name . '!'
+endfunction