Skip to content

Commit bac0f46

Browse files
aageaage
authored
zipper: rename sut to actual #1003 (#1004)
* Update generators.fs to rename sut to actual within zippertests.fs #1003 * Add newwly generated ZipperTests.fs file after updating Generators.fs
1 parent d68b7d6 commit bac0f46

File tree

2 files changed

+39
-34
lines changed

2 files changed

+39
-34
lines changed

‎exercises/practice/zipper/ZipperTests.fs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,91 +11,91 @@ let leaf value = subTree value None None
1111
[<Fact>]
1212
let ``Data is retained`` () =
1313
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
14-
let sut = zipper |> toTree
1514
let expected = tree 1 (subTree 2 None (leaf 3)) (leaf 4)
16-
sut |> should equal expected
15+
let actual = zipper |> toTree
16+
actual |> should equal expected
1717

1818
[<Fact(Skip = "Remove this Skip property to run this test")>]
1919
let ``Left, right and value`` () =
2020
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
21-
let sut = zipper |> left |> Option.get |> right |> Option.get |> value
2221
let expected = 3
23-
sut |> should equal expected
22+
let actual = zipper |> left |> Option.get |> right |> Option.get |> value
23+
actual |> should equal expected
2424

2525
[<Fact(Skip = "Remove this Skip property to run this test")>]
2626
let ``Dead end`` () =
2727
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
28-
let sut = zipper |> left |> Option.get |> left
2928
let expected = None
30-
sut |> should equal expected
29+
let actual = zipper |> left |> Option.get |> left
30+
actual |> should equal expected
3131

3232
[<Fact(Skip = "Remove this Skip property to run this test")>]
3333
let ``Tree from deep focus`` () =
3434
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
35-
let sut = zipper |> left |> Option.get |> right |> Option.get |> toTree
3635
let expected = tree 1 (subTree 2 None (leaf 3)) (leaf 4)
37-
sut |> should equal expected
36+
let actual = zipper |> left |> Option.get |> right |> Option.get |> toTree
37+
actual |> should equal expected
3838

3939
[<Fact(Skip = "Remove this Skip property to run this test")>]
4040
let ``Traversing up from top`` () =
4141
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
42-
let sut = zipper |> up
4342
let expected = None
44-
sut |> should equal expected
43+
let actual = zipper |> up
44+
actual |> should equal expected
4545

4646
[<Fact(Skip = "Remove this Skip property to run this test")>]
4747
let ``Left, right, and up`` () =
4848
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
49-
let sut = zipper |> left |> Option.get |> up |> Option.get |> right |> Option.get |> up |> Option.get |> left |> Option.get |> right |> Option.get |> value
5049
let expected = 3
51-
sut |> should equal expected
50+
let actual = zipper |> left |> Option.get |> up |> Option.get |> right |> Option.get |> up |> Option.get |> left |> Option.get |> right |> Option.get |> value
51+
actual |> should equal expected
5252

5353
[<Fact(Skip = "Remove this Skip property to run this test")>]
5454
let ``Set value`` () =
5555
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
56-
let sut = zipper |> left |> Option.get |> setValue 5 |> toTree
5756
let expected = tree 1 (subTree 5 None (leaf 3)) (leaf 4)
58-
sut |> should equal expected
57+
let actual = zipper |> left |> Option.get |> setValue 5 |> toTree
58+
actual |> should equal expected
5959

6060
[<Fact(Skip = "Remove this Skip property to run this test")>]
6161
let ``Set value after traversing up`` () =
6262
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
63-
let sut = zipper |> left |> Option.get |> right |> Option.get |> up |> Option.get |> setValue 5 |> toTree
6463
let expected = tree 1 (subTree 5 None (leaf 3)) (leaf 4)
65-
sut |> should equal expected
64+
let actual = zipper |> left |> Option.get |> right |> Option.get |> up |> Option.get |> setValue 5 |> toTree
65+
actual |> should equal expected
6666

