From 8b041264d3857340cedceaa18da38e511b27b9bb Mon Sep 17 00:00:00 2001 From: RahilTari Date: Thu, 27 Mar 2025 10:16:02 +0330 Subject: [PATCH] Simple calculator --- .../java/com/github/javabaz/Calculator.java | 4 +-- .../java/com/github/javabaz/Calculator15.java | 28 +++++++++++++++++++ .../com/github/javabaz/CalculatorTest.java | 4 +-- week01/week01.iml | 20 +++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 week01/src/main/java/com/github/javabaz/Calculator15.java create mode 100644 week01/week01.iml diff --git a/week01/src/main/java/com/github/javabaz/Calculator.java b/week01/src/main/java/com/github/javabaz/Calculator.java index 55ff456..20a5d5e 100644 --- a/week01/src/main/java/com/github/javabaz/Calculator.java +++ b/week01/src/main/java/com/github/javabaz/Calculator.java @@ -6,7 +6,7 @@ public class Calculator { // copy past this file and rename new file with your own code! - public int add(int a, int b) { +/* public int add(int a, int b) { // todo } @@ -20,6 +20,6 @@ public int multiply(int a, int b) { public int divide(int a, int b) { // todo - } + }*/ } diff --git a/week01/src/main/java/com/github/javabaz/Calculator15.java b/week01/src/main/java/com/github/javabaz/Calculator15.java new file mode 100644 index 0000000..2d5543b --- /dev/null +++ b/week01/src/main/java/com/github/javabaz/Calculator15.java @@ -0,0 +1,28 @@ +package com.github.javabaz; + +public class Calculator15 { + + // NOTE : Don't edit this file!; + // copy past this file and rename new file with your own code! + + + public int add(int a, int b) { + return a+b; + } + + public int subtract(int a, int b) { + return a-b; + } + + public int multiply(int a, int b) { + return a*b; + } + + public int divide(int a, int b) { + if (b == 0) { + throw new ArithmeticException("Cannot divide by zero"); + } + return a / b; + } +} + diff --git a/week01/src/test/java/com/github/javabaz/CalculatorTest.java b/week01/src/test/java/com/github/javabaz/CalculatorTest.java index 3683624..ec4a02f 100644 --- a/week01/src/test/java/com/github/javabaz/CalculatorTest.java +++ b/week01/src/test/java/com/github/javabaz/CalculatorTest.java @@ -8,11 +8,11 @@ class CalculatorTest { - private Calculator calculator; + private Calculator15 calculator; @BeforeEach void setUp() { - calculator = new Calculator(); + calculator = new Calculator15(); } @Test diff --git a/week01/week01.iml b/week01/week01.iml new file mode 100644 index 0000000..957ad20 --- /dev/null +++ b/week01/week01.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file