From 436fecf2ec667400a2f7b4d66c9060ab7e98f6c8 Mon Sep 17 00:00:00 2001
From: Katerina881 <mr.alodov@mail.ru>
Date: Mon, 27 Feb 2023 16:19:46 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spring_online_calculator/LabTwo/items.js      |  8 +--
 .../SpringOnlineCalculatorApplication.java    |  2 +
 ...pringOnlineCalculatorApplicationTests.java | 51 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/spring_online_calculator/LabTwo/items.js b/spring_online_calculator/LabTwo/items.js
index 3071d82..76ff0ac 100644
--- a/spring_online_calculator/LabTwo/items.js
+++ b/spring_online_calculator/LabTwo/items.js
@@ -6,9 +6,9 @@ const check = null;
 const button_s = document.getElementById('Sum');
 button_s.addEventListener("click", function()
 {
-    console.log("Кнопка нажата.");
+    console.log("Кнопка  нажата.");
 
-    fetch('http://localhost:8080/plus?num_1=' + one.value + '&num_2=' + two.value)
+    fetch('http://localhost:8080/sum?num_1=' + one.value + '&num_2=' + two.value)
       .then((response) => response.text())
       .then((data) => result.value = data)
 });
@@ -34,7 +34,7 @@ button_i.addEventListener("click", function()
     }
     else
     {
-        fetch('http://localhost:8080/implement?num_1=' + one.value + '&num_2=' + two.value)
+        fetch('http://localhost:8080/cont?num_1=' + one.value + '&num_2=' + two.value)
           .then((response) => response.text())
           .then((data) => result.value = data)
     }
@@ -45,7 +45,7 @@ button_m.addEventListener("click", function()
 {
     console.log("Кнопка нажата.");
 
-    fetch('http://localhost:8080/multiplication?num_1=' + one.value + '&num_2=' + two.value)
+    fetch('http://localhost:8080/mul?num_1=' + one.value + '&num_2=' + two.value)
       .then((response) => response.text())
       .then((data) => result.value = data)
 });
diff --git a/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java b/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
index 6d4fc81..cff2176 100644
--- a/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
+++ b/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
@@ -16,6 +16,7 @@ public class SpringOnlineCalculatorApplication {
 		SpringApplication.run(SpringOnlineCalculatorApplication.class, args);
 	}
 
+	/*
 	@GetMapping("/plus")
 	public Integer Plus(@RequestParam(value="num_1") Integer num_1,
 						@RequestParam(value="num_2") Integer num_2) {
@@ -43,4 +44,5 @@ public class SpringOnlineCalculatorApplication {
 								  @RequestParam(value="num_2") Integer num_2) {
 		return num_1 * num_2;
 	}
+	 */
 }
diff --git a/spring_online_calculator/src/test/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplicationTests.java b/spring_online_calculator/src/test/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplicationTests.java
index 23300b5..2e31ebb 100644
--- a/spring_online_calculator/src/test/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplicationTests.java
+++ b/spring_online_calculator/src/test/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplicationTests.java
@@ -1,13 +1,62 @@
 package com.example.spring_online_calculator;
 
+import com.example.Service.MethodService;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
 class SpringOnlineCalculatorApplicationTests {
 
+	@Autowired
+	MethodService methodService;
+
 	@Test
-	void contextLoads() {
+	void testMethodSumInt() {
+		final String res = methodService.Sum("1", "2", "int");
+		Assertions.assertEquals("3", res);
 	}
 
+	@Test
+	void testMethodSumString() {
+		final String res = methodService.Sum("1", "2", "string");
+		Assertions.assertEquals("12", res);
+	}
+
+	@Test
+	void testMethodMinusInt() {
+		final String res = methodService.Minus("1", "2", "int");
+		Assertions.assertEquals("-1", res);
+	}
+
+	@Test
+	void testMethodMinusString() {
+		final String res = methodService.Minus("214324", "4", "string");
+		Assertions.assertEquals("2132", res);
+	}
+
+	@Test
+	void testMethodMultInt() {
+		final String res = methodService.Multiply("1", "2", "int");
+		Assertions.assertEquals("2", res);
+	}
+
+	@Test
+	void testMethodMultString() {
+		final String res = methodService.Multiply("1", "2", "string");
+		Assertions.assertEquals("11", res);
+	}
+
+	@Test
+	void testMethodContainsInt() {
+		final String res = methodService.Contains("123", "2", "int");
+		Assertions.assertEquals("true", res);
+	}
+
+	@Test
+	void testMethodContainsString() {
+		final String res = methodService.Contains("1", "2", "string");
+		Assertions.assertEquals("false", res);
+	}
 }