Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vector gen, always enable BlockMap tests

Browse Source 
The BlockMap tests got much faster, so there's no need to hide them
behind a flag.

(cherry picked from commit 1e2496af552891e3b43c5703bda8dc4129bbcc5d)
This commit is contained in:
Octavia Togami 2020-06-03 18:32:49 -07:00 committed by MattBDev
parent 9b7f61a2de
commit a23b182de5
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java
View File

@ -52,12 +52,6 @@ import static com.sk89q.worldedit.math.BitMath.mask;
*/ */
public class BlockMap<V> extends AbstractMap<BlockVector3, V> { public class BlockMap<V> extends AbstractMap<BlockVector3, V> {
/* =========================
IF YOU MAKE CHANGES TO THIS CLASS
Re-run BlockMapTest with the blockmap.fulltesting=true system property.
Or just temporarily remove the annotation disabling the related tests.
========================= */
public static <V> BlockMap<V> create() { public static <V> BlockMap<V> create() {
return create(() -> new Int2ObjectOpenHashMap<>(64, 0.9f)); return create(() -> new Int2ObjectOpenHashMap<>(64, 0.9f));
} }

1
worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java
View File

@ -259,7 +259,6 @@ class BlockMapTest {
@Nested @Nested
@DisplayName("after having an entry added") @DisplayName("after having an entry added")
@EnabledIfSystemProperty(named = "blockmap.fulltesting", matches = "true")
class AfterEntryAdded { class AfterEntryAdded {
// Note: This section of tests would really benefit from // Note: This section of tests would really benefit from

4
worldedit-core/src/test/java/com/sk89q/worldedit/util/test/VariedVectorGenerator.java
View File

@ -40,9 +40,9 @@ public class VariedVectorGenerator {
public final int divisionsXZ; public final int divisionsXZ;
public final int divisionsY; public final int divisionsY;
public final int maxXZ; public final int maxXZ;
public final int maxY; public final long maxY;
public final int xzStep; public final int xzStep;
public final int yStep; public final long yStep;
public final Set<BlockVector3> alwaysInclude; public final Set<BlockVector3> alwaysInclude;
public VariedVectorGenerator() { public VariedVectorGenerator() {