Skip to content

Commit 9caf501

Browse files
committed
fix noisy tests
1 parent 0cdce4d commit 9caf501

4 files changed

Lines changed: 41 additions & 11 deletions

File tree

pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<properties>
1515
<java.version>1.8</java.version>
16+
<mockito.version>5.15.2</mockito.version>
1617
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1718
</properties>
1819

@@ -56,6 +57,10 @@
5657
<groupId>org.apache.maven.plugins</groupId>
5758
<artifactId>maven-resources-plugin</artifactId>
5859
<version>3.3.1</version>
60+
<configuration>
61+
<encoding>${project.build.sourceEncoding}</encoding>
62+
<propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
63+
</configuration>
5964
<executions>
6065
<execution>
6166
<id>process-resources</id>
@@ -78,6 +83,9 @@
7883
<groupId>org.apache.maven.plugins</groupId>
7984
<artifactId>maven-surefire-plugin</artifactId>
8085
<version>3.5.2</version>
86+
<configuration>
87+
<argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar --enable-native-access=ALL-UNNAMED -Xshare:off</argLine>
88+
</configuration>
8189
</plugin>
8290

8391
</plugins>
@@ -183,7 +191,13 @@
183191
<dependency>
184192
<groupId>org.mockito</groupId>
185193
<artifactId>mockito-core</artifactId>
186-
<version>5.15.2</version>
194+
<version>${mockito.version}</version>
195+
<scope>test</scope>
196+
</dependency>
197+
<dependency>
198+
<groupId>org.slf4j</groupId>
199+
<artifactId>slf4j-nop</artifactId>
200+
<version>1.7.36</version>
187201
<scope>test</scope>
188202
</dependency>
189203
<dependency>

src/main/java/dev/noah/perplayerkit/storage/RedisStorage.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package dev.noah.perplayerkit.storage;
2020

21-
import dev.noah.perplayerkit.PerPlayerKit;
2221
import org.bukkit.plugin.Plugin;
2322
import redis.clients.jedis.Jedis;
2423
import redis.clients.jedis.JedisPool;
@@ -62,7 +61,7 @@ public boolean isConnected() {
6261
try (Jedis jedis = getConnection()) {
6362
return "PONG".equals(jedis.ping());
6463
} catch (Exception e) {
65-
e.printStackTrace();
64+
logRedisFailure("connectivity check", e);
6665
return false;
6766
}
6867
}
@@ -84,7 +83,7 @@ public void keepAlive() {
8483
try (Jedis jedis = getConnection()) {
8584
jedis.ping();
8685
} catch (Exception e) {
87-
e.printStackTrace();
86+
logRedisFailure("keepalive", e);
8887
}
8988
}
9089

@@ -93,7 +92,7 @@ public void saveKitDataByID(String kitID, String data) {
9392
try (Jedis jedis = getConnection()) {
9493
jedis.set(kitID, data);
9594
} catch (Exception e) {
96-
e.printStackTrace();
95+
logRedisFailure("save operation for kit ID " + kitID, e);
9796
}
9897
}
9998

@@ -103,7 +102,7 @@ public String getKitDataByID(String kitID) {
103102
String data = jedis.get(kitID);
104103
return data == null ? "Error" : data;
105104
} catch (Exception e) {
106-
e.printStackTrace();
105+
logRedisFailure("read operation for kit ID " + kitID, e);
107106
return "Error";
108107
}
109108
}
@@ -113,7 +112,7 @@ public boolean doesKitExistByID(String kitID) {
113112
try (Jedis jedis = getConnection()) {
114113
return jedis.exists(kitID);
115114
} catch (Exception e) {
116-
e.printStackTrace();
115+
logRedisFailure("existence check for kit ID " + kitID, e);
117116
return false;
118117
}
119118
}
@@ -123,7 +122,7 @@ public void deleteKitByID(String kitID) {
123122
try (Jedis jedis = getConnection()) {
124123
jedis.del(kitID);
125124
} catch (Exception e) {
126-
e.printStackTrace();
125+
logRedisFailure("delete operation for kit ID " + kitID, e);
127126
}
128127
}
129128

@@ -140,8 +139,15 @@ public Set<String> getAllKitIDs() {
140139
try (Jedis jedis = getConnection()) {
141140
kitIDs.addAll(jedis.keys("*"));
142141
} catch (Exception e) {
143-
e.printStackTrace();
142+
logRedisFailure("list operation", e);
144143
}
145144
return kitIDs;
146145
}
146+
147+
private void logRedisFailure(String operation, Exception exception) {
148+
if (plugin == null || plugin.getLogger() == null) {
149+
return;
150+
}
151+
plugin.getLogger().fine("Redis " + operation + " failed: " + exception.getMessage());
152+
}
147153
}

src/test/java/dev/noah/perplayerkit/storage/StorageMigratorTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import java.util.Arrays;
99
import java.util.HashSet;
10+
import java.util.logging.Level;
11+
import java.util.logging.Logger;
1012

1113
import static org.junit.jupiter.api.Assertions.assertEquals;
1214
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -24,7 +26,10 @@ class StorageMigratorTest {
2426
@BeforeEach
2527
void setUp() {
2628
plugin = mock(Plugin.class);
27-
when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getLogger("StorageMigratorTest"));
29+
Logger logger = Logger.getLogger("StorageMigratorTest");
30+
logger.setUseParentHandlers(false);
31+
logger.setLevel(Level.OFF);
32+
when(plugin.getLogger()).thenReturn(logger);
2833
}
2934

3035
@Test

src/test/java/dev/noah/perplayerkit/storage/YAMLStorageTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import java.nio.file.Path;
99
import java.util.Set;
10+
import java.util.logging.Level;
11+
import java.util.logging.Logger;
1012

1113
import static org.junit.jupiter.api.Assertions.assertEquals;
1214
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -21,7 +23,10 @@ class YAMLStorageTest {
2123
@BeforeEach
2224
void setUp() {
2325
plugin = mock(Plugin.class);
24-
when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getLogger("YAMLStorageTest"));
26+
Logger logger = Logger.getLogger("YAMLStorageTest");
27+
logger.setUseParentHandlers(false);
28+
logger.setLevel(Level.OFF);
29+
when(plugin.getLogger()).thenReturn(logger);
2530
}
2631

2732
@Test

0 commit comments

Comments
 (0)