Merge branch 'master' into patch-1

guaneec · web-flow · commit c5aa72e2dbb5 · 2017-10-27T00:29:21.000+08:00
diff --git a/exercises/clock/clock_test.py b/exercises/clock/clock_test.py
@@ -2,6 +2,8 @@
 
 from clock import Clock
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.1
+
 
 class ClockTest(unittest.TestCase):
     # Test creating a new clock with an initial time.
diff --git a/exercises/hamming/hamming_test.py b/exercises/hamming/hamming_test.py
@@ -3,10 +3,13 @@
 import hamming
 
 
-# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.0.1
 
 class HammingTest(unittest.TestCase):
 
+    def test_empty_strands(self):
+        self.assertEqual(hamming.distance("", ""), 0)
+
     def test_identical_strands(self):
         self.assertEqual(hamming.distance("A", "A"), 0)
 
@@ -29,10 +32,10 @@ def test_small_distance_in_long_strands(self):
         self.assertEqual(hamming.distance("ACCAGGG", "ACTATGG"), 2)
 
     def test_non_unique_character_in_first_strand(self):
-        self.assertEqual(hamming.distance("AGA", "AGG"), 1)
+        self.assertEqual(hamming.distance("AAG", "AAA"), 1)
 
     def test_non_unique_character_in_second_strand(self):
-        self.assertEqual(hamming.distance("AGG", "AGA"), 1)
+        self.assertEqual(hamming.distance("AAA", "AAG"), 1)
 
     def test_same_nucleotides_in_different_positions(self):
         self.assertEqual(hamming.distance("TAG", "GAT"), 2)
@@ -43,9 +46,6 @@ def test_large_distance(self):
     def test_large_distance_in_off_by_one_strand(self):
         self.assertEqual(hamming.distance("GGACGGATTCTG", "AGGACGGATTCT"), 9)
 
-    def test_empty_strands(self):
-        self.assertEqual(hamming.distance("", ""), 0)
-
     def test_disallow_first_strand_longer(self):
         with self.assertRaises(ValueError):
             hamming.distance("AATG", "AAA")
