2 Tidy the project

2.1 A hidden file for the recipes

A user of tally reads README.md first, and has no use for the recipes of the justfile. They are for the people who work on tally. just also finds its recipes in a file named .justfile, a hidden file that ls does not list. mv gives the justfile that name.

mv justfile .justfile

just --list

It prints the same four recipes as before, default, run, setup and test.

Check your files against this move. The command prints nothing when they match, and otherwise shows what differs:

git check f338b5b0824c

If you are stuck, this command puts the files of this move in place of yours. A file that you made yourself stays:

git restore --source 96d6bbd94a65 --staged -- :/ && git restore --source f338b5b0824c --staged --worktree -- :/

2.2 A test of lines

A text often has more than one line. No test yet gives count a text with a newline in it. A new test, test_lines, counts a b, a newline, and a.

Apply the patch to tests/test_count.py, from the top of the project:

curl -fsSL https://github.com/rahuldave/tally/commit/3a4ad8d9af5153b7eb458030e59169de6d7fef95.diff | git apply --include=tests/test_count.py

The patch adds the test test_lines at the end of the class Count.

uv run python -m unittest discover -s tests -q

All five tests pass.

Check your files against this move. The command prints nothing when they match, and otherwise shows what differs:

git check 3a4ad8d9af51

If you are stuck, this command puts the files of this move in place of yours. A file that you made yourself stays:

git restore --source f338b5b0824c --staged -- :/ && git restore --source 3a4ad8d9af51 --staged --worktree -- :/

@@ -9,3 +9,6 @@ class Count(unittest.TestCase):
 
     def test_case(self):
         self.assertEqual(count("A a"), {"a": 2})
+
+    def test_lines(self):
+        self.assertEqual(count("a b\na"), {"a": 2, "b": 1})

2.3 One name for the tests

The tests are in two files, tests/test_count.py and tests/test_edge.py. One file is one place to look. It gets the name of the project, tests/test_tally.py. mv gives the file of edge cases that name.

mv tests/test_edge.py tests/test_tally.py

uv run python -m unittest discover -s tests -q

All five tests pass, as before. unittest finds each file whose name starts with test.

Check your files against this move. The command prints nothing when they match, and otherwise shows what differs:

git check fa608c2a2aa3

If you are stuck, this command puts the files of this move in place of yours. A file that you made yourself stays:

git restore --source 3a4ad8d9af51 --staged -- :/ && git restore --source fa608c2a2aa3 --staged --worktree -- :/

2.4 Every test in one file

The class Count, with its three tests, goes into tests/test_tally.py too.

Apply the patch to tests/test_tally.py, from the top of the project:

curl -fsSL https://github.com/rahuldave/tally/commit/3d2bf4fc97f4b3711f3f8378b4db3311ce795a24.diff | git apply --include=tests/test_tally.py

The patch adds the class Count, with its three tests, at the end of tests/test_tally.py.

uv run python -m unittest discover -s tests -q

All eight tests pass. The three tests of Count run twice, once from each file. The next change removes the old file.

Check your files against this move. The command prints nothing when they match, and otherwise shows what differs:

git check 3d2bf4fc97f4

If you are stuck, this command puts the files of this move in place of yours. A file that you made yourself stays:

git restore --source fa608c2a2aa3 --staged -- :/ && git restore --source 3d2bf4fc97f4 --staged --worktree -- :/

@@ -9,3 +9,14 @@ class Edge(unittest.TestCase):
 
     def test_spaces(self):
         self.assertEqual(count("  \n\t "), {})
+
+
+class Count(unittest.TestCase):
+    def test_words(self):
+        self.assertEqual(count("a b a"), {"a": 2, "b": 1})
+
+    def test_case(self):
+        self.assertEqual(count("A a"), {"a": 2})
+
+    def test_lines(self):
+        self.assertEqual(count("a b\na"), {"a": 2, "b": 1})

2.5 The old file of tests goes

Every test of tests/test_count.py is now in tests/test_tally.py too. rm removes the old file.

rm tests/test_count.py

uv run python -m unittest discover -s tests -q

Each test now runs one time only, and all five tests pass.

Check your files against this move. The command prints nothing when they match, and otherwise shows what differs:

git check eb82f801c8df

If you are stuck, this command puts the files of this move in place of yours. A file that you made yourself stays:

git restore --source 3d2bf4fc97f4 --staged -- :/ && git restore --source eb82f801c8df --staged --worktree -- :/

@@ -1,14 +0,0 @@
-import unittest
-
-from tally import count
-
-
-class Count(unittest.TestCase):
-    def test_words(self):
-        self.assertEqual(count("a b a"), {"a": 2, "b": 1})
-
-    def test_case(self):
-        self.assertEqual(count("A a"), {"a": 2})
-
-    def test_lines(self):
-        self.assertEqual(count("a b\na"), {"a": 2, "b": 1})