Skip to content

Commit 89528aa

Browse files
AuroraLS3AuroraLS3
committed
Remove use of deprecated LogType.CLIENT
1 parent 72bf513 commit 89528aa

4 files changed

Lines changed: 43 additions & 65 deletions

File tree

‎Plan/common/src/test/java/com/djrapitops/plan/delivery/export/ExportTestUtilities.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
import com.djrapitops.plan.utilities.java.Lists;
2828
import org.apache.commons.lang3.Strings;
2929
import org.awaitility.Awaitility;
30-
import org.openqa.selenium.By;
31-
import org.openqa.selenium.JavascriptExecutor;
32-
import org.openqa.selenium.NoSuchElementException;
33-
import org.openqa.selenium.WebElement;
30+
import org.openqa.selenium.*;
3431
import org.openqa.selenium.chrome.ChromeDriver;
3532
import org.openqa.selenium.logging.LogEntry;
3633
import org.openqa.selenium.logging.LogType;
@@ -43,7 +40,6 @@
4340
import java.nio.file.Path;
4441
import java.time.Duration;
4542
import java.time.temporal.ChronoUnit;
46-
import java.util.ArrayList;
4743
import java.util.List;
4844
import java.util.Optional;
4945
import java.util.UUID;
@@ -61,6 +57,10 @@ private ExportTestUtilities() {
6157
/* Static utility method class */
6258
}
6359

