Изменен порядок параметров метода enterScene в RegFinishHandler для улучшения читаемости кода; обновлены тесты в RegistrationSceneTest для проверки исключений

Author: AlexanderBazarov

src/main/java/ru/untitled_devs/bot/features/registration/handlers/RegFinishHandler.java

@@ -3,8 +3,8 @@
 import org.telegram.telegrambots.meta.api.objects.Message;
 import ru.untitled_devs.bot.features.registration.RegistrationService;
 import ru.untitled_devs.bot.features.registration.RegistrationStates;
-import ru.untitled_devs.bot.shared.localisation.ButtonKey;
 import ru.untitled_devs.bot.shared.localisation.BtnLocService;
+import ru.untitled_devs.bot.shared.localisation.ButtonKey;
 import ru.untitled_devs.bot.shared.localisation.MessageKey;
 import ru.untitled_devs.bot.shared.localisation.MsgLocService;
 import ru.untitled_devs.bot.shared.models.Profile;
@@ -59,7 +59,7 @@ void action(Message message, FSMContext ctx) {
 
 			regService.registerUser(userData, profileData);
 			bot.sendMessage(chatId, MsgLocService.getLocal(MessageKey.SUCCESSFUL_REGISTRATION, loc));
-			sceneManager.enterScene("menu", chatId, ctx);
+			sceneManager.enterScene(chatId, "menu", ctx);
 			return;
 		}
 

src/test/java/ru/untitled_devs/bot/features/registration/RegistrationSceneTest.java

@@ -15,6 +15,7 @@
 import ru.untitled_devs.bot.shared.models.Profile;
 import ru.untitled_devs.core.client.PollingClient;
 import ru.untitled_devs.core.context.UpdateContext;
+import ru.untitled_devs.core.exceptions.StopRoutingException;
 import ru.untitled_devs.core.fsm.DataKey;
 import ru.untitled_devs.core.fsm.FSMContext;
 import ru.untitled_devs.core.routers.scenes.SceneManager;
@@ -85,7 +86,8 @@ void getNameGotValidName() {
 		DataKey<Profile> key = DataKey.of("RegistrationData", Profile.class);
 		when(ctx.getData(key)).thenReturn(profile);
 
-		assertDoesNotThrow(() -> router.routeUpdate(updateContext, ctx));
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 		assertEquals("Саня", profile.getName());
 	}
 
@@ -105,7 +107,8 @@ void getNameGotInvalidName() {
 		DataKey<Profile> key = DataKey.of("RegistrationData", Profile.class);
 		when(ctx.getData(key)).thenReturn(profile);
 
-		assertDoesNotThrow(() -> router.routeUpdate(updateContext, ctx));
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 		assertNull(profile.getName());
 	}
 
@@ -125,7 +128,8 @@ void getAgeGotDigitString() {
 		DataKey<Profile> key = DataKey.of("RegistrationData", Profile.class);
 		when(ctx.getData(key)).thenReturn(profile);
 
-		assertDoesNotThrow(() -> router.routeUpdate(updateContext, ctx),
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx),
 			"Get age must do not throw any exceptions when got valid age type");
 
 		assertEquals(15, profile.getAge(), "Age must be changed");
@@ -196,7 +200,8 @@ void getGenderGotValidGender() {
 		DataKey<Profile> key = DataKey.of("RegistrationData", Profile.class);
 		when(ctx.getData(key)).thenReturn(profile);
 
-		assertDoesNotThrow(() -> router.routeUpdate(updateContext, ctx));
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 		assertEquals(Gender.FEMALE, profile.getGender());
 	}
 
@@ -236,9 +241,8 @@ void getLocationGotValidLocation() {
 
 		when(ctx.getState()).thenReturn(RegistrationStates.LOCATION);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 
 		assertEquals("Екатеринбург", profile.getLocation());
 		assertEquals(Arrays.asList(123.0, 123.0), profile.getCoordinates().getCoordinates().getValues());
@@ -285,9 +289,8 @@ void getLocationGotValidCoordinates() {
 
 		when(ctx.getState()).thenReturn(RegistrationStates.LOCATION);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 
 		assertEquals("Екатеринбург", profile.getLocation());
 		assertEquals(Arrays.asList(123.0, 123.0), profile.getCoordinates().getCoordinates().getValues());
@@ -311,9 +314,8 @@ void getLocationGotInvalidCoordinates() {
 
 		when(ctx.getState()).thenReturn(RegistrationStates.LOCATION);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 
 		assertNull(profile.getLocation());
 		assertNull(profile.getCoordinates());
@@ -336,9 +338,8 @@ void getDescriptionGotValidText() {
 		when(update.getMessage()).thenReturn(message);
 		when(ctx.getState()).thenReturn(RegistrationStates.DESCRIPTION);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 
 		assertEquals("Test description", profile.getDescription());
 	}
@@ -384,9 +385,8 @@ void getDescriptionGotSkipText() {
 
 		when(ctx.getState()).thenReturn(RegistrationStates.DESCRIPTION);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 
 		assertEquals("No description.", profile.getDescription());
 	}
@@ -424,9 +424,8 @@ void getPhotoGotValidPhoto() throws TelegramApiException, IOException {
 
 		when(ctx.getState()).thenReturn(RegistrationStates.PHOTO);
 
-		assertDoesNotThrow(
-			() -> router.routeUpdate(updateContext, ctx)
-		);
+		assertThrows(StopRoutingException.class,
+			() -> router.routeUpdate(updateContext, ctx));
 	}
 
 	@Test