Skip to content

Commit 68b2e7d

Browse files
fix(deps): update dependency net.minestom:minestom to v2026.05.17-1.21.11 (#78)
* Update dependency net.minestom:minestom to v2026.05.17-1.21.11 * chore: align test-related code with the main code base * chore: fix custom player test * chore: remove double test player definition --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com>
1 parent b169f9e commit 68b2e7d

4 files changed

Lines changed: 27 additions & 8 deletions

File tree

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
77

88
versionCatalogs {
99
create("libs") {
10-
version("minestom", "2026.05.11-1.21.11")
10+
version("minestom", "2026.05.17-1.21.11")
1111
version("junit", "6.0.3")
1212

1313
library("minestom","net.minestom", "minestom").versionRef("minestom")

src/main/java/net/minestom/testing/Collector.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface Collector<T> {
3030
*
3131
* @return a list of elements collected by this collector
3232
*/
33-
@NotNull List<@NotNull T> collect();
33+
List<T> collect();
3434

3535
/**
3636
* Assert a single element from the collection, check its type, and apply a consumer to it.
@@ -69,6 +69,18 @@ default void assertCount(int count) {
6969
assertEquals(count, elements.size(), "Expected " + count + " element(s), got " + elements.size() + ": " + elements);
7070
}
7171

72+
/**
73+
* Assert the count of elements matching a predicate in the collector.
74+
*
75+
* @param count expected number of elements matching the predicate
76+
* @param predicate to match elements
77+
*/
78+
default void assertCount(int count, Predicate<? super T> predicate) {
79+
List<T> elements = collect();
80+
long matchingCount = elements.stream().filter(predicate).count();
81+
assertEquals(count, matchingCount, "Expected " + count + " element(s) matching the predicate, got " + matchingCount + ": " + elements);
82+
}
83+
7284
/**
7385
* Assert that the collector only contains a single element.
7486
*/

src/main/java/net/minestom/testing/EnvImpl.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minestom.server.event.EventFilter;
66
import net.minestom.server.event.EventListener;
77
import net.minestom.server.network.player.GameProfile;
8-
import org.jetbrains.annotations.NotNull;
8+
import org.junit.jupiter.api.Assertions;
99

1010
import java.util.List;
1111
import java.util.concurrent.CopyOnWriteArrayList;
@@ -20,6 +20,8 @@ public final class EnvImpl implements Env {
2020

2121
public EnvImpl(ServerProcess process) {
2222
this.process = process;
23+
// If exceptions reach the exception handler, by default fail the test.
24+
process().exception().setExceptionHandler(EnvImpl::handleException);
2325

2426
// Start the dispatcher threads if not already started.
2527
process().dispatcher().start();
@@ -29,18 +31,22 @@ public EnvImpl(ServerProcess process) {
2931
process.connection().setPlayerProvider(TestPlayerImpl::new);
3032
}
3133

34+
static void handleException(Throwable exception) {
35+
Assertions.fail("Server threw exception", exception);
36+
}
37+
3238
@Override
3339
public ServerProcess process() {
3440
return process;
3541
}
3642

3743
@Override
38-
public TestConnection createConnection(GameProfile profile) {
39-
return new TestConnectionImpl(this, profile);
44+
public TestConnection createConnection(GameProfile gameProfile) {
45+
return new TestConnectionImpl(this, gameProfile);
4046
}
4147

4248
@Override
43-
public <E extends Event, H> Collector<E> trackEvent(Class<E> eventType, EventFilter<? super E, H> filter, @NotNull H actor) {
49+
public <E extends Event, H> Collector<E> trackEvent(Class<E> eventType, EventFilter<? super E, H> filter, H actor) {
4450
var tracker = new EventCollector<E>(actor);
4551
this.process.eventHandler().map(actor, filter).addListener(eventType, tracker.events::add);
4652
return tracker;

src/main/java/net/minestom/testing/TestConnectionImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.minestom.testing;
22

33
import net.kyori.adventure.translation.GlobalTranslator;
4+
import net.minestom.server.ServerFlag;
45
import net.minestom.server.ServerProcess;
56
import net.minestom.server.adventure.MinestomAdventure;
67
import net.minestom.server.coordinate.Pos;
@@ -89,7 +90,7 @@ private ServerPacket extractPacket(final SendablePacket packet) {
8990
final Player player = getPlayer();
9091
if (player == null) return serverPacket;
9192

92-
if (MinestomAdventure.AUTOMATIC_COMPONENT_TRANSLATION && serverPacket instanceof ServerPacket.ComponentHolding) {
93+
if (ServerFlag.AUTOMATIC_COMPONENT_TRANSLATION && serverPacket instanceof ServerPacket.ComponentHolding) {
9394
serverPacket = ((ServerPacket.ComponentHolding) serverPacket).copyWithOperator(component ->
9495
GlobalTranslator.render(component, Objects.requireNonNullElseGet(player.getLocale(), MinestomAdventure::getDefaultLocale)));
9596
}
@@ -127,4 +128,4 @@ public List<T> collect() {
127128
return List.copyOf(packets);
128129
}
129130
}
130-
}
131+
}

0 commit comments

Comments
 (0)