📍Use lombok, reformat, and optimize the code (#1560)
* Use lombok, reformat, and optimize the code * Fix merge conflicts and some sonar issues Co-authored-by: va1m <va1m@email.com>
This commit is contained in:
@ -26,8 +26,7 @@ package com.iluwatar.pageobject;
|
||||
import java.awt.Desktop;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* Page Object pattern wraps an UI component with an application specific API allowing you to
|
||||
@ -49,10 +48,9 @@ import org.slf4j.LoggerFactory;
|
||||
* example is just to provide a simple version that showcase the intentions of this pattern and how
|
||||
* this pattern is used in order to understand it.
|
||||
*/
|
||||
@Slf4j
|
||||
public final class App {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
|
||||
|
||||
private App() {
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.WebClient;
|
||||
import com.iluwatar.pageobject.pages.AlbumListPage;
|
||||
import com.iluwatar.pageobject.pages.AlbumPage;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@ -44,7 +43,7 @@ public class AlbumListPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectAlbum() {
|
||||
void testSelectAlbum() {
|
||||
var albumPage = albumListPage.selectAlbum("21");
|
||||
albumPage.navigateToPage();
|
||||
assertTrue(albumPage.isAt());
|
||||
|
@ -26,7 +26,6 @@ package com.iluwatar.pageobject;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.WebClient;
|
||||
import com.iluwatar.pageobject.pages.AlbumListPage;
|
||||
import com.iluwatar.pageobject.pages.AlbumPage;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@ -44,7 +43,7 @@ public class AlbumPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSaveAlbum() {
|
||||
void testSaveAlbum() {
|
||||
|
||||
var albumPageAfterChanges = albumPage
|
||||
.changeAlbumTitle("25")
|
||||
@ -59,7 +58,7 @@ public class AlbumPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCancelChanges() {
|
||||
void testCancelChanges() {
|
||||
var albumListPage = albumPage.cancelChanges();
|
||||
albumListPage.navigateToPage();
|
||||
assertTrue(albumListPage.isAt());
|
||||
|
@ -26,7 +26,6 @@ package com.iluwatar.pageobject;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.WebClient;
|
||||
import com.iluwatar.pageobject.pages.AlbumListPage;
|
||||
import com.iluwatar.pageobject.pages.LoginPage;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@ -44,7 +43,7 @@ public class LoginPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLogin() {
|
||||
void testLogin() {
|
||||
var albumListPage = loginPage
|
||||
.enterUsername("admin")
|
||||
.enterPassword("password")
|
||||
|
@ -28,15 +28,13 @@ import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* Page Object encapsulating the Album List page (album-list.html)
|
||||
*/
|
||||
@Slf4j
|
||||
public class AlbumListPage extends Page {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(AlbumListPage.class);
|
||||
private static final String ALBUM_LIST_HTML_FILE = "album-list.html";
|
||||
private static final String PAGE_URL = "file:" + AUT_PATH + ALBUM_LIST_HTML_FILE;
|
||||
|
||||
|
@ -30,15 +30,13 @@ import com.gargoylesoftware.htmlunit.html.HtmlSelect;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
|
||||
import java.io.IOException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* Page Object encapsulating the Album Page (album-page.html)
|
||||
*/
|
||||
@Slf4j
|
||||
public class AlbumPage extends Page {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(AlbumPage.class);
|
||||
private static final String ALBUM_PAGE_HTML_FILE = "album-page.html";
|
||||
private static final String PAGE_URL = "file:" + AUT_PATH + ALBUM_PAGE_HTML_FILE;
|
||||
|
||||
|
@ -29,15 +29,13 @@ import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
|
||||
import java.io.IOException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* Page Object encapsulating the Login Page (login.html)
|
||||
*/
|
||||
@Slf4j
|
||||
public class LoginPage extends Page {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(LoginPage.class);
|
||||
private static final String LOGIN_PAGE_HTML_FILE = "login.html";
|
||||
private static final String PAGE_URL = "file:" + AUT_PATH + LOGIN_PAGE_HTML_FILE;
|
||||
|
||||
|
@ -42,7 +42,7 @@ public class AlbumListPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectAlbum() {
|
||||
void testSelectAlbum() {
|
||||
var albumPage = albumListPage.selectAlbum("21");
|
||||
albumPage.navigateToPage();
|
||||
assertTrue(albumPage.isAt());
|
||||
|
@ -42,7 +42,7 @@ public class AlbumPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSaveAlbum() {
|
||||
void testSaveAlbum() {
|
||||
|
||||
var albumPageAfterChanges = albumPage
|
||||
.changeAlbumTitle("25")
|
||||
@ -57,7 +57,7 @@ public class AlbumPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCancelChanges() {
|
||||
void testCancelChanges() {
|
||||
var albumListPage = albumPage.cancelChanges();
|
||||
albumListPage.navigateToPage();
|
||||
assertTrue(albumListPage.isAt());
|
||||
|
@ -42,7 +42,7 @@ public class LoginPageTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLogin() {
|
||||
void testLogin() {
|
||||
var albumListPage = loginPage
|
||||
.enterUsername("admin")
|
||||
.enterPassword("password")
|
||||
|
Reference in New Issue
Block a user