-
-
-
-
diff --git a/src/main/webapp/WEB-INF/head.jsp b/src/main/webapp/WEB-INF/head.jsp
deleted file mode 100644
index 2f7b9f2..0000000
--- a/src/main/webapp/WEB-INF/head.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-
- <%= "Hello World!" %> -
--List Users - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 0bf2fcb..7d22909 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,4 +3,4 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" version="6.0"> - \ No newline at end of file + diff --git a/src/main/webapp/assets/honda.svg b/src/main/webapp/assets/honda.svg new file mode 100644 index 0000000..696c9a7 --- /dev/null +++ b/src/main/webapp/assets/honda.svg @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/src/main/webapp/assets/logo.svg b/src/main/webapp/assets/logo.svg new file mode 100644 index 0000000..fd3a36f --- /dev/null +++ b/src/main/webapp/assets/logo.svg @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/src/main/webapp/css/MyCSS.css b/src/main/webapp/css/MyCSS.css new file mode 100644 index 0000000..b821c83 --- /dev/null +++ b/src/main/webapp/css/MyCSS.css @@ -0,0 +1,19 @@ + + + +.container { + display: flex; + justify-content: center; + align-items: center; +} + +.text-end { + display: flex; + justify-content: center; + align-items: center; +} + +.lead { + text-align: center; +} + diff --git a/src/main/webapp/css/signin.css b/src/main/webapp/css/signin.css new file mode 100644 index 0000000..f06a4e4 --- /dev/null +++ b/src/main/webapp/css/signin.css @@ -0,0 +1,33 @@ +html, +body { + height: 100%; +} + +body { + display: flex; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + max-width: 330px; + padding: 15px; +} + +.form-signin .form-floating:focus-within { + z-index: 2; +} + +.form-signin input[type="name"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} diff --git a/src/main/webapp/images/cat.png b/src/main/webapp/images/cat.png deleted file mode 100644 index 41771a1..0000000 Binary files a/src/main/webapp/images/cat.png and /dev/null differ diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..79b3bdd --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,104 @@ +<%@ page import="services.RepositoryService" %> +<%@ page import="repository.Repository" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + + + + + + + +
+ 
+
+
+
+
+
+ Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/win.jsp b/src/main/webapp/win.jsp
new file mode 100644
index 0000000..03c7d4f
--- /dev/null
+++ b/src/main/webapp/win.jsp
@@ -0,0 +1,74 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+ Приключения мотоциклиста
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
+
+
+
+
+ records = Arrays.asList(question1, question2, answer1, answer2, answer3);
+ repository = new Repository(records);
+ service = new RepositoryService(repository);
+ }
+
+ @Test
+ public void equalsTest() {
+ Answer answer = service.getAnswerById("101");
+ Answer answer2 = new Answer();
+ answer2.setId("101");
+ answer2.setAnswer("answer1");
+ answer2.setResult(Result.NEXT_QUESTION);
+ answer2.setIdQuestion("2");
+ assertEquals(answer2, answer);
+ }
+
+ @Test
+ public void answerGetTextResultTest() {
+ Answer answer = service.getAnswerById("102");
+ String resultText = answer.getResultText();
+ assertEquals("answer by win", resultText);
+ }
+
+ @Test
+ public void getAnswerResultLoseTest() {
+ Answer answer = service.getAnswerById("201");
+ assertEquals(Result.LOSE, answer.getResult());
+ }
+
+ @Test
+ public void getAnswerResultWinTest() {
+ Answer answer = service.getAnswerById("102");
+ assertEquals(Result.WIN, answer.getResult());
+ }
+
+ @Test
+ public void getAnswerResultNextQuestionTest() {
+ Answer answer = service.getAnswerById("101");
+ assertEquals(Result.NEXT_QUESTION, answer.getResult());
+ }
+
+ @Test
+ public void getQuestionFromAnswerTest() {
+ Question question = service.getQuestionById("2");
+ Answer answer = service.getAnswerById("101");
+ Question question1 = service.getQuestionById(answer.getIdQuestion());
+ assertEquals(question, question1);
+ }
+
+}
diff --git a/src/test/java/QuestionTest.java b/src/test/java/QuestionTest.java
new file mode 100644
index 0000000..76a6af4
--- /dev/null
+++ b/src/test/java/QuestionTest.java
@@ -0,0 +1,49 @@
+
+import entity.Question;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import repository.Repository;
+import services.RepositoryService;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class QuestionTest {
+ Repository repository;
+ RepositoryService service;
+
+ @BeforeEach
+ public void init() {
+ String[] question1 = {"1", "question1", "2"};
+ String[] question2 = {"2", "question2", "2"};
+ List records = Arrays.asList(question1, question2);
+ repository = new Repository(records);
+ service = new RepositoryService(repository);
+ }
+
+ @Test
+ public void getAnswersForQuestionTest() {
+ Question question = service.getQuestionById("1");
+ assertTrue(question.getAnswersId().contains("101") && question.getAnswersId().contains("102"));
+ }
+
+ @Test
+ public void equalsTest() {
+ Question question = service.getQuestionById("1");
+ Question question2 = new Question();
+ question2.setId("1");
+ question2.setQuestion("question1");
+ question2.setQuantityAnswers(2);
+ List answersId = new ArrayList<>();
+ answersId.add("101");
+ answersId.add("102");
+ question2.setAnswersId(answersId);
+ assertEquals(question, question2);
+ }
+
+
+}
diff --git a/src/test/java/RepositoryServiceTest.java b/src/test/java/RepositoryServiceTest.java
new file mode 100644
index 0000000..84724d2
--- /dev/null
+++ b/src/test/java/RepositoryServiceTest.java
@@ -0,0 +1,107 @@
+import entity.Answer;
+import entity.Question;
+import entity.Result;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import repository.Repository;
+import services.RepositoryService;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class RepositoryServiceTest {
+ Repository repository;
+
+ @BeforeEach
+ public void init() {
+ String[] question1 = {"1", "question1", "2"};
+ String[] answer1 = {"101", "answer1", "2"};
+ String[] answer2 = {"102", "answer2", "win", "answer by win"};
+ List records = Arrays.asList(question1, answer1, answer2);
+ repository = new Repository(records);
+ }
+
+ @Test
+ public void getQuestionByIdTest() {
+ Question question = new Question();
+ question.setQuestion("question1");
+ question.setId("1");
+ question.setQuantityAnswers(2);
+ List answersId = new ArrayList<>();
+ answersId.add("101");
+ answersId.add("102");
+ question.setAnswersId(answersId);
+ RepositoryService service = new RepositoryService(repository);
+ assertEquals(question, service.getQuestionById(question.getId()));
+ }
+
+ @Test
+ public void getAnswerByIdTest() {
+ Answer answer = new Answer();
+ answer.setId("101");
+ answer.setAnswer("answer1");
+ answer.setIdQuestion("2");
+ answer.setResult(Result.NEXT_QUESTION);
+ RepositoryService service = new RepositoryService(repository);
+ assertEquals(answer, service.getAnswerById(answer.getId()));
+ }
+
+ @Test
+ public void getListQuestionsTest() {
+ RepositoryService service = new RepositoryService(repository);
+ Question question = new Question();
+ question.setQuestion("question1");
+ question.setId("1");
+ List answersId = new ArrayList<>();
+ answersId.add("101");
+ answersId.add("102");
+ question.setAnswersId(answersId);
+ question.setQuantityAnswers(2);
+ List questions = new ArrayList<>();
+ questions.add(question);
+ assertEquals(questions, service.getQuestions());
+ }
+
+ @Test
+ public void getListAnswersTest() {
+ RepositoryService service = new RepositoryService(repository);
+ Answer answer1 = new Answer();
+ answer1.setId("101");
+ answer1.setAnswer("answer1");
+ answer1.setIdQuestion("2");
+ answer1.setResult(Result.NEXT_QUESTION);
+ Answer answer2 = new Answer();
+ answer2.setId("102");
+ answer2.setAnswer("answer2");
+ answer2.setResult(Result.WIN);
+ answer2.setResultText("answer by win");
+ List answers = new ArrayList<>();
+ answers.add(answer1);
+ answers.add(answer2);
+ assertEquals(answers, service.getAnswers());
+ }
+
+ @Test
+ public void illegalQuantityEntriesInArrayTest() {
+ String[] record1 = {"1", "question1"};
+ String[] record2 = {"1", "question1", "3"};
+ List records = Arrays.asList(record1, record2);
+ Repository repository1 = new Repository(records);
+ assertThrows(IllegalArgumentException.class, () -> new RepositoryService(repository1));
+ }
+
+ @Test
+ public void illegalArgumentQuantityAnswersInQuestionTest() {
+ String[] record1 = {"1", "question1", "2"};
+ String[] record2 = {"2", "question2", "a"};
+ List records = Arrays.asList(record1, record2);
+ Repository repository1 = new Repository(records);
+ assertThrows(NumberFormatException.class, () -> new RepositoryService(repository1));
+ }
+
+}
Пролог
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/indexRestart.jsp b/src/main/webapp/indexRestart.jsp
new file mode 100644
index 0000000..15038d3
--- /dev/null
+++ b/src/main/webapp/indexRestart.jsp
@@ -0,0 +1,108 @@
+<%@ page import="services.RepositoryService" %>
+<%@ page import="repository.Repository" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+ + <% + RepositoryService r = new RepositoryService(Repository.getRepository()); + String intro = r.getIntro(); + %> + <%=intro%> +
+ ++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lose.jsp b/src/main/webapp/lose.jsp
new file mode 100644
index 0000000..981c940
--- /dev/null
+++ b/src/main/webapp/lose.jsp
@@ -0,0 +1,73 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+ Пролог
+
+
+ + <% + RepositoryService r = new RepositoryService(Repository.getRepository()); + String intro = r.getIntro(); + %> + <%=intro%> +
++
+
+
+
+
+
+ + Игрок: ${name} +
++
+
+
+
+
+
+
+
+
--%> +
+
+
+
+
diff --git a/src/main/webapp/qa.jsp b/src/main/webapp/qa.jsp
new file mode 100644
index 0000000..e0e3687
--- /dev/null
+++ b/src/main/webapp/qa.jsp
@@ -0,0 +1,99 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+ Поражение!
+
+
+<%-- + ${textLose} +
+--%> +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/stop.jsp b/src/main/webapp/stop.jsp
new file mode 100644
index 0000000..795c247
--- /dev/null
+++ b/src/main/webapp/stop.jsp
@@ -0,0 +1,85 @@
+<%@ page import="services.RepositoryService" %>
+<%@ page import="repository.Repository" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + ${question} +
+
+
+
+
+
+
+
+ +
+ +
+
+ Статистика:
+
+
+ Имя в игре: ${name}
+
+ Количество сыгранных игр: ${count}
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/usersing.jsp b/src/main/webapp/usersing.jsp
new file mode 100644
index 0000000..04a2a00
--- /dev/null
+++ b/src/main/webapp/usersing.jsp
@@ -0,0 +1,102 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
+
+
+
+
+
+
+
+ Все закончилось хорошо!
+
+
+ +<% + RepositoryService r = new RepositoryService(Repository.getRepository()); + String introStop = r.getIntroStop(); + %> + <%=introStop%> +
++
+
+
+
+
+
+
+ + Игрок: ${name} +
+ ++
+
+
--%> +
+
+
+
+
\ No newline at end of file
diff --git a/src/test/java/AnswerTest.java b/src/test/java/AnswerTest.java
new file mode 100644
index 0000000..d522259
--- /dev/null
+++ b/src/test/java/AnswerTest.java
@@ -0,0 +1,74 @@
+import entity.Answer;
+import entity.Question;
+import entity.Result;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import repository.Repository;
+import services.RepositoryService;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AnswerTest {
+ Repository repository;
+ RepositoryService service;
+
+ @BeforeEach
+ public void init() {
+ String[] question1 = {"1", "question1", "2"};
+ String[] question2 = {"2", "question2", "2"};
+ String[] answer1 = {"101", "answer1", "2"};
+ String[] answer2 = {"102", "answer2", "win", "answer by win"};
+ String[] answer3 = {"201", "answer1", "lose", "answer by lose"};
+ ListПобеда!
+
+
+<%-- + ${textWin} +
+--%> +
+
+
+
+
+
+
+