Skip to content

Commit e637a9e

Browse files
committed
series/{id}: renamed elements identifiers.
No functional changes.
1 parent 744a648 commit e637a9e

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/main/webapp/WEB-INF/tiles/body/series/info.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<td>
6060
<spring:message code="t_michel_no" />
6161
</td>
62-
<td id="michel_numbers">
62+
<td id="michel_catalog_info">
6363
<c:out value="${michelNumbers}" />
6464
</td>
6565
</tr>
@@ -69,7 +69,7 @@
6969
<td>
7070
<spring:message code="t_scott_no" />
7171
</td>
72-
<td id="scott_numbers">
72+
<td id="scott_catalog_info">
7373
<c:out value="${scottNumbers}" />
7474
</td>
7575
</tr>
@@ -79,7 +79,7 @@
7979
<td>
8080
<spring:message code="t_yvert_no" />
8181
</td>
82-
<td id="yvert_numbers">
82+
<td id="yvert_catalog_info">
8383
<c:out value="${yvertNumbers}" />
8484
</td>
8585
</tr>
@@ -89,7 +89,7 @@
8989
<td>
9090
<spring:message code="t_sg_no" />
9191
</td>
92-
<td id="gibbons_numbers">
92+
<td id="gibbons_catalog_info">
9393
<c:out value="${gibbonsNumbers}" />
9494
</td>
9595
</tr>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
332332
assertThat(nextPage.getYear()).isEqualTo(expectedYear);
333333
assertThat(nextPage.getQuantity()).isEqualTo(expectedQuantity);
334334
assertThat(nextPage.getPerforated()).isEqualTo(tr("t_no"));
335-
assertThat(nextPage.getMichelNumbers()).isEqualTo("1-3");
336-
assertThat(nextPage.getScottNumbers()).isEqualTo("10-12");
337-
assertThat(nextPage.getYvertNumbers()).isEqualTo("20-22");
338-
assertThat(nextPage.getGibbonsNumbers()).isEqualTo("30-32");
335+
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("1-3");
336+
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("10-12");
337+
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("20-22");
338+
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("30-32");
339339
assertThat(nextPage.getComment()).isEqualTo(expectedComment);
340340
}
341341

@@ -349,7 +349,7 @@ public void shouldIgnoreDuplicatedMichelNumbers() {
349349
assertThat(next).isInstanceOf(InfoSeriesPage.class);
350350

351351
InfoSeriesPage nextPage = (InfoSeriesPage)next;
352-
assertThat(nextPage.getMichelNumbers()).isEqualTo("4, 5");
352+
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("4, 5");
353353
}
354354

355355
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -362,7 +362,7 @@ public void shouldIgnoreDuplicatedScottNumbers() {
362362
assertThat(next).isInstanceOf(InfoSeriesPage.class);
363363

364364
InfoSeriesPage nextPage = (InfoSeriesPage)next;
365-
assertThat(nextPage.getScottNumbers()).isEqualTo("14, 15");
365+
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("14, 15");
366366
}
367367

368368
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -375,7 +375,7 @@ public void shouldIgnoreDuplicatedYvertNumbers() {
375375
assertThat(next).isInstanceOf(InfoSeriesPage.class);
376376

377377
InfoSeriesPage nextPage = (InfoSeriesPage)next;
378-
assertThat(nextPage.getYvertNumbers()).isEqualTo("24, 25");
378+
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("24, 25");
379379
}
380380

381381
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -388,7 +388,7 @@ public void shouldIgnoreDuplicatedGibbonsNumbers() {
388388
assertThat(next).isInstanceOf(InfoSeriesPage.class);
389389

390390
InfoSeriesPage nextPage = (InfoSeriesPage)next;
391-
assertThat(nextPage.getGibbonsNumbers()).isEqualTo("34, 35");
391+
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("34, 35");
392392
}
393393

394394
@DataProvider(name = "validCatalogNumbers")

src/test/java/ru/mystamps/web/tests/page/InfoSeriesPage.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ public String getPerforated() {
4747
return getTextOfElementById("perforated");
4848
}
4949

50-
public String getMichelNumbers() {
51-
return getTextOfElementById("michel_numbers");
50+
public String getMichelCatalogInfo() {
51+
return getTextOfElementById("michel_catalog_info");
5252
}
5353

54-
public String getScottNumbers() {
55-
return getTextOfElementById("scott_numbers");
54+
public String getScottCatalogInfo() {
55+
return getTextOfElementById("scott_catalog_info");
5656
}
5757

58-
public String getYvertNumbers() {
59-
return getTextOfElementById("yvert_numbers");
58+
public String getYvertCatalogInfo() {
59+
return getTextOfElementById("yvert_catalog_info");
6060
}
6161

62-
public String getGibbonsNumbers() {
63-
return getTextOfElementById("gibbons_numbers");
62+
public String getGibbonsCatalogInfo() {
63+
return getTextOfElementById("gibbons_catalog_info");
6464
}
6565

6666
public String getComment() {

0 commit comments

Comments
 (0)