mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-10 02:37:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Anuken 2019-05-09 14:39:52 -04:00
parent 23843be981
commit 9f4a430412
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/world/Tile.java
View File

@ -42,6 +42,9 @@ public class Tile implements Position, TargetTrait{
this.floor = (Floor)content.block(floor);
this.block = content.block(wall);
this.overlay = overlay;
//update entity and create it if needed
changed();
}
/** Returns this tile's position as a {@link Pos}. */

13
tests/src/test/java/ApplicationTests.java
View File

@ -18,6 +18,7 @@ import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.BlockPart;
import org.junit.jupiter.api.*;
import static io.anuke.mindustry.Vars.*;
@ -125,7 +126,7 @@ public class ApplicationTests{
world.beginMapLoad();
for(int x = 0; x < tiles.length; x++){
for(int y = 0; y < tiles[0].length; y++){
tiles[x][y] = new Tile(x, y, (byte)0, (byte)0);
tiles[x][y] = new Tile(x, y);
}
}
world.endMapLoad();
@ -143,7 +144,7 @@ public class ApplicationTests{
if(x == bx && by == y){
assertEquals(world.tile(x, y).block(), Blocks.coreShard);
}else{
assertTrue(world.tile(x, y).block() == Blocks.part && world.tile(x, y).getLinked() == world.tile(bx, by));
assertTrue(world.tile(x, y).block() instanceof BlockPart && world.tile(x, y).link() == world.tile(bx, by));
}
}
}
@ -262,7 +263,7 @@ public class ApplicationTests{
assertEquals(Blocks.copperWallLarge, world.tile(0, 0).block());
assertEquals(Blocks.air, world.tile(2, 2).block());
assertEquals(Blocks.part, world.tile(1, 1).block());
assertTrue(world.tile(1, 1).block() instanceof BlockPart);
}
@Test
@ -335,7 +336,7 @@ public class ApplicationTests{
world.beginMapLoad();
for(int x = 0; x < tiles.length; x++){
for(int y = 0; y < tiles[0].length; y++){
tiles[x][y] = new Tile(x, y, Blocks.stone.id, (byte)0);
tiles[x][y] = new Tile(x, y, Blocks.stone.id, (byte)0, (byte)0);
}
}
int i = 0;
@ -379,9 +380,11 @@ public class ApplicationTests{
void depositTest(Block block, Item item){
BaseUnit unit = UnitTypes.spirit.create(Team.none);
Tile tile = new Tile(0, 0, Blocks.air.id, block.id);
Tile tile = new Tile(0, 0, Blocks.air.id, (byte)0, block.id);
int capacity = tile.block().itemCapacity;
assertNotNull(tile.entity, "Tile should have an entity, but does not: " + tile);
int deposited = tile.block().acceptStack(item, capacity - 1, tile, unit);
assertEquals(capacity - 1, deposited);

20
tests/src/test/java/WorldTests.java
View File

@ -72,10 +72,18 @@ public class WorldTests{
}
}
private static void fillWith(short tileID){
for(int x = 0; x < tiles.length; x++){
for(int y = 0; y < tiles[0].length; y++){
tiles[x][y] = new Tile(x, y, (short)0, (short)0, tileID);
}
}
}
@Test
void addDarknessOneNotSolidMiddleNoDarkness(){
fillWith(Blocks.rocks.id);
tiles[5][5] = new Tile(5, 5, (byte)0, Blocks.copperWall.id, (byte)0, (byte)0);
tiles[5][5] = new Tile(5, 5, (byte)0, (byte)0, Blocks.copperWall.id);
world.addDarkness(tiles);
for(int x = 0; x < tiles.length; x++){
@ -90,7 +98,7 @@ public class WorldTests{
@Test
void addDarknessOneNotSolidCornerNoDarkness(){
fillWith(Blocks.rocks.id);
tiles[7][7] = new Tile(5, 5, (byte)0, Blocks.copperWall.id, (byte)0, (byte)0);
tiles[7][7] = new Tile(5, 5, (byte)0, (byte)0, Blocks.copperWall.id);
world.addDarkness(tiles);
for(int x = 0; x < tiles.length; x++){
@ -101,12 +109,4 @@ public class WorldTests{
}
}
}
private static void fillWith(byte tileID){
for(int x = 0; x < tiles.length; x++){
for(int y = 0; y < tiles[0].length; y++){
tiles[x][y] = new Tile(x, y, (byte)0, tileID, (byte)0, (byte)0);
}
}
}
}