Skip to content

Commit 1142946

Browse files
authored
test: restore accordion ITs (#7429)
1 parent 2c76563 commit 1142946

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

  • vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/src/test/java/com/vaadin/flow/component/accordion/tests
  • vaadin-details-flow-parent/vaadin-details-testbench/src/main/java/com/vaadin/flow/component/details/testbench

vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/src/test/java/com/vaadin/flow/component/accordion/tests/BasicIT.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public class BasicIT extends AbstractComponentIT {
3535
@Before
3636
public void init() {
3737
open();
38+
// Close the initially opened panel, otherwise the panel can fire a
39+
// close event after opening a different panel, breaking some assertions
40+
$(AccordionElement.class).first().$(AccordionPanelElement.class).first()
41+
.click();
3842
}
3943

4044
@Test
@@ -43,20 +47,21 @@ public void accordionIsPresent() {
4347
}
4448

4549
@Test
46-
public void progammaticOpenByIndex() {
50+
public void programmaticOpenByIndex() {
4751
getTestButton("1").click();
48-
Assert.assertEquals(1,
49-
$(AccordionElement.class).first().getOpenedIndex().getAsInt());
52+
Assert.assertEquals(1, $(AccordionElement.class).first()
53+
.getOpenedIndex().orElseThrow());
5054
Assert.assertEquals("Green opened", getLastEvent(ACCORDION_EVENTS));
5155
Assert.assertEquals("Panel Green opened", getLastEvent(PANEL_EVENTS));
5256

5357
getTestButton("3").click();
54-
Assert.assertEquals(3,
55-
$(AccordionElement.class).first().getOpenedIndex().getAsInt());
58+
Assert.assertEquals(3, $(AccordionElement.class).first()
59+
.getOpenedIndex().orElseThrow());
5660
Assert.assertEquals("Blue opened", getLastEvent(ACCORDION_EVENTS));
5761
Assert.assertEquals("Panel Blue opened", getLastEvent(PANEL_EVENTS));
5862
}
5963

64+
@Test
6065
public void programmaticOpenByPanel() {
6166
getTestButton("green").click();
6267

@@ -74,18 +79,21 @@ public void programmaticOpenByPanel() {
7479
Assert.assertEquals("Panel Blue opened", getLastEvent(PANEL_EVENTS));
7580
}
7681

82+
@Test
7783
public void programmaticClose() {
7884
getTestButton("1").click();
7985
getTestButton("close").click();
8086
Assert.assertEquals("Accordion closed", getLastEvent(ACCORDION_EVENTS));
8187
}
8288

89+
@Test
8390
public void userOpen() {
8491
$(AccordionElement.class).first().$(AccordionPanelElement.class).last()
8592
.click();
8693
Assert.assertEquals("Panel Blue opened", getLastEvent(PANEL_EVENTS));
8794
}
8895

96+
@Test
8997
public void userClose() {
9098
$(AccordionElement.class).first().$(AccordionPanelElement.class).last()
9199
.click();
@@ -94,11 +102,13 @@ public void userClose() {
94102
Assert.assertEquals("Accordion closed", getLastEvent(ACCORDION_EVENTS));
95103
}
96104

105+
@Test
97106
public void panelSummaryText() {
98107
Assert.assertEquals("Blue", $(AccordionElement.class).first()
99108
.$(AccordionPanelElement.class).last().getSummaryText());
100109
}
101110

111+
@Test
102112
public void openPanel() {
103113
Assert.assertFalse($(AccordionElement.class).first()
104114
.$(AccordionPanelElement.class).last().isOpened());
@@ -108,6 +118,7 @@ public void openPanel() {
108118
.$(AccordionPanelElement.class).last().isOpened());
109119
}
110120

121+
@Test
111122
public void closePanel() {
112123
Assert.assertFalse($(AccordionElement.class).first()
113124
.$(AccordionPanelElement.class).last().isOpened());
@@ -127,6 +138,7 @@ public void closePanel() {
127138
.$(AccordionPanelElement.class).last().isOpened());
128139
}
129140

141+
@Test
130142
public void removePanel() {
131143
final int initialCount = $(AccordionElement.class).first()
132144
.$(AccordionPanelElement.class).all().size();

vaadin-details-flow-parent/vaadin-details-testbench/src/main/java/com/vaadin/flow/component/details/testbench/DetailsElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public TestBenchElement getContent() {
5050
* Whether the details are opened or not
5151
*/
5252
public boolean isOpened() {
53-
return getPropertyBoolean("opened");
53+
Boolean result = getPropertyBoolean("opened");
54+
return result != null && result;
5455
}
5556

5657
/**

0 commit comments

Comments
 (0)