Handle zero sea height. Added test class.

pom.xml

@@ -56,7 +56,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <!-- Non-minecraft related dependencies -->
-        <powermock.version>2.0.2</powermock.version>
+        <powermock.version>2.0.4</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
         <bentobox.version>1.9.0-SNAPSHOT</bentobox.version>

src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java

@@ -10,6 +10,7 @@ import java.util.Random;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.util.Vector;
@@ -43,7 +44,10 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
 
     public ChunkData generateChunks(World world) {
         ChunkData result = createChunkData(world);
-        result.setRegion(0, 0, 0, 16, seaHeight.getOrDefault(world.getEnvironment(), 0) + 1, 16, Material.WATER);
+        int sh = seaHeight.getOrDefault(world.getEnvironment(), 0);
+        if (sh > 0) {
+            result.setRegion(0, 0, 0, 16, sh + 1, 16, Material.WATER);
+        }
         if (world.getEnvironment().equals(Environment.NETHER) && addon.getSettings().isNetherRoof()) {
             roofChunk.forEach((k,v) -> result.setBlock(k.getBlockX(), world.getMaxHeight() + k.getBlockY(), k.getBlockZ(), v));
         }
@@ -57,12 +61,13 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
     }
 
     private void setBiome(BiomeGrid biomeGrid) {
+        Biome biome = addon.getSettings().getDefaultBiome();
         for (int x = 0; x < 16; x++) {
             for (int z = 0; z < 16; z++) {
-                biomeGrid.setBiome(x, z, addon.getSettings().getDefaultBiome());
+                biomeGrid.setBiome(x, z, biome);
             }
         }
-        
+
     }
 
     // This needs to be set to return true to override minecraft's default
@@ -149,6 +154,6 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
     }
 
     private void setBlock(int x, int y, int z, Material m) {
-        roofChunk.put(new Vector(x, y, z), m);       
+        roofChunk.put(new Vector(x, y, z), m);
     }
 }

src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java

@@ -0,0 +1,192 @@
+package world.bentobox.acidisland.world;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.generator.ChunkGenerator.BiomeGrid;
+import org.bukkit.generator.ChunkGenerator.ChunkData;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import world.bentobox.acidisland.AcidIsland;
+import world.bentobox.acidisland.AISettings;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Bukkit.class})
+public class ChunkGeneratorWorldTest {
+
+    @Mock
+    private AcidIsland addon;
+    private ChunkGeneratorWorld cg;
+    @Mock
+    private World world;
+    private final Random random = new Random();
+    @Mock
+    private BiomeGrid biomeGrid;
+    @Mock
+    private AISettings settings;
+    @Mock
+    private ChunkData data;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Bukkit
+        PowerMockito.mockStatic(Bukkit.class);
+        Server server = mock(Server.class);
+        when(server.createChunkData(any())).thenReturn(data);
+        when(Bukkit.getServer()).thenReturn(server);
+        // World
+        when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
+        // Settings
+        when(addon.getSettings()).thenReturn(settings);
+        when(settings.getSeaHeight()).thenReturn(0);
+        when(settings.isNetherRoof()).thenReturn(true);
+
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldVoid() {
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Default biome
+        verify(settings).getDefaultBiome();
+        verify(biomeGrid, times(16 * 16)).setBiome(anyInt(), anyInt(), any());
+        // Sea height
+        verify(settings).getSeaHeight();
+        // Void
+        verify(cd, never()).setRegion(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), any(Material.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldSea() {
+        // Set sea height
+        when(settings.getSeaHeight()).thenReturn(10);
+        // new instance
+        cg = new ChunkGeneratorWorld(addon);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Default biome
+        verify(settings).getDefaultBiome();
+        verify(biomeGrid, times(16 * 16)).setBiome(anyInt(), anyInt(), any());
+        // Sea height
+        verify(settings, times(2)).getSeaHeight();
+        // Water. Blocks = 16 x 16 x 11 because block 0
+        verify(cd).setRegion(0, 0, 0, 16, 11, 16, Material.WATER);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridEnd() {
+        when(world.getEnvironment()).thenReturn(World.Environment.THE_END);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Default biome
+        verify(settings, never()).getDefaultBiome();
+        // Never set biome in end
+        verify(biomeGrid, never()).setBiome(anyInt(), anyInt(), any());
+        // Sea height
+        verify(settings).getSeaHeight();
+        // Void
+        verify(cd, never()).setRegion(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), any(Material.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridNetherWithRoof() {
+        when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Nether roof check
+        verify(settings).isNetherRoof();
+        // Never set biome in nether
+        verify(biomeGrid, never()).setBiome(anyInt(), anyInt(), any());
+        // Nether roof - at least bedrock layer
+        verify(cd, atLeast(16 * 16)).setBlock(anyInt(), anyInt(), anyInt(), eq(Material.BEDROCK));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridNetherNoRoof() {
+        when(settings.isNetherRoof()).thenReturn(false);
+        when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Nether roof check
+        verify(settings).isNetherRoof();
+        // Never set biome in nether
+        verify(biomeGrid, never()).setBiome(anyInt(), anyInt(), any());
+        // Nether roof - at least bedrock layer
+        verify(cd, never()).setBlock(anyInt(), anyInt(), anyInt(), any(Material.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#canSpawn(org.bukkit.World, int, int)}.
+     */
+    @Test
+    public void testCanSpawnWorldIntInt() {
+        assertTrue(cg.canSpawn(mock(World.class), 0, 1));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#getDefaultPopulators(org.bukkit.World)}.
+     */
+    @Test
+    public void testGetDefaultPopulatorsWorld() {
+        assertTrue(cg.getDefaultPopulators(mock(World.class)).isEmpty());
+    }
+
+}