From 93c1d65b0a29f0356e4f42e7b9bbedf2a30195c6 Mon Sep 17 00:00:00 2001
From: Clare Sudbery <clareworking@claresudbery.co.uk>
Date: Sun, 25 Feb 2024 18:48:46 +0000
Subject: [PATCH 1/3] Fix "horray" typo

---
 src/main/java/org/learnwithllew/duplicationkata/Lesson21.java   | 2 +-
 src/main/java/org/learnwithllew/duplicationkata/Lesson31.java   | 2 +-
 .../duplicationkata/RegressionTest.testNames.approved.txt       | 2 +-
 .../duplicationkata/RegressionTest.testNames3.approved.txt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java b/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
index a19516b..3d5863c 100644
--- a/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
+++ b/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
@@ -11,7 +11,7 @@ public void singSong(int style, String... names)
         {
           if (name.startsWith("L", 0))
           {
-            sing("Hip Hip Horray! For " + name);
+            sing("Hip Hip Hurray! For " + name);
           }
           else
           {
diff --git a/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java b/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
index 8819562..e6f3620 100644
--- a/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
+++ b/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
@@ -11,7 +11,7 @@ public void singSong(int style, String... names)
         {
           if (name.startsWith("L"))
           {
-            sing("Hip Hip Horray! For " + name);
+            sing("Hip Hip Hurray! For " + name);
           }
           else
           {
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
index d287b40..732c5c5 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
@@ -1,4 +1,4 @@
-Hip Hip Horray! For Llewellyn
+Hip Hip Hurray! For Llewellyn
 Hello Samatha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
index bcc2714..82515ed 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
@@ -1,4 +1,4 @@
-Hip Hip Horray! For Llewellyn
+Hip Hip Hurray! For Llewellyn
 Hello Samatha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.

From 11b347da5823e432654c4ab930b236c1a7f308e9 Mon Sep 17 00:00:00 2001
From: Clare Sudbery <clareworking@claresudbery.co.uk>
Date: Sun, 25 Feb 2024 18:57:25 +0000
Subject: [PATCH 2/3] Fix Samantha typo - had a missing N

---
 .../org/learnwithllew/duplicationkata/RegressionTest.java   | 4 ++--
 .../duplicationkata/RegressionTest.testNames.approved.txt   | 6 +++---
 .../duplicationkata/RegressionTest.testNames3.approved.txt  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.java b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.java
index 714361d..20e6fe0 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.java
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.java
@@ -28,7 +28,7 @@ public void testBeer()
   public void testNames()
   {
     Lesson21 song = new Lesson21();
-    String[] names = {"Llewellyn", "Samatha", "Tomas", "Emilia"};
+    String[] names = {"Llewellyn", "Samantha", "Tomas", "Emilia"};
     song.singSong(1, names);
     song.singSong(2, names);
     song.singSong(3, names);
@@ -45,7 +45,7 @@ public void testNumbers()
   public void testNames3()
   {
     Lesson31 song = new Lesson31();
-    String[] names = {"Llewellyn", "Samatha", "Tomas", "Emilia"};
+    String[] names = {"Llewellyn", "Samantha", "Tomas", "Emilia"};
     song.singSong(1, names);
     song.singSong(2, names);
     song.singSong(3, names);
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
index 732c5c5..b1f7fd2 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
@@ -1,12 +1,12 @@
 Hip Hip Hurray! For Llewellyn
-Hello Samatha, it's nice to meet you.
+Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
 Hello Llewellyn, it's nice to meet you.
-Say yeah! Say yo! Say Samatha
+Say yeah! Say yo! Say Samantha
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
 Hello Llewellyn, it's nice to meet you.
-Hello Samatha, it's nice to meet you.
+Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
index 82515ed..3dcdf64 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
@@ -1,12 +1,12 @@
 Hip Hip Hurray! For Llewellyn
-Hello Samatha, it's nice to meet you.
+Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
 Hello Llewellyn, it's nice to meet you.
-SAMATHA! Yay Samatha!
+SAMANTHA! Yay Samantha!
 TOMAS! Yay Tomas!
 EMILIA! Yay Emilia!
 Hello Llewellyn, it's nice to meet you.
-Hello Samatha, it's nice to meet you.
+Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.

From acdac5fb5e745c98493fb850508647d358687f6a Mon Sep 17 00:00:00 2001
From: Clare Sudbery <clareworking@claresudbery.co.uk>
Date: Sun, 25 Feb 2024 19:01:40 +0000
Subject: [PATCH 3/3] Reinstated "horray" typo, to keep fix branches
 independent

---
 src/main/java/org/learnwithllew/duplicationkata/Lesson21.java   | 2 +-
 src/main/java/org/learnwithllew/duplicationkata/Lesson31.java   | 2 +-
 .../duplicationkata/RegressionTest.testNames.approved.txt       | 2 +-
 .../duplicationkata/RegressionTest.testNames3.approved.txt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java b/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
index 3d5863c..a19516b 100644
--- a/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
+++ b/src/main/java/org/learnwithllew/duplicationkata/Lesson21.java
@@ -11,7 +11,7 @@ public void singSong(int style, String... names)
         {
           if (name.startsWith("L", 0))
           {
-            sing("Hip Hip Hurray! For " + name);
+            sing("Hip Hip Horray! For " + name);
           }
           else
           {
diff --git a/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java b/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
index e6f3620..8819562 100644
--- a/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
+++ b/src/main/java/org/learnwithllew/duplicationkata/Lesson31.java
@@ -11,7 +11,7 @@ public void singSong(int style, String... names)
         {
           if (name.startsWith("L"))
           {
-            sing("Hip Hip Hurray! For " + name);
+            sing("Hip Hip Horray! For " + name);
           }
           else
           {
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
index b1f7fd2..7304a31 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames.approved.txt
@@ -1,4 +1,4 @@
-Hip Hip Hurray! For Llewellyn
+Hip Hip Horray! For Llewellyn
 Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.
diff --git a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
index 3dcdf64..4554e70 100644
--- a/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
+++ b/src/test/java/org/learnwithllew/duplicationkata/RegressionTest.testNames3.approved.txt
@@ -1,4 +1,4 @@
-Hip Hip Hurray! For Llewellyn
+Hip Hip Horray! For Llewellyn
 Hello Samantha, it's nice to meet you.
 Hello Tomas, it's nice to meet you.
 Hello Emilia, it's nice to meet you.