DozorovaA.A/IP_LabWorks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tests

Browse Source
This commit is contained in:
DozorovaA.A 2023-03-06 13:21:05 +04:00
parent f9143fb60b
commit d60fbbe32f
3 changed files with 86 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/index.html
View File

@ -8,10 +8,10 @@
<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script> <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
<link href="node_modules/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet"/> <link href="node_modules/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet"/>
<title>Volt's Site</title> <title>Calculate Site</title>
</head> </head>
<body> <body>
<form id="frm-items" class="row g-3"> <form id="frm-items" class="row g-3" style="text-align: center">
<div class="d-flex flex-column w-25 my-5 mx-3"> <div class="d-flex flex-column w-25 my-5 mx-3">
Введите первое число Введите первое число
<input id="first"></input> <input id="first"></input>

58
src/main/java/com/example/demo/speaker/service/MethodService.java
View File

@ -17,34 +17,70 @@ public class MethodService {
public String Sum(Object first, Object second, String type) { public String Sum(Object first, Object second, String type) {
final IMethod operation = (IMethod) applicationContext.getBean(type); final IMethod operation = (IMethod) applicationContext.getBean(type);
if (operation instanceof MethodString){ if (operation instanceof MethodString){
return String.format("%s", operation.Sum(first,second)); if(first instanceof String && second instanceof String)
{
return String.format("%s", operation.Sum(first,second));
}
return "Uncorrect type";
}else if (operation instanceof MethodBoolean){ }else if (operation instanceof MethodBoolean){
return operation.Sum(Boolean.parseBoolean(first.toString()),Boolean.parseBoolean(second.toString())).toString(); if(first instanceof Boolean && second instanceof Boolean)
{
return operation.Sum(Boolean.parseBoolean(first.toString()),Boolean.parseBoolean(second.toString())).toString();
}
else return "Uncorrect type";
} }
else{ else{
return String.format("%s", operation.Sum(Integer.parseInt(first.toString()),Integer.parseInt(second.toString()))); if(first instanceof Integer && second instanceof Integer)
{
return String.format("%s", operation.Sum(Integer.parseInt(first.toString()),Integer.parseInt(second.toString())));
}
else return "Uncorrect type";
} }
} }
public String Ras(Object first, Object second, String type) { public String Ras(Object first, Object second, String type) {
final IMethod operation = (IMethod) applicationContext.getBean(type); final IMethod operation = (IMethod) applicationContext.getBean(type);
if (operation instanceof MethodString){ if (operation instanceof MethodString){
return String.format("%s", operation.Minus(first,Integer.parseInt(second.toString()))); if(first instanceof String && second instanceof Integer)
{
return String.format("%s", operation.Minus(first,Integer.parseInt(second.toString())));
}
return "Uncorrect type";
}else if (operation instanceof MethodBoolean){ }else if (operation instanceof MethodBoolean){
return operation.Minus(Boolean.parseBoolean(first.toString()), Integer.parseInt(second.toString())).toString(); if(first instanceof Boolean && second instanceof Integer)
{
return operation.Minus(Boolean.parseBoolean(first.toString()), Integer.parseInt(second.toString())).toString();
}
else return "Uncorrect type";
}else{ }else{
return String.format("%s", operation.Minus(Integer.parseInt(first.toString()),Integer.parseInt(second.toString()))); if(first instanceof Integer && second instanceof Integer)
{
return String.format("%s", operation.Minus(Integer.parseInt(first.toString()),Integer.parseInt(second.toString())));
}
else return "Uncorrect type";
} }
} }
public String Pros(Object first, Object second, String type) { public String Pros(Object first, Object second, String type) {
final IMethod operation = (IMethod) applicationContext.getBean(type); final IMethod operation = (IMethod) applicationContext.getBean(type);
if (operation instanceof MethodString){ if (operation instanceof MethodString){
return String.format("%s", operation.Multiply(first,Integer.parseInt(second.toString()))); if(first instanceof String && second instanceof Integer)
{
return String.format("%s", operation.Multiply(first,Integer.parseInt(second.toString())));
}
return "Uncorrect type";
}else if (operation instanceof MethodBoolean){ }else if (operation instanceof MethodBoolean){
return operation.Multiply(Boolean.parseBoolean(first.toString()), Integer.parseInt(second.toString())).toString(); if(first instanceof Boolean && second instanceof Integer)
{
return operation.Multiply(Boolean.parseBoolean(first.toString()), Integer.parseInt(second.toString())).toString();
}
else return "Uncorrect type";
}else{ }else{
return String.format("%s", operation.Multiply(Integer.parseInt(first.toString()),Integer.parseInt(second.toString()))); if(first instanceof Integer && second instanceof Integer)
{
return String.format("%s", operation.Multiply(Integer.parseInt(first.toString()),Integer.parseInt(second.toString())));
}
else return "Uncorrect type";
} }
} }
@ -53,6 +89,10 @@ public class MethodService {
if (operation instanceof MethodString){ if (operation instanceof MethodString){
return String.format("%s", operation.Div(first,second)); return String.format("%s", operation.Div(first,second));
}else if (operation instanceof MethodBoolean){ }else if (operation instanceof MethodBoolean){
if(first.toString()!="true" && second.toString() != "false")
{
throw new ClassCastException("Uncorrect type");
}
return String.format("%s", operation.Div(Boolean.parseBoolean(first.toString()), Boolean.parseBoolean(second.toString())).toString()); return String.format("%s", operation.Div(Boolean.parseBoolean(first.toString()), Boolean.parseBoolean(second.toString())).toString());
}else { }else {
return String.format("%s", operation.Div(Integer.parseInt(first.toString()), Integer.parseInt(second.toString()))); return String.format("%s", operation.Div(Integer.parseInt(first.toString()), Integer.parseInt(second.toString())));

39
src/test/java/com/example/demo/DemoApplicationTests.java
View File

@ -11,6 +11,22 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
class DemoApplicationTests { class DemoApplicationTests {
@Autowired @Autowired
private MethodService methodService; private MethodService methodService;
@Test
void testIntType() {
String res = methodService.Sum(2, "2", "int");
Assertions.assertEquals("Uncorrect type", res);
}
@Test
void testStringType() {
String res = methodService.Sum(2, 2, "string");
Assertions.assertEquals("Uncorrect type", res);
}
@Test
void testBooleanType() {
String res = methodService.Sum("3", "2", "boolean");
Assertions.assertEquals("Uncorrect type", res);
}
@Test @Test
void testIntSum() { void testIntSum() {
Integer res = Integer.valueOf(methodService.Sum(2, 2, "int")); Integer res = Integer.valueOf(methodService.Sum(2, 2, "int"));
@ -18,7 +34,7 @@ class DemoApplicationTests {
} }
@Test @Test
void testStringSum() { void testStringSum() {
String res = methodService.Sum("hello, ", 2, "string"); String res = methodService.Sum("hello, ", "2", "string");
Assertions.assertEquals("hello, 2", res); Assertions.assertEquals("hello, 2", res);
} }
@Test @Test
@ -39,8 +55,8 @@ class DemoApplicationTests {
} }
@Test @Test
void testBooleanDiff() { void testBooleanDiff() {
String res = methodService.Ras(1, 2, "boolean"); String res = methodService.Ras(true, 2, "boolean");
Assertions.assertEquals(true, res); Assertions.assertEquals("false", res);
} }
@Test @Test
@ -66,7 +82,7 @@ class DemoApplicationTests {
} }
@Test @Test
void testStringDivide() { void testStringDivide() {
String res = methodService.Del("test", 2, "string"); String res = methodService.Del("test", "2", "string");
Assertions.assertEquals("false", res); Assertions.assertEquals("false", res);
} }
@Test @Test
@ -80,4 +96,19 @@ class DemoApplicationTests {
Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> methodService.Sum(1, 2, "date")); Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> methodService.Sum(1, 2, "date"));
} }
@Test
void testErrorTypeString() {
Assertions.assertThrows(ClassCastException.class, () -> methodService.Del(1, 2, "string"));
}
@Test
void testErrorTypeBoolean() {
Assertions.assertThrows(ClassCastException.class, () -> methodService.Del("jjj15", 3, "boolean"));
}
@Test
void testErrorTypeInt() {
Assertions.assertThrows(NumberFormatException.class, () -> methodService.Del(true, 2, "int"));
}
} }