60+
public static void assertNoLogs(WebDriver driver, String endpoint) {
61+
assertNoLogs(driver.manage().logs().get(LogType.BROWSER).getAll(), endpoint);
62+
}
63+
6464
public static void assertNoLogs(List<LogEntry> logs, String endpoint) {
6565
List<String> loggedLines = logs.stream()
6666
.map(log -> "\n" + log.getLevel().getName() + " " + log.getMessage())
@@ -112,10 +112,7 @@ public static List<LogEntry> getLogsAfterRequestToAddress(ChromeDriver driver, S
112112
.atMost(Duration.of(10, ChronoUnit.SECONDS))
113113
.until(() -> getMainPageElement(driver).map(WebElement::isDisplayed).orElse(false));
114114

115-
List<LogEntry> logs = new ArrayList<>();
116-
logs.addAll(driver.manage().logs().get(LogType.CLIENT).getAll());
117-
logs.addAll(driver.manage().logs().get(LogType.BROWSER).getAll());
118-
return logs;
115+
return driver.manage().logs().get(LogType.BROWSER).getAll();
119116
}
120117

121118
static void export(Exporter exporter, Database database, ServerUUID serverUUID) throws Exception {

‎Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.djrapitops.plan.PlanSystem;
2020
import com.djrapitops.plan.delivery.domain.auth.User;
2121
import com.djrapitops.plan.delivery.domain.auth.WebPermission;
22-
import com.djrapitops.plan.delivery.export.ExportTestUtilities;
2322
import com.djrapitops.plan.identification.Server;
2423
import com.djrapitops.plan.identification.ServerUUID;
2524
import com.djrapitops.plan.settings.config.PlanConfig;
@@ -48,8 +47,6 @@
4847
import org.openqa.selenium.NoSuchElementException;
4948
import org.openqa.selenium.WebDriver;
5049
import org.openqa.selenium.chrome.ChromeDriver;
51-
import org.openqa.selenium.logging.LogEntry;
52-
import org.openqa.selenium.logging.LogType;
5350
import utilities.RandomData;
5451
import utilities.TestConstants;
5552
import utilities.TestResources;
@@ -58,12 +55,15 @@
5855
import java.nio.file.Files;
5956
import java.nio.file.Path;
6057
import java.nio.file.StandardCopyOption;
61-
import java.util.*;
58+
import java.util.Arrays;
59+
import java.util.Collections;
60+
import java.util.UUID;
6261
import java.util.concurrent.ExecutionException;
6362
import java.util.concurrent.TimeUnit;
6463
import java.util.stream.Collectors;
6564
import java.util.stream.Stream;
6665

66+
import static com.djrapitops.plan.delivery.export.ExportTestUtilities.assertNoLogs;
6767
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
6868
import static org.junit.jupiter.api.Assertions.assertThrows;
6969

@@ -93,33 +93,11 @@ static void setUp(PlanSystem system, @TempDir Path tempDir, PlanConfig config) t
9393
system.enable();
9494
}
9595

96-
@AfterEach
97-
void tearDownTest(WebDriver driver) {
98-
String address = "https://localhost:" + TEST_PORT_NUMBER + "/auth/logout";
99-
driver.get(address);
100-
SeleniumExtension.newTab(driver);
101-
driver.manage().deleteAllCookies();
102-
}
103-
10496
@AfterAll
10597
static void tearDown(PlanSystem system) {
10698
system.disable();
10799
}
108100

109-
User registerUser(Database db, WebPermission... permissions) throws Exception {
110-
String groupName = RandomData.randomString(75);
111-
db.executeTransaction(
112-
new StoreWebGroupTransaction(groupName, Arrays.stream(permissions)
113-
.map(WebPermission::getPermission)
114-
.collect(Collectors.toList()))
115-
).get();
116-
117-
User user = new User(RandomData.randomString(45), "console", null, PassEncryptUtil.createHash(PASSWORD), groupName, Collections.emptyList());
118-
db.executeTransaction(new StoreWebUserTransaction(user)).get();
119-
120-
return user;
121-
}
122-
123101
static Stream<Arguments> serverPageElementVisibleCases() {
124102
return Stream.of(
125103
Arguments.arguments(WebPermission.PAGE_SERVER_OVERVIEW_PLAYERS_ONLINE_GRAPH, "players-online-graph", "overview"),
@@ -208,6 +186,37 @@ static Stream<Arguments> pageLevelVisibleCases() {
208186
);
209187
}
210188

189+
private static void storePlayer(Database database, ServerUUID serverUUID) throws ExecutionException, InterruptedException {
190+
storePlayer(database, serverUUID, TestConstants.PLAYER_ONE_UUID, TestConstants.PLAYER_ONE_NAME);
191+
}
192+
193+
private static void storePlayer(Database database, ServerUUID serverUUID, UUID playerUUID, String playerName) throws ExecutionException, InterruptedException {
194+
database.executeTransaction(new StoreServerPlayerTransaction(playerUUID, System.currentTimeMillis(), playerName, serverUUID, TestConstants.GET_PLAYER_HOSTNAME.get()))
195+
.get();
196+
}
197+
198+
@AfterEach
199+
void tearDownTest(WebDriver driver) {
200+
String address = "https://localhost:" + TEST_PORT_NUMBER + "/auth/logout";
201+
driver.get(address);
202+
SeleniumExtension.newTab(driver);
203+
driver.manage().deleteAllCookies();
204+
}
205+
206+
User registerUser(Database db, WebPermission... permissions) throws Exception {
207+
String groupName = RandomData.randomString(75);
208+
db.executeTransaction(
209+
new StoreWebGroupTransaction(groupName, Arrays.stream(permissions)
210+
.map(WebPermission::getPermission)
211+
.collect(Collectors.toList()))
212+
).get();
213+
214+
User user = new User(RandomData.randomString(45), "console", null, PassEncryptUtil.createHash(PASSWORD), groupName, Collections.emptyList());
215+
db.executeTransaction(new StoreWebUserTransaction(user)).get();
216+
217+
return user;
218+
}
219+
211220
@DisplayName("Whole page is visible with permission")
212221
@ParameterizedTest(name = "Access with visibility {0} can see element #{1} in /{2}")
213222
@MethodSource("pageLevelVisibleCases")
@@ -225,13 +234,6 @@ void pageVisible(WebPermission permission, String element, String page, Database
225234
assertNoLogs(driver, address);
226235
}
227236

228-
private static void assertNoLogs(ChromeDriver driver, String address) {
229-
List<LogEntry> logs = new ArrayList<>();
230-
logs.addAll(driver.manage().logs().get(LogType.CLIENT).getAll());
231-
logs.addAll(driver.manage().logs().get(LogType.BROWSER).getAll());
232-
ExportTestUtilities.assertNoLogs(logs, address);
233-
}
234-
235237
@DisplayName("Whole page is not visible with permission")
236238
@ParameterizedTest(name = "Access with no visibility needs {0} can't see element #{1} in /{2}")
237239
@MethodSource("pageLevelVisibleCases")
@@ -274,15 +276,6 @@ void serverPageElementVisible(WebPermission permission, String element, String s
274276
assertNoLogs(driver, address);
275277
}
276278

277-
private static void storePlayer(Database database, ServerUUID serverUUID) throws ExecutionException, InterruptedException {
278-
storePlayer(database, serverUUID, TestConstants.PLAYER_ONE_UUID, TestConstants.PLAYER_ONE_NAME);
279-
}
280-
281-
private static void storePlayer(Database database, ServerUUID serverUUID, UUID playerUUID, String playerName) throws ExecutionException, InterruptedException {
282-
database.executeTransaction(new StoreServerPlayerTransaction(playerUUID, System.currentTimeMillis(), playerName, serverUUID, TestConstants.GET_PLAYER_HOSTNAME.get()))
283-
.get();
284-
}
285-
286279
@DisplayName("Server element is not visible without permission")
287280
@ParameterizedTest(name = "Access to server page with no visibility needs {0} can't see element #{1} in section /server/uuid/{2}")
288281
@MethodSource("serverPageElementVisibleCases")

‎Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.openqa.selenium.StaleElementReferenceException;
4242
import org.openqa.selenium.WebDriver;
4343
import org.openqa.selenium.chrome.ChromeDriver;
44-
import org.openqa.selenium.logging.LogEntry;
4544
import org.openqa.selenium.logging.LogType;
4645
import utilities.RandomData;
4746
import utilities.TestConstants;
@@ -135,12 +134,7 @@ private DynamicTest testAddress(String address, ChromeDriver driver) {
135134
try {
136135
driver.get(address);
137136
Thread.sleep(250);
138-
139-
List<LogEntry> logs = new ArrayList<>();
140-
logs.addAll(driver.manage().logs().get(LogType.CLIENT).getAll());
141-
logs.addAll(driver.manage().logs().get(LogType.BROWSER).getAll());
142-
143-
assertNoLogs(logs, address);
137+
assertNoLogs(driver.manage().logs().get(LogType.BROWSER).getAll(), address);
144138
} finally {
145139
locale.clear(); // Reset locale after test
146140
}
@@ -166,11 +160,7 @@ void linkFunctionRegressionTest(String address, ChromeDriver driver) {
166160
driver.get(address);
167161
SeleniumExtension.waitForPageLoadForSeconds(3, driver);
168162

169-
List<LogEntry> logs = new ArrayList<>();
170-
logs.addAll(driver.manage().logs().get(LogType.CLIENT).getAll());
171-
logs.addAll(driver.manage().logs().get(LogType.BROWSER).getAll());
172-
173-
assertNoLogs(logs, "Page link '" + address + "'->'" + href + "'");
163+
assertNoLogs(driver, "Page link '" + address + "'->'" + href + "'");
174164
System.out.println("'" + address + "' has link to " + href);
175165
}
176166
}

‎Plan/common/src/test/java/extension/SeleniumExtension.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ private ChromeDriver getChromeWebDriver() {
103103
private LoggingPreferences getLoggingPreferences() {
104104
LoggingPreferences logPrefs = new LoggingPreferences();
105105
logPrefs.enable(LogType.PERFORMANCE, Level.INFO);
106-
logPrefs.enable(LogType.PROFILER, Level.INFO);
107106
logPrefs.enable(LogType.BROWSER, Level.INFO);
108-
logPrefs.enable(LogType.CLIENT, Level.INFO);
109107
logPrefs.enable(LogType.DRIVER, Level.INFO);
110108
return logPrefs;
111109
}

0 commit comments

Comments
 (0)