From 326ac71d5fc87e617d91a1ce4c70c0aed3d640e0 Mon Sep 17 00:00:00 2001 From: DeedeeDL Date: Thu, 4 Apr 2024 16:44:25 +0300 Subject: [PATCH 1/3] create --- ...ava => C01_10_MultiplicationOfIntegers.java} | 2 +- .../java/org/example/P21_StringIntoInteger.java | 8 ++++---- .../C01_10_MultiplicationOfIntegersTest.java | 17 ++++++++--------- .../org/example/P21_StringIntoIntegerTest.java | 15 +++++++++++++++ 4 files changed, 28 insertions(+), 14 deletions(-) rename src/main/java/org/example/{C01_10_MultiplyOfIntegers.java => C01_10_MultiplicationOfIntegers.java} (71%) create mode 100644 src/test/java/org/example/P21_StringIntoIntegerTest.java diff --git a/src/main/java/org/example/C01_10_MultiplyOfIntegers.java b/src/main/java/org/example/C01_10_MultiplicationOfIntegers.java similarity index 71% rename from src/main/java/org/example/C01_10_MultiplyOfIntegers.java rename to src/main/java/org/example/C01_10_MultiplicationOfIntegers.java index d8aaed5..6fc41e0 100644 --- a/src/main/java/org/example/C01_10_MultiplyOfIntegers.java +++ b/src/main/java/org/example/C01_10_MultiplicationOfIntegers.java @@ -1,6 +1,6 @@ package org.example; public class C01_10_MultiplicationOfIntegers { - public static int multiply(int num1, int num2) { + public static int multiplication(int num1, int num2) { int multiplication = num1 * num2; return multiplication; } diff --git a/src/main/java/org/example/P21_StringIntoInteger.java b/src/main/java/org/example/P21_StringIntoInteger.java index adc773b..3589636 100644 --- a/src/main/java/org/example/P21_StringIntoInteger.java +++ b/src/main/java/org/example/P21_StringIntoInteger.java @@ -1,10 +1,10 @@ package org.example; public class P21_StringIntoInteger { - public static void main(String[] args) { - String text = "1234"; - int numar = Integer.valueOf(text); - System.out.println("The value of the integer is : " + numar); + + public static int getNumber(String text) { + int number = Integer.valueOf(text); + return number; } } diff --git a/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java b/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java index c27963d..658a086 100644 --- a/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java +++ b/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java @@ -7,16 +7,15 @@ public class C01_10_MultiplicationOfIntegersTest { @Test - public void multiply() { - //given input - int num1 = 5; - int num2 = 6; + public void testMultiplication() { + // Given input + int num1 = 5; + int num2 = 6; - //method call - int multiplication = C01_10_MultiplicationOfIntegers.multiply(num1, num2); + // Method call + int multiplicationResult = C01_10_MultiplicationOfIntegers.multiplication(num1, num2); - - //assert the result - assertEquals(30, multiplication); + // Assert the result + assertEquals(30, multiplicationResult); } } diff --git a/src/test/java/org/example/P21_StringIntoIntegerTest.java b/src/test/java/org/example/P21_StringIntoIntegerTest.java new file mode 100644 index 0000000..f71a78a --- /dev/null +++ b/src/test/java/org/example/P21_StringIntoIntegerTest.java @@ -0,0 +1,15 @@ +package org.example; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class P21_StringIntoIntegerTest { + @Test + void getNumber() { + String text= "1234"; + int number = P21_StringIntoInteger.getNumber(text); + assertEquals("1234", text); + + } +} \ No newline at end of file From ab0f68e5af4833cc51bc2b355afcacb66f3908d7 Mon Sep 17 00:00:00 2001 From: DeedeeDL Date: Sun, 7 Apr 2024 20:46:03 +0300 Subject: [PATCH 2/3] Create String_to_integer --- src/main/java/org/example/P21_StringIntoInteger.java | 2 +- src/test/java/org/example/P21_StringIntoIntegerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/example/P21_StringIntoInteger.java b/src/main/java/org/example/P21_StringIntoInteger.java index 3589636..0920e56 100644 --- a/src/main/java/org/example/P21_StringIntoInteger.java +++ b/src/main/java/org/example/P21_StringIntoInteger.java @@ -3,7 +3,7 @@ public class P21_StringIntoInteger { - public static int getNumber(String text) { + public static int stringToInteger(String text) { int number = Integer.valueOf(text); return number; } diff --git a/src/test/java/org/example/P21_StringIntoIntegerTest.java b/src/test/java/org/example/P21_StringIntoIntegerTest.java index f71a78a..d3b47a0 100644 --- a/src/test/java/org/example/P21_StringIntoIntegerTest.java +++ b/src/test/java/org/example/P21_StringIntoIntegerTest.java @@ -8,7 +8,7 @@ class P21_StringIntoIntegerTest { @Test void getNumber() { String text= "1234"; - int number = P21_StringIntoInteger.getNumber(text); + int number = P21_StringIntoInteger.stringToInteger(text); assertEquals("1234", text); } From 2a5304c77ec1c173abb1f8ceca7264954ab1fb8f Mon Sep 17 00:00:00 2001 From: DeedeeDL Date: Thu, 11 Apr 2024 21:02:02 +0300 Subject: [PATCH 3/3] corrected --- .../C01_10_MultiplicationOfIntegers.java | 16 -------------- .../C01_10_MultiplicationOfIntegersTest.java | 21 ------------------- .../example/P21_StringIntoIntegerTest.java | 6 +++--- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/org/example/C01_10_MultiplicationOfIntegers.java delete mode 100644 src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java diff --git a/src/main/java/org/example/C01_10_MultiplicationOfIntegers.java b/src/main/java/org/example/C01_10_MultiplicationOfIntegers.java deleted file mode 100644 index b65f4df..0000000 --- a/src/main/java/org/example/C01_10_MultiplicationOfIntegers.java +++ /dev/null @@ -1,16 +0,0 @@ - -package org.example; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; - -class P21_StringIntoIntegerTest { - @Test - void getNumber() { - String text= "1234"; - int number = P21_StringIntoInteger.stringToInteger(text); - assertEquals("1234", text); - - } -} \ No newline at end of file diff --git a/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java b/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java deleted file mode 100644 index 658a086..0000000 --- a/src/test/java/org/example/C01_10_MultiplicationOfIntegersTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.example; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class C01_10_MultiplicationOfIntegersTest { - - @Test - public void testMultiplication() { - // Given input - int num1 = 5; - int num2 = 6; - - // Method call - int multiplicationResult = C01_10_MultiplicationOfIntegers.multiplication(num1, num2); - - // Assert the result - assertEquals(30, multiplicationResult); - } -} diff --git a/src/test/java/org/example/P21_StringIntoIntegerTest.java b/src/test/java/org/example/P21_StringIntoIntegerTest.java index d3b47a0..ef28383 100644 --- a/src/test/java/org/example/P21_StringIntoIntegerTest.java +++ b/src/test/java/org/example/P21_StringIntoIntegerTest.java @@ -7,9 +7,9 @@ class P21_StringIntoIntegerTest { @Test void getNumber() { - String text= "1234"; - int number = P21_StringIntoInteger.stringToInteger(text); - assertEquals("1234", text); + String number = "1234"; + int text = P21_StringIntoInteger.stringToInteger(number); + assertEquals(1234, text); } } \ No newline at end of file