/series/1: add an image.

Because liquibase is executing during the app startup it doesn't distinguish between test and main
resources and need to have an image in the class path. Because of this I had to move test.png file
from test resources to main resources (and hence application classpath).

Fix #588

Author: php-coder

pom.xml

@@ -926,7 +926,8 @@
 					-->
 					<variables>
 						<variable>BROWSER:htmlunitwithjs</variable>
-						<variable>RESOURCE_DIR:${basedir}/src/test/resources</variable>
+						<variable>MAIN_RESOURCE_DIR:${basedir}/src/main/resources/test</variable>
+						<variable>TEST_RESOURCE_DIR:${basedir}/src/test/resources</variable>
 						<!-- See also ru.mystamps.web.Url.SITE constant -->
 						<variable>SITE_URL:http://127.0.0.1:8080</variable>
 					</variables>

src/main/resources/liquibase/version/0.4.xml

@@ -27,5 +27,6 @@
 	<include file="0.4/2017-01-25--united_kingdom_country.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-01-29--add_updater_data_to_collections.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-05-11--image_preview.xml" relativeToChangelogFile="true" />
+	<include file="0.4/2017-05-29--test_image.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2017-05-29--test_image.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+		xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+	
+	<changeSet id="add-test-image" author="php-coder" context="test-data">
+		
+		<insert tableName="images_data">
+			<column name="image_id" value="1" />
+			<column name="content" valueBlobFile="/test/test.png" />
+		</insert>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/test/resources/test.png renamed to src/main/resources/test/test.png

@@ -106,10 +106,10 @@
 						<div class="col-sm-4">
 							<div class="row" th:each="imageId,iter : ${series.imageIds}">
 								<div class="col-sm-12">
-									<a target="_blank" href="../../../../../test/resources/test.png" th:href="@{${GET_IMAGE_PAGE}(id=${imageId})}">
+									<a target="_blank" href="../../../../resources/test/test.png" th:href="@{${GET_IMAGE_PAGE}(id=${imageId})}">
 										<img class="img-responsive series-images"
 											id="series-image-1"
-											src="../../../../../test/resources/test.png"
+											src="../../../../resources/test/test.png"
 											th:id="|series-image-${iter.count}|"
 											th:src="@{${GET_IMAGE_PREVIEW_PAGE}(id=${imageId})}" />
 									</a>

src/main/webapp/WEB-INF/views/series/info.html

@@ -41,7 +41,7 @@
  */
 public class WhenAdminAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPage> {
 
-	private static final String SAMPLE_IMAGE_NAME = "test.png";
+	private static final String SAMPLE_IMAGE_NAME = "test/test.png";
 	private static final String SAMPLE_IMAGE_PATH;
 
 	static {

src/test/java/ru/mystamps/web/tests/cases/WhenAdminAddSeries.java

@@ -52,7 +52,7 @@ public class WhenUserAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPag
 	private static final List<String> EXPECTED_YEARS =
 		new ArrayList<>(CURRENT_YEAR - SINCE_YEAR + 1);
 
-	private static final String SAMPLE_IMAGE_NAME = "test.png";
+	private static final String SAMPLE_IMAGE_NAME = "test/test.png";
 	private static final String EMPTY_IMAGE_NAME  = "empty.jpg";
 	private static final String SAMPLE_IMAGE_PATH;
 	private static final String EMPTY_IMAGE_PATH;

src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

@@ -11,7 +11,7 @@ Create series by filling only required fields
 	[Documentation]            Verify creation of series by filling only mandatory fields
 	Select From List By Label  id=category  Sport
 	Input Text                 id=quantity  2
-	Choose File                id=image  ${RESOURCE_DIR}${/}test.png
+	Choose File                id=image  ${MAIN_RESOURCE_DIR}${/}test.png
 	Submit Form                id=add-series-form
 	${location}=               Get Location
 	Should Match Regexp        ${location}  /series/\\d+
@@ -27,7 +27,7 @@ Create series by filling all fields
 	Select Country             Italy
 	Input Text                 id=quantity  3
 	Unselect Checkbox          id=perforated
-	Choose File                id=image  ${RESOURCE_DIR}${/}test.png
+	Choose File                id=image  ${MAIN_RESOURCE_DIR}${/}test.png
 	Click Element              id=specify-issue-date-link
 	Select From List By Value  id=day  4
 	Select From List By Value  id=month  5

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

@@ -26,7 +26,7 @@ Create series with quantity that is greater than 50
 
 Create series with empty image
 	[Documentation]         Verify validation of empty image
-	Choose File             id=image  ${RESOURCE_DIR}${/}empty.png
+	Choose File             id=image  ${TEST_RESOURCE_DIR}${/}empty.png
 	Submit Form             id=add-series-form
 	Element Text Should Be  id=image.errors  File must not be empty