Skip to content

Commit 43d6c32

Browse files
javier-godoymlopezFC
authored andcommitted
test: return CodeViewer text from open
1 parent b008800 commit 43d6c32

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

src/test/java/com/flowingcode/vaadin/addons/demo/it/AbstractSourceCodeViewerIT.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private String getResourceName() {
4141
return method.replaceFirst("^test", "");
4242
}
4343

44-
protected void open(String... args) {
44+
protected String open(String... args) {
4545
String resource = getResourceName();
4646

4747
if (viewer != null) {
@@ -52,6 +52,7 @@ protected void open(String... args) {
5252
String params = Stream.of(args).map(Object::toString).collect(Collectors.joining(";"));
5353
getDriver().get(getURL(String.format("it/view/%s?src/test/resources/%s.java", params, path)));
5454
viewer = $(SourceCodeViewerElement.class).waitForFirst();
55+
return viewer.getText();
5556
}
5657

5758
private String getExpectedText(String resource) {
@@ -71,8 +72,4 @@ protected final String expected() {
7172
return getExpectedText(getResourceName());
7273
}
7374

74-
protected String getText() {
75-
return viewer.getText();
76-
}
77-
7875
}

src/test/java/com/flowingcode/vaadin/addons/demo/it/SourceCodeViewerIT.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,32 @@ public class SourceCodeViewerIT extends AbstractSourceCodeViewerIT {
2626

2727
@Test
2828
public void testSimpleSource() {
29-
open();
30-
assertEquals(expected(), getText());
29+
assertEquals(expected(), open());
3130
}
3231

3332
@Test
3433
public void testHideSource() {
35-
open();
36-
assertEquals(expected(), getText());
34+
assertEquals(expected(), open());
3735
}
3836

3937
@Test
4038
public void testShowSource() {
41-
open();
42-
assertEquals(expected(), getText());
39+
assertEquals(expected(), open());
4340
}
4441

4542
@Test
4643
public void testPackageCleanup() {
47-
open();
48-
assertEquals(expected(), getText());
44+
assertEquals(expected(), open());
4945
}
5046

5147
@Test
5248
public void testAnnotationCleanup() {
53-
open();
54-
assertEquals(expected(), getText());
49+
assertEquals(expected(), open());
5550
}
5651

5752
@Test
5853
public void testLicenseCleanup() {
59-
open();
60-
assertEquals(expected(), getText());
54+
assertEquals(expected(), open());
6155
}
6256

6357
}

0 commit comments

Comments
 (0)