From f3f31c1a0353525073f42546dc5d4fe1f1701a70 Mon Sep 17 00:00:00 2001
From: maxnes3 <112558334+maxnes3@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:42:12 +0400
Subject: [PATCH] tests complete

---
 .../labworks/domain/ArrayCalculator.java      |  8 ++---
 .../labworks/LabworksApplicationTests.java    | 36 +++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/ip/labworks/labworks/domain/ArrayCalculator.java b/src/main/java/ru/ip/labworks/labworks/domain/ArrayCalculator.java
index ae8b5d3..728d2bd 100644
--- a/src/main/java/ru/ip/labworks/labworks/domain/ArrayCalculator.java
+++ b/src/main/java/ru/ip/labworks/labworks/domain/ArrayCalculator.java
@@ -10,7 +10,7 @@ public class ArrayCalculator implements ITypeCalculator{
         for (int i = 0; i < result.length; ++i){
             result[i] = Integer.toString(Integer.parseInt(result[i]) + Integer.parseInt(arg2.toString()));
         }
-        return String.join(", ", result);
+        return String.join(",", result);
     }
 
     @Override
@@ -19,7 +19,7 @@ public class ArrayCalculator implements ITypeCalculator{
         for (int i = 0; i < result.length; ++i){
             result[i] = Integer.toString(Integer.parseInt(result[i]) - Integer.parseInt(arg2.toString()));
         }
-        return String.join(", ", result);
+        return String.join(",", result);
     }
 
     @Override
@@ -28,7 +28,7 @@ public class ArrayCalculator implements ITypeCalculator{
         for (int i = 0; i < result.length; ++i){
             result[i] = Integer.toString(Integer.parseInt(result[i]) * Integer.parseInt(arg2.toString()));
         }
-        return String.join(", ", result);
+        return String.join(",", result);
     }
 
     @Override
@@ -37,6 +37,6 @@ public class ArrayCalculator implements ITypeCalculator{
         for (int i = 0; i < result.length; ++i){
             result[i] = Integer.toString(Integer.parseInt(result[i]) / Integer.parseInt(arg2.toString()));
         }
-        return String.join(", ", result);
+        return String.join(",", result);
     }
 }
diff --git a/src/test/java/ru/ip/labworks/labworks/LabworksApplicationTests.java b/src/test/java/ru/ip/labworks/labworks/LabworksApplicationTests.java
index 241d2ed..c3c866d 100644
--- a/src/test/java/ru/ip/labworks/labworks/LabworksApplicationTests.java
+++ b/src/test/java/ru/ip/labworks/labworks/LabworksApplicationTests.java
@@ -43,19 +43,43 @@ class LabworksApplicationTests {
 
 	@Test
 	void StrMinus() {
-		final String res = calculatorService.Minus("string", 10, 2).toString();
-		Assertions.assertEquals("8", res);
+		final String res = calculatorService.Minus("string", "10", "0").toString();
+		Assertions.assertEquals("1", res);
 	}
 
 	@Test
 	void StrMulti() {
-		final String res = calculatorService.Multi("string", 10, 2).toString();
-		Assertions.assertEquals("20", res);
+		final String res = calculatorService.Multi("string", "10", "2").toString();
+		Assertions.assertEquals("1010", res);
 	}
 
 	@Test
 	void StrDiv() {
-		final String res = calculatorService.Div("string", 10, 2).toString();
-		Assertions.assertEquals("5", res);
+		final String res = calculatorService.Div("string", "1010", "2").toString();
+		Assertions.assertEquals("10", res);
+	}
+
+	@Test
+	void ArrayPlus() {
+		final String res = calculatorService.Plus("array", "2,2,4", "2").toString();
+		Assertions.assertEquals("4,4,6", res);
+	}
+
+	@Test
+	void ArrayMinus() {
+		final String res = calculatorService.Minus("array", "2,2,4", "2").toString();
+		Assertions.assertEquals("0,0,2", res);
+	}
+
+	@Test
+	void ArrayMulti() {
+		final String res = calculatorService.Multi("array", "2,2,4", "2").toString();
+		Assertions.assertEquals("4,4,8", res);
+	}
+
+	@Test
+	void ArrayDiv() {
+		final String res = calculatorService.Div("array", "2,2,4", "2").toString();
+		Assertions.assertEquals("1,1,2", res);
 	}
 }