ydeng/islandsurvivalcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Large package structure refactoring.

Browse Source
This commit is contained in:
Harrison Deng
2020-05-04 16:41:46 -05:00
parent 7fb858c7ca
commit 1167efbe4e
26 changed files with 201 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/test/java/ca/recrown/islandsurvivalcraft/UtilitiesTest.java
View File

@@ -1,129 +0,0 @@
package ca.recrown.islandsurvivalcraft;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.HashMap;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import ca.recrown.islandsurvivalcraft.datatypes.Point2;
/**
* Unit test for simple App.
*/
@TestInstance(Lifecycle.PER_CLASS)
public class UtilitiesTest {
/**
* Basic hashmap inversion test.
*/
@Test
public void testInvertHashMap()
{
HashMap<String, Integer> hashMap = new HashMap<>();
hashMap.put("a", 1);
hashMap.put("b", 1);
hashMap.put("c", 2);
hashMap.put("d", 2);
HashMap<Integer, ArrayList<String>> res = Utilities.invertHashMap(hashMap);
ArrayList<String> first = res.get(1);
ArrayList<String> expectedFirst = new ArrayList<>();
expectedFirst.add("a");
expectedFirst.add("b");
ArrayList<String> second = res.get(2);
ArrayList<String> expectedSecond = new ArrayList<>();
expectedSecond.add("c");
expectedSecond.add("d");
assertEquals(first, expectedFirst);
assertEquals(second, expectedSecond);
}
@Test
public void testMagnitudeAddPositive() {
assertEquals(2, Utilities.addMagnitude(1, 1));
}
@Test
public void testMagnitudeAddNegative() {
assertEquals(-2, Utilities.addMagnitude(-1, 1));
}
@Test
public void testWorldToChunkCoordinatesNegativePerfect() {
assertEquals(new Point2(-4, -3), Utilities.worldToChunkCoordinates(-64, -48));
}
@Test
public void testWorldToChunkCoordinatesNegativeOff() {
assertEquals(new Point2(-4, -3), Utilities.worldToChunkCoordinates(-55, -33));
}
@Test
public void testWorldToChunkCoordinatesNegativeOffClose() {
assertEquals(new Point2(15, -15), Utilities.worldToChunkCoordinates(255, -227));
}
@Test
public void testWorldToChunkCoordinatesPositivePerfect() {
assertEquals(new Point2(4, 5), Utilities.worldToChunkCoordinates(64, 80));
}
@Test
public void testWorldToChunkCoordinatesPositiveOff() {
assertEquals(new Point2(4, 5), Utilities.worldToChunkCoordinates(67, 84));
}
@Test
public void testWorldToLocalCoordinatesNegative() {
assertEquals(new Point2(2, 5), Utilities.worldToLocalChunkCoordinates(-62, -27));
assertEquals(new Point2(2, 5), Utilities.worldToLocalChunkCoordinates(new Point2(-62, -27)));
}
@Test
public void testWorldToLocalCoordinatesNegativePerfect() {
assertEquals(new Point2(0, 0), Utilities.worldToLocalChunkCoordinates(-128, -32));
assertEquals(new Point2(0, 0), Utilities.worldToLocalChunkCoordinates(new Point2(-256, -16)));
}
@Test
public void testWorldToLocalCoordinatesPositive() {
assertEquals(new Point2(7, 3), Utilities.worldToLocalChunkCoordinates(39, 83));
assertEquals(new Point2(7, 3), Utilities.worldToLocalChunkCoordinates(new Point2(39, 83)));
}
@Test
public void testWorldToLocalCoordinatesPositivePerfect() {
assertEquals(new Point2(0, 0), Utilities.worldToLocalChunkCoordinates(1024, 32));
assertEquals(new Point2(0, 0), Utilities.worldToLocalChunkCoordinates(new Point2(16, 80)));
}
@Test
public void testWorldToLocalCoordinatesPositiveEntirety() {
int chunkX = 4;
int chunkZ = 3;
for (int x = 0; x < Utilities.CHUNK_SIZE; x++) {
for (int z = 0; z < Utilities.CHUNK_SIZE; z++) {
int worldX = Utilities.CHUNK_SIZE * chunkX + x;
int worldZ = Utilities.CHUNK_SIZE * chunkZ + z;
assertEquals(new Point2(x, z), Utilities.worldToLocalChunkCoordinates(new Point2(worldX, worldZ)));
}
}
}
@Test
public void testWorldToLocalCoordinatesNegativeEntirety() {
int chunkX = -42;
int chunkZ = -3;
for (int x = 0; x < Utilities.CHUNK_SIZE; x++) {
for (int z = 0; z < Utilities.CHUNK_SIZE; z++) {
int worldX = Utilities.CHUNK_SIZE * chunkX + x;
int worldZ = Utilities.CHUNK_SIZE * chunkZ + z;
assertEquals(new Point2(x, z), Utilities.worldToLocalChunkCoordinates(new Point2(worldX, worldZ)));
}
}
}
}

