rm COULD_NOT_CONNECT

Author: php-coder

src/main/java/ru/mystamps/web/service/HttpURLConnectionDownloaderService.java

@@ -69,7 +69,7 @@ public DownloadResult download(String fileUrl) {
 
 			Code connectionResult = connect(conn);
 			if (connectionResult != Code.SUCCESS) {
-				return connectionResult;
+				return DownloadResult.failed(connectionResult);
 			}
 
 			try (InputStream stream = new BufferedInputStream(conn.getInputStream())) {
@@ -153,7 +153,7 @@ private static Code connect(HttpURLConnection conn) {
 				"Couldn't download file: connect has failed with error '{}'",
 				ex.getMessage()
 			);
-			return Code.COULD_NOT_CONNECT;
+			return Code.UNEXPECTED_ERROR;
 		}
 	}
 

src/main/java/ru/mystamps/web/service/dto/DownloadResult.java

@@ -47,7 +47,6 @@ public enum Code {
 		SUCCESS,
 		INVALID_URL,
 		INVALID_PROTOCOL,
-		COULD_NOT_CONNECT,
 		INVALID_REDIRECT,
 		INVALID_FILE_TYPE,
 		INVALID_FILE_SIZE,

src/main/resources/ru/mystamps/i18n/ValidationMessages.properties

@@ -27,7 +27,6 @@ ru.mystamps.web.validation.jsr303.RequireImageOrImageUrl.message = Image or imag
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Invalid URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_PROTOCOL = Invalid protocol in the URL
-ru.mystamps.web.service.dto.DownloadResult.COULD_NOT_CONNECT = Could not connect to the server
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL must not redirect to another address
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_TYPE = Invalid file type
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_SIZE = Invalid file size

src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties

@@ -27,7 +27,6 @@ ru.mystamps.web.validation.jsr303.RequireImageOrImageUrl.message = Необхо
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Неправильный URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_PROTOCOL = Недопустимый протокол в URL
-ru.mystamps.web.service.dto.DownloadResult.COULD_NOT_CONNECT = Не удалось подключиться к серверу
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL не должен перенаправлять на другой адрес
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_TYPE = Недопустимый тип файла
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_SIZE = Недопустимый размер файла

src/test/robotframework/series/creation/validation.robot

@@ -44,12 +44,6 @@ Create series with unsupported protocol in the image URL
 	Submit Form             id=add-series-form
 	Element Text Should Be  id=image-url.errors  Value must be a valid URL
 
-Create series with unavailable server in the image URL
-	[Documentation]         Verify validation of URL to an unavailable server
-	Input Text              id=image-url  http://127.0.0.1:9999/not-existing-host
-	Submit Form             id=add-series-form
-	Element Text Should Be  id=image-url.errors  Could not connect to the server
-
 Create series with image URL with invalid response
 	[Documentation]         Verify validation of invalid response from a server
 	Input Text              id=image-url  ${SITE_URL}/test/invalid/response-400