Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit c5a171b

Browse files
committed
Renamed getBrowser() method to browser() since all other similar methods are declared without the "get" prefix as well
1 parent 141b484 commit c5a171b

File tree

14 files changed

+16
-16
lines changed

14 files changed

+16
-16
lines changed

webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/AdHocFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public AdHocFinder(Browser browser) {
6161
* @since 2.0
6262
*/
6363
public AdHocFinder(PageFragment parent) {
64-
this.factory = new PageFragmentFactory(parent.getBrowser());
64+
this.factory = new PageFragmentFactory(parent.browser());
6565
this.searchContext = parent.webElement();
6666
}
6767

webtester-core/src/main/java/info/novatec/testit/webtester/css/DefaultStyleChanger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public boolean changeStyleInformation(PageFragment pageFragment, Map<String, Str
2424

2525
private boolean changeStyleWithScript(PageFragment fragment, String script) {
2626
try {
27-
fragment.getBrowser().javaScript().execute(script, fragment);
27+
fragment.browser().javaScript().execute(script, fragment);
2828
return true;
2929
} catch (WebDriverException e) {
3030
log.warn("Exception while changing the style information of an page object: {}", e.getMessage());

webtester-core/src/main/java/info/novatec/testit/webtester/internal/ActionTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static class PageFragmentAction<T extends PageFragment> extends Action<T,
104104
private Marker marker;
105105

106106
public PageFragmentAction(T subject) {
107-
super(subject, subject.getBrowser());
107+
super(subject, subject.browser());
108108
marker = new Marker(new DefaultStyleChanger());
109109
}
110110

@@ -133,7 +133,7 @@ public static class PageFragmentsAction<T extends PageFragment> extends BiAction
133133
private Marker marker;
134134

135135
public PageFragmentsAction(T subject1, T subject2) {
136-
super(subject1, subject2, subject1.getBrowser());
136+
super(subject1, subject2, subject1.browser());
137137
marker = new Marker(new DefaultStyleChanger());
138138
}
139139

webtester-core/src/main/java/info/novatec/testit/webtester/internal/OffersBrowserGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public interface OffersBrowserGetter {
1414
* @since 2.0
1515
*/
1616
@ReturnsBrowser
17-
Browser getBrowser();
17+
Browser browser();
1818

1919
}

webtester-core/src/main/java/info/novatec/testit/webtester/markings/Marker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Marker(StyleChanger styleChanger) {
3939
* @since 2.0
4040
*/
4141
public void markAsRead(PageFragment fragment) {
42-
Configuration configuration = fragment.getBrowser().configuration();
42+
Configuration configuration = fragment.browser().configuration();
4343
if (configuration.isMarkingsEnabled()) {
4444
Color backgroundColor = configuration.getMarkingsColorReadBackground();
4545
Color outlineColor = configuration.getMarkingsColorReadOutline();
@@ -58,7 +58,7 @@ public void markAsRead(PageFragment fragment) {
5858
* @since 2.0
5959
*/
6060
public void markAsUsed(PageFragment pageFragment) {
61-
Configuration configuration = pageFragment.getBrowser().configuration();
61+
Configuration configuration = pageFragment.browser().configuration();
6262
if (configuration.isMarkingsEnabled()) {
6363
Color backgroundColor = configuration.getMarkingsColorUsedBackground();
6464
Color outlineColor = configuration.getMarkingsColorUsedOutline();

webtester-core/src/main/java/info/novatec/testit/webtester/mouse/DefaultMouseDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void perform(PageFragment fragment, BiFunction<Actions, WebElement, Acti
7373
}
7474

7575
private Actions sequenceFor(PageFragment fragment) {
76-
return new Actions(fragment.getBrowser().webDriver());
76+
return new Actions(fragment.browser().webDriver());
7777
}
7878

7979
}

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/GenericElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ default GenericElement clear() {
9292
* @since 2.0
9393
*/
9494
default <T extends PageFragment> T as(Class<T> fragmentClass) {
95-
return new PageFragmentFactory(getBrowser()).pageFragment(fragmentClass, webElement());
95+
return new PageFragmentFactory(browser()).pageFragment(fragmentClass, webElement());
9696
}
9797

9898
}

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/PageFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ default Optional<String> getAttribute(String attributeName) {
153153
default void setAttribute(String attributeName, String value) {
154154
String escapedValue = StringUtils.replace(value, "\"", "\\\"");
155155
String script = "arguments[0]." + attributeName + " = \"" + escapedValue + "\"";
156-
getBrowser().javaScript().execute(script, this, value);
156+
browser().javaScript().execute(script, this, value);
157157
}
158158

159159
/**

webtester-core/src/main/java/info/novatec/testit/webtester/pages/Page.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface Page extends OffersBrowserGetter, OffersPageCreation, OffersAdH
7171

7272
@Override
7373
default AdHocFinder finder() {
74-
return new AdHocFinder(getBrowser());
74+
return new AdHocFinder(browser());
7575
}
7676

7777
}

webtester-core/src/main/java/info/novatec/testit/webtester/waiting/WaitConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public long getTimeoutInMillis() {
6161
* @since 2.0
6262
*/
6363
static WaitConfig from(PageFragment fragment) {
64-
return from(fragment.getBrowser());
64+
return from(fragment.browser());
6565
}
6666

6767
/**

webtester-core/src/test/java/info/novatec/testit/webtester/css/DefaultStyleChangerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DefaultStyleChangerTest {
3838

3939
@Before
4040
public void init() {
41-
doReturn(browser).when(fragment).getBrowser();
41+
doReturn(browser).when(fragment).browser();
4242
doReturn(javaScript).when(browser).javaScript();
4343
}
4444

webtester-core/src/test/java/info/novatec/testit/webtester/markings/MarkerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static abstract class AbstractMarkerTest {
4747

4848
@Before
4949
public void configuration() {
50-
when(fragment.getBrowser().configuration()).thenReturn(configuration);
50+
when(fragment.browser().configuration()).thenReturn(configuration);
5151
}
5252

5353
}

webtester-core/src/test/java/info/novatec/testit/webtester/waiting/WaitConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void canBeCreatedFromBrowser() {
114114
@Test
115115
public void canBeCreatedFromPageFragment() {
116116

117-
doReturn(browser).when(pageFragment).getBrowser();
117+
doReturn(browser).when(pageFragment).browser();
118118
doReturn(configuration).when(browser).configuration();
119119
doReturn(3).when(configuration).getWaitTimeout();
120120
doReturn(30L).when(configuration).getWaitInterval();

webtester-core/src/test/java/info/novatec/testit/webtester/waiting/WaitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static class Until_PageFragment extends AbstractWaitTest {
118118
@Before
119119
public void setUpFragment() {
120120
doReturn(configuration).when(browser).configuration();
121-
doReturn(browser).when(fragment).getBrowser();
121+
doReturn(browser).when(fragment).browser();
122122
doReturn(1).when(configuration).getWaitTimeout();
123123
doReturn(50L).when(configuration).getWaitInterval();
124124
}

0 commit comments

Comments
 (0)