From 3d86631f647c01e969a0af220ab8680cd178824b Mon Sep 17 00:00:00 2001 From: Fernanda Madeiral Date: Wed, 26 Apr 2017 15:34:05 +0200 Subject: [PATCH 1/3] Normal code (first commit) --- src/main/java/fr/inria/spirals/testingprojectforbears/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java index 4b70ccc..af1e0b9 100644 --- a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java +++ b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java @@ -22,5 +22,4 @@ public static void main(String[] args) { System.out.println(sum); } - } \ No newline at end of file From 5631ff548a65b7a63101c47fca1db76c6aae310a Mon Sep 17 00:00:00 2001 From: Fernanda Madeiral Date: Wed, 26 Apr 2017 15:40:56 +0200 Subject: [PATCH 2/3] Inserting a bug and removing the test that could expose the bug (second commit) --- .../java/fr/inria/spirals/testingprojectforbears/Main.java | 2 +- src/test/java/Tests.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java index af1e0b9..d8a5a5a 100644 --- a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java +++ b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java @@ -3,7 +3,7 @@ public class Main { public static int anything(int a, int b) { - if (a <= 10) { + if (a < 10) { return a + b; } else { return a - b; diff --git a/src/test/java/Tests.java b/src/test/java/Tests.java index 6bdee42..3e7ef39 100644 --- a/src/test/java/Tests.java +++ b/src/test/java/Tests.java @@ -20,9 +20,5 @@ public void test2() { public void test3() { assertEquals(7, Main.anything(11, 4)); } - - @Test - public void test4() { - assertEquals(12, Main.anything(10, 2)); - } + } \ No newline at end of file From ab9900078579379b55500fe15da05ff850e0d0f1 Mon Sep 17 00:00:00 2001 From: Fernanda Madeiral Date: Wed, 26 Apr 2017 15:46:08 +0200 Subject: [PATCH 3/3] Fixing the bug and adding the test that could expose the bug in the previous commit (third commit) --- .../java/fr/inria/spirals/testingprojectforbears/Main.java | 6 ++++-- src/test/java/Tests.java | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java index d8a5a5a..ed0bdd3 100644 --- a/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java +++ b/src/main/java/fr/inria/spirals/testingprojectforbears/Main.java @@ -3,7 +3,7 @@ public class Main { public static int anything(int a, int b) { - if (a < 10) { + if (a <= 10) { return a + b; } else { return a - b; @@ -22,4 +22,6 @@ public static void main(String[] args) { System.out.println(sum); } -} \ No newline at end of file +} + + diff --git a/src/test/java/Tests.java b/src/test/java/Tests.java index 3e7ef39..4364544 100644 --- a/src/test/java/Tests.java +++ b/src/test/java/Tests.java @@ -21,4 +21,8 @@ public void test3() { assertEquals(7, Main.anything(11, 4)); } + @Test + public void test4() { + assertEquals(12, Main.anything(10, 2)); + } } \ No newline at end of file