129
src/test/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java Normal file
View File

@@ -0,0 +1,129 @@
package ca.recrown.islandsurvivalcraft.utilities;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.HashMap;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2;
/**
* Unit test for simple App.
*/
@TestInstance(Lifecycle.PER_CLASS)
public class GeneralUtilitiesTest {
/**
* Basic hashmap inversion test.
*/
@Test
public void testInvertHashMap()
{
HashMap<String, Integer> hashMap = new HashMap<>();
hashMap.put("a", 1);
hashMap.put("b", 1);
hashMap.put("c", 2);
hashMap.put("d", 2);
HashMap<Integer, ArrayList<String>> res = GeneralUtilities.invertHashMap(hashMap);
ArrayList<String> first = res.get(1);
ArrayList<String> expectedFirst = new ArrayList<>();
expectedFirst.add("a");
expectedFirst.add("b");
ArrayList<String> second = res.get(2);
ArrayList<String> expectedSecond = new ArrayList<>();
expectedSecond.add("c");
expectedSecond.add("d");
assertEquals(first, expectedFirst);
assertEquals(second, expectedSecond);
}
@Test
public void testMagnitudeAddPositive() {
assertEquals(2, GeneralUtilities.addMagnitude(1, 1));
}
@Test
public void testMagnitudeAddNegative() {
assertEquals(-2, GeneralUtilities.addMagnitude(-1, 1));
}
@Test
public void testWorldToChunkCoordinatesNegativePerfect() {
assertEquals(new Point2(-4, -3), GeneralUtilities.worldToChunkCoordinates(-64, -48));
}
@Test
public void testWorldToChunkCoordinatesNegativeOff() {
assertEquals(new Point2(-4, -3), GeneralUtilities.worldToChunkCoordinates(-55, -33));
}
@Test
public void testWorldToChunkCoordinatesNegativeOffClose() {
assertEquals(new Point2(15, -15), GeneralUtilities.worldToChunkCoordinates(255, -227));
}
@Test
public void testWorldToChunkCoordinatesPositivePerfect() {
assertEquals(new Point2(4, 5), GeneralUtilities.worldToChunkCoordinates(64, 80));
}
@Test
public void testWorldToChunkCoordinatesPositiveOff() {
assertEquals(new Point2(4, 5), GeneralUtilities.worldToChunkCoordinates(67, 84));
}
@Test
public void testWorldToLocalCoordinatesNegative() {
assertEquals(new Point2(2, 5), GeneralUtilities.worldToLocalChunkCoordinates(-62, -27));
assertEquals(new Point2(2, 5), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(-62, -27)));
}
@Test
public void testWorldToLocalCoordinatesNegativePerfect() {
assertEquals(new Point2(0, 0), GeneralUtilities.worldToLocalChunkCoordinates(-128, -32));
assertEquals(new Point2(0, 0), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(-256, -16)));
}
@Test
public void testWorldToLocalCoordinatesPositive() {
assertEquals(new Point2(7, 3), GeneralUtilities.worldToLocalChunkCoordinates(39, 83));
assertEquals(new Point2(7, 3), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(39, 83)));
}
@Test
public void testWorldToLocalCoordinatesPositivePerfect() {
assertEquals(new Point2(0, 0), GeneralUtilities.worldToLocalChunkCoordinates(1024, 32));
assertEquals(new Point2(0, 0), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(16, 80)));
}
@Test
public void testWorldToLocalCoordinatesPositiveEntirety() {
int chunkX = 4;
int chunkZ = 3;
for (int x = 0; x < GeneralUtilities.CHUNK_SIZE; x++) {
for (int z = 0; z < GeneralUtilities.CHUNK_SIZE; z++) {
int worldX = GeneralUtilities.CHUNK_SIZE * chunkX + x;
int worldZ = GeneralUtilities.CHUNK_SIZE * chunkZ + z;
assertEquals(new Point2(x, z), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(worldX, worldZ)));
}
}
}
@Test
public void testWorldToLocalCoordinatesNegativeEntirety() {
int chunkX = -42;
int chunkZ = -3;
for (int x = 0; x < GeneralUtilities.CHUNK_SIZE; x++) {
for (int z = 0; z < GeneralUtilities.CHUNK_SIZE; z++) {
int worldX = GeneralUtilities.CHUNK_SIZE * chunkX + x;
int worldZ = GeneralUtilities.CHUNK_SIZE * chunkZ + z;
assertEquals(new Point2(x, z), GeneralUtilities.worldToLocalChunkCoordinates(new Point2(worldX, worldZ)));
}
}
}
}