6767
[<Fact(Skip = "Remove this Skip property to run this test")>]
6868
let ``Set left with leaf`` () =
6969
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
70-
let sut = zipper |> left |> Option.get |> setLeft (Some (tree 5 None None)) |> toTree
7170
let expected = tree 1 (subTree 2 (leaf 5) (leaf 3)) (leaf 4)
72-
sut |> should equal expected
71+
let actual = zipper |> left |> Option.get |> setLeft (Some (tree 5 None None)) |> toTree
72+
actual |> should equal expected
7373

7474
[<Fact(Skip = "Remove this Skip property to run this test")>]
7575
let ``Set right with null`` () =
7676
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
77-
let sut = zipper |> left |> Option.get |> setRight None |> toTree
7877
let expected = tree 1 (leaf 2) (leaf 4)
79-
sut |> should equal expected
78+
let actual = zipper |> left |> Option.get |> setRight None |> toTree
79+
actual |> should equal expected
8080

8181
[<Fact(Skip = "Remove this Skip property to run this test")>]
8282
let ``Set right with subtree`` () =
8383
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
84-
let sut = zipper |> setRight (Some (tree 6 (leaf 7) (leaf 8))) |> toTree
8584
let expected = tree 1 (subTree 2 None (leaf 3)) (subTree 6 (leaf 7) (leaf 8))
86-
sut |> should equal expected
85+
let actual = zipper |> setRight (Some (tree 6 (leaf 7) (leaf 8))) |> toTree
86+
actual |> should equal expected
8787

8888
[<Fact(Skip = "Remove this Skip property to run this test")>]
8989
let ``Set value on deep focus`` () =
9090
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
91-
let sut = zipper |> left |> Option.get |> right |> Option.get |> setValue 5 |> toTree
9291
let expected = tree 1 (subTree 2 None (leaf 5)) (leaf 4)
93-
sut |> should equal expected
92+
let actual = zipper |> left |> Option.get |> right |> Option.get |> setValue 5 |> toTree
93+
actual |> should equal expected
9494

9595
[<Fact(Skip = "Remove this Skip property to run this test")>]
9696
let ``Different paths to same zipper`` () =
9797
let zipper = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4))
98-
let sut = zipper |> left |> Option.get |> up |> Option.get |> right
9998
let expected = fromTree (tree 1 (subTree 2 None (leaf 3)) (leaf 4)) |> right
100-
sut |> should equal expected
99+
let actual = zipper |> left |> Option.get |> up |> Option.get |> right
100+
actual |> should equal expected
101101

‎generators/Generators.fs‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,10 +1853,10 @@ type Zipper() =
18531853
let renderedOperations = renderOperations operations
18541854
$"let %s{identifier} = fromTree (%s{renderedTree}) %s{renderedOperations}"
18551855

1856-
let renderSut (operations: JToken) =
1856+
let renderActual (operations: JToken) =
18571857
operations
18581858
|> renderOperations
1859-
|> sprintf "let sut = zipper %s"
1859+
|> sprintf "let actual = zipper %s"
18601860

18611861
let renderExpected (expected: JToken) =
18621862
match expected.["type"] |> string with
@@ -1878,21 +1878,26 @@ type Zipper() =
18781878
"let leaf value = subTree value None None" ]
18791879
|> String.concat "\n"
18801880

1881-
override _.PropertiesWithIdentifier _ = [ "initialTree"; "sut"; "expected" ]
1881+
override _.PropertiesWithIdentifier _ = [ "initialTree"; "expected" ]
18821882

18831883
override _.RenderArrange testCase =
18841884
let tree =
18851885
testCase.Input.["initialTree"]
18861886
|> renderZipperWithIdentifier "zipper"
18871887

1888-
let sut =
1889-
testCase.Input.["operations"]
1890-
|> renderSut
1891-
18921888
let expected =
18931889
testCase.Expected |> renderExpected
18941890

1895-
[ tree; sut; expected ]
1891+
let actual =
1892+
testCase.Input.["operations"]
1893+
|> renderActual
1894+
1895+
[ tree; expected ; actual ]
1896+
1897+
override _.RenderAssert _ =
1898+
let ``assert`` = "actual |> should equal expected"
1899+
1900+
[ ``assert`` ]
18961901

18971902
override _.TestMethodName testCase =
18981903
base.TestMethodName testCase

0 commit comments

Comments
 (0)