From a23b182de5605a066a18e6caae99950b1bf13728 Mon Sep 17 00:00:00 2001
From: Octavia Togami <octavia.togami@gmail.com>
Date: Wed, 3 Jun 2020 18:32:49 -0700
Subject: [PATCH] Fix vector gen, always enable BlockMap tests

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

(cherry picked from commit 1e2496af552891e3b43c5703bda8dc4129bbcc5d)
---
 .../java/com/sk89q/worldedit/util/collection/BlockMap.java  | 6 ------
 .../com/sk89q/worldedit/util/collection/BlockMapTest.java   | 1 -
 .../sk89q/worldedit/util/test/VariedVectorGenerator.java    | 4 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java
index 0db0ba7d0..ea9061752 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java
@@ -52,12 +52,6 @@ import static com.sk89q.worldedit.math.BitMath.mask;
  */
 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() {
         return create(() -> new Int2ObjectOpenHashMap<>(64, 0.9f));
     }
diff --git a/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java b/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java
index 98b7e741d..6a9fda239 100644
--- a/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java
+++ b/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java
@@ -259,7 +259,6 @@ class BlockMapTest {
 
     @Nested
     @DisplayName("after having an entry added")
-    @EnabledIfSystemProperty(named = "blockmap.fulltesting", matches = "true")
     class AfterEntryAdded {
 
         // Note: This section of tests would really benefit from
diff --git a/worldedit-core/src/test/java/com/sk89q/worldedit/util/test/VariedVectorGenerator.java b/worldedit-core/src/test/java/com/sk89q/worldedit/util/test/VariedVectorGenerator.java
index a832271a3..6818c7aa2 100644
--- a/worldedit-core/src/test/java/com/sk89q/worldedit/util/test/VariedVectorGenerator.java
+++ b/worldedit-core/src/test/java/com/sk89q/worldedit/util/test/VariedVectorGenerator.java
@@ -40,9 +40,9 @@ public class VariedVectorGenerator {
     public final int divisionsXZ;
     public final int divisionsY;
     public final int maxXZ;
-    public final int maxY;
+    public final long maxY;
     public final int xzStep;
-    public final int yStep;
+    public final long yStep;
     public final Set<BlockVector3> alwaysInclude;
 
     public VariedVectorGenerator() {