From d122b30927f45b966ccf32a69f4df0bba5bfedb2 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 14 Oct 2020 16:18:56 +0530 Subject: [PATCH 01/12] Added Statements.java --- .../ordestiny/tdd/conditional/Statements.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/main/java/com/ordestiny/tdd/conditional/Statements.java diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java new file mode 100644 index 0000000..eab4c06 --- /dev/null +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -0,0 +1,72 @@ +package com.ordestiny.tdd.conditional; + +import java.util.Scanner; + +public class Statements { + + /** + * If the number lies between 10 and 99999 + * then the method returns the number of digits + * + * @param number + * @return String + */ + public String ifElseIf(int number){ + if(number <100 && number>=10) { + return ("2 digit number"); + } + else if(number <1000 && number>=100) { + return ("3 digit number"); + } + else if(number <10000 && number>=1000) { + return ("4 digit number"); + } + else if(number <100000 && number>=10000) { + return ("5 digit number"); + } + else { + return ("Number is not between 10 & 99999"); + } + } + + public void switchStatement(Double number1, char operator, Double number2) { + + /** + * Selects operator using switch + * to perform the operation and get the result + * + * @param number1 + * @param operator + * @param number2 + */ + Double result; + + switch (operator) { + + case '+': + result = number1 + number2; + System.out.print(number1 + " + " + number2 + " = " + result); + break; + + case '-': + result = number1 - number2; + System.out.print(number1 + " - " + number2 + " = " + result); + break; + + case '*': + result = number1 * number2; + System.out.print(number1 + " * " + number2 + " = " + result); + break; + + case '/': + result = number1 / number2; + System.out.print(number1 + " / " + number2 + " = " + result); + break; + + default: + System.out.println("Invalid operator!"); + break; + } + + } +} \ No newline at end of file From 77faed54d9be3af4b2cf075df220c991b6fd284d Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 14 Oct 2020 16:36:13 +0530 Subject: [PATCH 02/12] Added StatementsTest.java --- .../tdd/conditional/StatementsTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java new file mode 100644 index 0000000..114da6e --- /dev/null +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -0,0 +1,27 @@ +package com.ordestiny.tdd.conditional; + +import java.util.Scanner; + +public class StatementsTest { + private Statements object = new Statements(); + + @Test + void ifElseIfTest() { + Scanner sc = new Scanner(System.in); + System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); + int input = sc.nextInt(); + object.ifElseIf(input); + } + + @Test + void switchStatementTest() { + Scanner sc = new Scanner(System.in); + System.out.println("Enter first number: "); + Double input1 = sc.nextDouble(); + System.out.println("Enter second number: "); + Double input2 = sc.nextDouble(); + System.out.println("Choose an operator: +, -, *, or /: "); + char operator = sc.next().charAt(0); + object.switchStatement(input1, operator, input2); + } +} \ No newline at end of file From 15bda97f34220512665e167e402f754b48ff8341 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 14 Oct 2020 16:48:39 +0530 Subject: [PATCH 03/12] Update StatementsTest.java due to gradle --- .../java/com/ordestiny/tdd/conditional/StatementsTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java index 114da6e..544ffb8 100644 --- a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -5,7 +5,6 @@ public class StatementsTest { private Statements object = new Statements(); - @Test void ifElseIfTest() { Scanner sc = new Scanner(System.in); System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); @@ -13,7 +12,6 @@ void ifElseIfTest() { object.ifElseIf(input); } - @Test void switchStatementTest() { Scanner sc = new Scanner(System.in); System.out.println("Enter first number: "); @@ -24,4 +22,4 @@ void switchStatementTest() { char operator = sc.next().charAt(0); object.switchStatement(input1, operator, input2); } -} \ No newline at end of file +} From 36cf6384e2d9c1d4fb6a3672e0fdf2cd2cf5f8ef Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 14 Oct 2020 20:42:13 +0530 Subject: [PATCH 04/12] Update the importing packages --- .../java/com/ordestiny/tdd/conditional/StatementsTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java index 544ffb8..dfef7ff 100644 --- a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -1,5 +1,8 @@ package com.ordestiny.tdd.conditional; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Scanner; public class StatementsTest { From 36a3a8d9004080ac6247f1fefdd11cc14c0aed3d Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 14 Oct 2020 20:45:30 +0530 Subject: [PATCH 05/12] Updated the Importing packages --- .../java/com/ordestiny/tdd/conditional/StatementsTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java index dfef7ff..4aed8ba 100644 --- a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -1,21 +1,22 @@ package com.ordestiny.tdd.conditional; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import java.util.Scanner; public class StatementsTest { private Statements object = new Statements(); - void ifElseIfTest() { + @Test + public void ifElseIfTest() { Scanner sc = new Scanner(System.in); System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); int input = sc.nextInt(); object.ifElseIf(input); } - void switchStatementTest() { + @Test + public void switchStatementTest() { Scanner sc = new Scanner(System.in); System.out.println("Enter first number: "); Double input1 = sc.nextDouble(); From 9b761a43c088369611ac047c1222a25810993e3f Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Thu, 15 Oct 2020 00:00:34 +0530 Subject: [PATCH 06/12] Updated indentation --- .../ordestiny/tdd/conditional/Statements.java | 64 +++++++++---------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java index eab4c06..7234e71 100644 --- a/src/main/java/com/ordestiny/tdd/conditional/Statements.java +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -4,41 +4,37 @@ public class Statements { - /** - * If the number lies between 10 and 99999 - * then the method returns the number of digits - * - * @param number - * @return String - */ - public String ifElseIf(int number){ - if(number <100 && number>=10) { - return ("2 digit number"); - } - else if(number <1000 && number>=100) { - return ("3 digit number"); - } - else if(number <10000 && number>=1000) { - return ("4 digit number"); - } - else if(number <100000 && number>=10000) { - return ("5 digit number"); - } - else { - return ("Number is not between 10 & 99999"); - } - } + /** + * If the number lies between 10 and 99999 + * then the method returns the number of digits + * + * @param number + * @return String + */ + public String ifElseIf(int number) { + if (number < 100 && number >= 10) { + return ("2 digit number"); + } else if (number < 1000 && number >= 100) { + return ("3 digit number"); + } else if (number < 10000 && number >= 1000) { + return ("4 digit number"); + } else if (number < 100000 && number >= 10000) { + return ("5 digit number"); + } else { + return ("Number is not between 10 & 99999"); + } + } - public void switchStatement(Double number1, char operator, Double number2) { + public void switchStatement(Double number1, char operator, Double number2) { /** - * Selects operator using switch - * to perform the operation and get the result - * - * @param number1 - * @param operator - * @param number2 - */ + * Selects operator using switch + * to perform the operation and get the result + * + * @param number1 + * @param operator + * @param number2 + */ Double result; switch (operator) { @@ -68,5 +64,5 @@ public void switchStatement(Double number1, char operator, Double number2) { break; } - } -} \ No newline at end of file + } +} From be682d9830c998fff4945a6e2fc8a0a337acfa70 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Thu, 15 Oct 2020 00:01:52 +0530 Subject: [PATCH 07/12] Updated indentation for test --- .../tdd/conditional/StatementsTest.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java index 4aed8ba..1ef1dcc 100644 --- a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -5,25 +5,25 @@ import java.util.Scanner; public class StatementsTest { - private Statements object = new Statements(); + private Statements object = new Statements(); - @Test - public void ifElseIfTest() { - Scanner sc = new Scanner(System.in); - System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); - int input = sc.nextInt(); - object.ifElseIf(input); - } + @Test + public void ifElseIfTest() { + Scanner sc = new Scanner(System.in); + System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); + int input = sc.nextInt(); + object.ifElseIf(input); + } - @Test - public void switchStatementTest() { - Scanner sc = new Scanner(System.in); - System.out.println("Enter first number: "); - Double input1 = sc.nextDouble(); - System.out.println("Enter second number: "); - Double input2 = sc.nextDouble(); - System.out.println("Choose an operator: +, -, *, or /: "); - char operator = sc.next().charAt(0); - object.switchStatement(input1, operator, input2); - } + @Test + public void switchStatementTest() { + Scanner sc = new Scanner(System.in); + System.out.println("Enter first number: "); + Double input1 = sc.nextDouble(); + System.out.println("Enter second number: "); + Double input2 = sc.nextDouble(); + System.out.println("Choose an operator: +, -, *, or /: "); + char operator = sc.next().charAt(0); + object.switchStatement(input1, operator, input2); + } } From 01387bcb7da278e541fd55d117261c415aaa8ea4 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:58:07 +0530 Subject: [PATCH 08/12] Added assertEquals to StatementsTest.java --- .../tdd/conditional/StatementsTest.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java index 1ef1dcc..8b542fd 100644 --- a/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java +++ b/src/test/java/com/ordestiny/tdd/conditional/StatementsTest.java @@ -1,29 +1,31 @@ package com.ordestiny.tdd.conditional; import org.junit.jupiter.api.Test; - -import java.util.Scanner; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class StatementsTest { private Statements object = new Statements(); @Test public void ifElseIfTest() { - Scanner sc = new Scanner(System.in); - System.out.println("Enter a number between 10 and 99999 whose no. of digits is to be found: "); - int input = sc.nextInt(); - object.ifElseIf(input); + //number between 10 and 99999 whose no. of digits is to be found + assertEquals(object.ifElseIf(20), 2); + assertEquals(object.ifElseIf(100), 3); + assertEquals(object.ifElseIf(165), 3); + assertEquals(object.ifElseIf(9876), 4); + assertEquals(object.ifElseIf(90909), 5); + assertEquals(object.ifElseIf(24567), 5); } @Test public void switchStatementTest() { - Scanner sc = new Scanner(System.in); - System.out.println("Enter first number: "); - Double input1 = sc.nextDouble(); - System.out.println("Enter second number: "); - Double input2 = sc.nextDouble(); - System.out.println("Choose an operator: +, -, *, or /: "); - char operator = sc.next().charAt(0); - object.switchStatement(input1, operator, input2); + assertEquals(object.switchStatement(10, '+', 20), 30); + assertEquals(object.switchStatement(1234, '-', 891), 343); + assertEquals(object.switchStatement(17, '*', 987), 16779); + assertEquals(object.switchStatement(59865, '/', 5), 11973); + assertEquals(object.switchStatement(1098, '+', 4567), 5665); + assertEquals(object.switchStatement(1150, '*', 2), 2300); } } From ba2c5f581753be44c4226bce22141d44d98bafd6 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 28 Oct 2020 10:01:56 +0530 Subject: [PATCH 09/12] Added return to Statements.java --- .../java/com/ordestiny/tdd/conditional/Statements.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java index 7234e71..b92b379 100644 --- a/src/main/java/com/ordestiny/tdd/conditional/Statements.java +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -41,26 +41,26 @@ public void switchStatement(Double number1, char operator, Double number2) { case '+': result = number1 + number2; - System.out.print(number1 + " + " + number2 + " = " + result); + return number1 + " + " + number2 + " = " + result; break; case '-': result = number1 - number2; - System.out.print(number1 + " - " + number2 + " = " + result); + return number1 + " - " + number2 + " = " + result; break; case '*': result = number1 * number2; - System.out.print(number1 + " * " + number2 + " = " + result); + return number1 + " * " + number2 + " = " + result; break; case '/': result = number1 / number2; - System.out.print(number1 + " / " + number2 + " = " + result); + return number1 + " / " + number2 + " = " + result; break; default: - System.out.println("Invalid operator!"); + return "Invalid operator!"; break; } From b33aeb3d03ca1bc9e93bde35b86939701dfe5682 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 28 Oct 2020 10:06:53 +0530 Subject: [PATCH 10/12] Updated return statements --- .../java/com/ordestiny/tdd/conditional/Statements.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java index b92b379..4f16ad8 100644 --- a/src/main/java/com/ordestiny/tdd/conditional/Statements.java +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -41,26 +41,26 @@ public void switchStatement(Double number1, char operator, Double number2) { case '+': result = number1 + number2; - return number1 + " + " + number2 + " = " + result; + return (number1 + " + " + number2 + " = " + result); break; case '-': result = number1 - number2; - return number1 + " - " + number2 + " = " + result; + return (number1 + " - " + number2 + " = " + result); break; case '*': result = number1 * number2; - return number1 + " * " + number2 + " = " + result; + return (number1 + " * " + number2 + " = " + result); break; case '/': result = number1 / number2; - return number1 + " / " + number2 + " = " + result; + return (number1 + " / " + number2 + " = " + result); break; default: - return "Invalid operator!"; + return ("Invalid operator!"); break; } From d9ce50646ded922eabee456cda546703f32bd5d4 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 28 Oct 2020 10:11:19 +0530 Subject: [PATCH 11/12] Updated the return Type --- src/main/java/com/ordestiny/tdd/conditional/Statements.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java index 4f16ad8..2192306 100644 --- a/src/main/java/com/ordestiny/tdd/conditional/Statements.java +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -25,7 +25,7 @@ public String ifElseIf(int number) { } } - public void switchStatement(Double number1, char operator, Double number2) { + public String switchStatement(Double number1, char operator, Double number2) { /** * Selects operator using switch From 39cdb59816cf80d75eb87b58c4b0064fa48cb771 Mon Sep 17 00:00:00 2001 From: Aarushi Gupta <54365212+Aarushi5g@users.noreply.github.com> Date: Wed, 28 Oct 2020 10:16:10 +0530 Subject: [PATCH 12/12] update Statements.java --- src/main/java/com/ordestiny/tdd/conditional/Statements.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/conditional/Statements.java b/src/main/java/com/ordestiny/tdd/conditional/Statements.java index 2192306..c19caca 100644 --- a/src/main/java/com/ordestiny/tdd/conditional/Statements.java +++ b/src/main/java/com/ordestiny/tdd/conditional/Statements.java @@ -42,26 +42,21 @@ public String switchStatement(Double number1, char operator, Double number2) { case '+': result = number1 + number2; return (number1 + " + " + number2 + " = " + result); - break; case '-': result = number1 - number2; return (number1 + " - " + number2 + " = " + result); - break; case '*': result = number1 * number2; return (number1 + " * " + number2 + " = " + result); - break; case '/': result = number1 / number2; return (number1 + " / " + number2 + " = " + result); - break; default: return ("Invalid operator!"); - break; } }