-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/game.jsp b/src/main/webapp/WEB-INF/game.jsp
new file mode 100644
index 0000000..a1187e2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/game.jsp
@@ -0,0 +1,139 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/index.jsp b/src/main/webapp/WEB-INF/index.jsp
deleted file mode 100644
index f273a96..0000000
--- a/src/main/webapp/WEB-INF/index.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 📜 Квест: ${sessionScope.questId} +
+ +
+ 🧙 ${sessionScope.currentPlayerLogin}, твой выбор определит судьбу…
+
+
+
+ 🎮 Игр: ${player.gamesPlayed}
+ | 🏆 Побед: ${player.wins}
+ | 💀 Поражений: ${player.losses}
+
+
+ + ${scene.text} +
+ +
+
+
+
+ + ${win ? '🏆 Победа!' : '☠ Поражение'} +
++ ${win ? 'Приключение завершено.' : 'Судьба была сурова.'} +
+<%= "Hello Page!" %> -
--User list -
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/list-user.jsp b/src/main/webapp/WEB-INF/list-user.jsp
deleted file mode 100644
index ea59fcc..0000000
--- a/src/main/webapp/WEB-INF/list-user.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-
-
- User list
- --
+
+
+
+
+
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/webapp/images/img.png b/src/main/webapp/images/img.png
deleted file mode 100644
index 1000db3..0000000
Binary files a/src/main/webapp/images/img.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..0d27b8d
--- /dev/null
+++ b/src/main/webapp/index.jsp
@@ -0,0 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%
+ response.sendRedirect(request.getContextPath() + "/login");
+%>
\ No newline at end of file
diff --git a/src/test/java/com/javarush/khmelov/lesson13/model/PlayerTest.java b/src/test/java/com/javarush/khmelov/lesson13/model/PlayerTest.java
new file mode 100644
index 0000000..b8ac766
--- /dev/null
+++ b/src/test/java/com/javarush/khmelov/lesson13/model/PlayerTest.java
@@ -0,0 +1,19 @@
+package com.javarush.khmelov.lesson13.model;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class PlayerTest {
+
+ @Test
+ void winIncrementsStats() {
+ Player p = new Player("test", "hash");
+
+ p.recordWin();
+
+ assertEquals(1, p.getGamesPlayed());
+ assertEquals(1, p.getWins());
+ assertEquals(0, p.getLosses());
+ }
+}
diff --git a/src/test/java/com/javarush/khmelov/lesson13/service/GameEngineTest.java b/src/test/java/com/javarush/khmelov/lesson13/service/GameEngineTest.java
new file mode 100644
index 0000000..25a0ac7
--- /dev/null
+++ b/src/test/java/com/javarush/khmelov/lesson13/service/GameEngineTest.java
@@ -0,0 +1,55 @@
+package com.javarush.khmelov.lesson13.service;
+
+import com.javarush.khmelov.lesson13.model.GameResult;
+import com.javarush.khmelov.lesson13.model.Scene;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class GameEngineTest {
+
+ private final GameEngine engine =
+ new GameEngine("quests/space.yaml");
+
+ @Test
+ void startSceneExists() {
+ Scene scene = engine.getScene(engine.getStartSceneId());
+
+ assertNotNull(scene);
+ assertEquals(engine.getStartSceneId(), scene.getId());
+ }
+
+ @Test
+ void winPathWorks() {
+ GameResult step1 =
+ engine.makeChoice(engine.getStartSceneId(), "yes");
+ assertFalse(step1.isGameOver());
+
+ GameResult step2 =
+ engine.makeChoice(step1.getNextSceneId(), "go");
+ assertFalse(step2.isGameOver());
+
+ GameResult step3 =
+ engine.makeChoice(step2.getNextSceneId(), "truth");
+ assertTrue(step3.isGameOver());
+ assertTrue(step3.isWin());
+ }
+
+ @Test
+ void losePathWorks() {
+ GameResult result =
+ engine.makeChoice(engine.getStartSceneId(), "no");
+
+ assertTrue(result.isGameOver());
+ assertFalse(result.isWin());
+ }
+
+ @Test
+ void wrongChoiceDoesNothing() {
+ GameResult result =
+ engine.makeChoice(engine.getStartSceneId(), "wrong");
+
+ assertFalse(result.isGameOver());
+ assertEquals(engine.getStartSceneId(), result.getNextSceneId());
+ }
+}
diff --git a/src/test/java/com/javarush/khmelov/lesson13/service/PlayerServiceTest.java b/src/test/java/com/javarush/khmelov/lesson13/service/PlayerServiceTest.java
new file mode 100644
index 0000000..0a7420d
--- /dev/null
+++ b/src/test/java/com/javarush/khmelov/lesson13/service/PlayerServiceTest.java
@@ -0,0 +1,61 @@
+package com.javarush.khmelov.lesson13.service;
+
+import com.javarush.khmelov.lesson13.model.Player;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.BeforeEach;
+
+class PlayerServiceTest {
+
+ private PlayerService service;
+
+ @BeforeEach
+ void setUp() {
+ service = PlayerService.getInstance();
+ service.clear();
+ }
+
+ @Test
+ void registerCreatesNewPlayer() {
+ Player p = service.register("hero", "123");
+ assertEquals("hero", p.getLogin());
+ }
+
+ @Test
+ void registerWithExistingLoginThrows() {
+ service.register("hero", "123");
+
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> service.register("hero", "456")
+ );
+ }
+
+ @Test
+ void loginWithCorrectPasswordWorks() {
+ service.register("hero", "123");
+
+ Player p = service.login("hero", "123");
+ assertEquals("hero", p.getLogin());
+ }
+
+ @Test
+ void loginWithWrongPasswordThrows() {
+ service.register("hero", "123");
+
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> service.login("hero", "wrong")
+ );
+ }
+
+ @Test
+ void loginOfMissingPlayerThrows() {
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> service.login("ghost", "123")
+ );
+ }
+}
diff --git a/src/test/java/com/javarush/khmelov/lesson13/service/QuestLoaderTest.java b/src/test/java/com/javarush/khmelov/lesson13/service/QuestLoaderTest.java
new file mode 100644
index 0000000..47abfaf
--- /dev/null
+++ b/src/test/java/com/javarush/khmelov/lesson13/service/QuestLoaderTest.java
@@ -0,0 +1,17 @@
+package com.javarush.khmelov.lesson13.service;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class QuestLoaderTest {
+
+ @Test
+ void questLoadsCorrectly() {
+ LoadedQuest quest = QuestLoader.load("quests/dungeon.yaml");
+
+ assertNotNull(quest);
+ assertNotNull(quest.getStartScene());
+ assertFalse(quest.getScenes().isEmpty());
+ }
+}
diff --git a/src/test/java/com/javarush/khmelov/lesson13/service/QuestRegistryTest.java b/src/test/java/com/javarush/khmelov/lesson13/service/QuestRegistryTest.java
new file mode 100644
index 0000000..108b944
--- /dev/null
+++ b/src/test/java/com/javarush/khmelov/lesson13/service/QuestRegistryTest.java
@@ -0,0 +1,27 @@
+package com.javarush.khmelov.lesson13.service;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class QuestRegistryTest {
+
+ @Test
+ void questsAreLoaded() {
+ Set
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 🧙 Выбор героя +
+ + +
+ ${error}
+
+ Существующий герой
+ + + ++