2
src/test/java/ca/recrown/islandsurvivalcraft/caching/CacheTest.java → src/test/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheTest.java
View File

@@ -1,4 +1,4 @@
package ca.recrown.islandsurvivalcraft.caching;
package ca.recrown.islandsurvivalcraft.utilities.caching;
import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;

5
src/test/java/ca/recrown/islandsurvivalcraft/floodfill/FloodFillTest.java → src/test/java/ca/recrown/islandsurvivalcraft/utilities/floodfill/FloodFillTest.java
View File

@@ -1,4 +1,4 @@
package ca.recrown.islandsurvivalcraft.floodfill;
package ca.recrown.islandsurvivalcraft.utilities.floodfill;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -13,7 +13,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import ca.recrown.islandsurvivalcraft.datatypes.Point2;
import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2;
import ca.recrown.islandsurvivalcraft.utilities.floodfill.Floodable;
@TestInstance(Lifecycle.PER_CLASS)
public class FloodFillTest {

5
src/test/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearchTest.java → src/test/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java
View File

@@ -1,4 +1,4 @@
package ca.recrown.islandsurvivalcraft.pathfinding;
package ca.recrown.islandsurvivalcraft.utilities.pathfinding;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -14,6 +14,9 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateTargetValidatable;
import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable;
/**
* Unit test for simple App.
*/

12
src/test/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java
View File

@@ -19,9 +19,9 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import ca.recrown.islandsurvivalcraft.Utilities;
import ca.recrown.islandsurvivalcraft.caching.Cache;
import ca.recrown.islandsurvivalcraft.datatypes.Point2;
import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities;
import ca.recrown.islandsurvivalcraft.utilities.caching.Cache;
import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2;
import ca.recrown.islandsurvivalcraft.world.BiomeMap;
import ca.recrown.islandsurvivalcraft.world.IslandWorldMap;
import ca.recrown.islandsurvivalcraft.world.TemperatureMap;
@@ -60,9 +60,9 @@ public class UniqueBiomeGeneratorTest {
TemperatureMap temperatureMapGenerator = new TemperatureMap(random);
BiomeGenerator biomeGenerator = new UniqueBiomeGenerator();
Biome[][][] biomes = new Biome[Utilities.CHUNK_SIZE][Utilities.CHUNK_SIZE][4];
for (int localX = 0; localX < Utilities.CHUNK_SIZE; localX++) {
for (int localZ = 0; localZ < Utilities.CHUNK_SIZE; localZ++) {
Biome[][][] biomes = new Biome[GeneralUtilities.CHUNK_SIZE][GeneralUtilities.CHUNK_SIZE][4];
for (int localX = 0; localX < GeneralUtilities.CHUNK_SIZE; localX++) {
for (int localZ = 0; localZ < GeneralUtilities.CHUNK_SIZE; localZ++) {
if (biomes[localX][localZ] == null) {
biomeGenerator.generateBiomeColumn(biomes, dummyWorld, chunkX, chunkZ, localX, localZ, mapper,
biomeSelector, temperatureMapGenerator, biomeCache, chunkExistenceCache);