From 9d214a77d703882576c14941dfc1cdb18cd15005 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 27 Aug 2019 19:37:13 -0400
Subject: [PATCH] Test fixes

---
 tests/src/test/java/ApplicationTests.java     |  1 +
 .../src/test/java/power/PowerTestFixture.java | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 39bce8ba6d..6661a11769 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -43,6 +43,7 @@ public class ApplicationTests{
                 public void setup(){
                     headless = true;
                     Vars.init();
+                    content.createContent();
 
                     add(logic = new Logic());
                     add(netServer = new NetServer());
diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java
index 65db8775fa..8afe8115e2 100644
--- a/tests/src/test/java/power/PowerTestFixture.java
+++ b/tests/src/test/java/power/PowerTestFixture.java
@@ -1,21 +1,19 @@
 package power;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.core.ContentLoader;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.PowerBlock;
-import io.anuke.mindustry.world.blocks.power.Battery;
-import io.anuke.mindustry.world.blocks.power.PowerGenerator;
+import io.anuke.arc.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.*;
+import io.anuke.mindustry.world.blocks.power.*;
 import io.anuke.mindustry.world.modules.*;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.*;
 
-import java.lang.reflect.Field;
+import java.lang.reflect.*;
+
+import static io.anuke.mindustry.Vars.content;
 
 /**
  * This class provides objects commonly used by power related unit tests.
@@ -24,14 +22,12 @@ import java.lang.reflect.Field;
  * Note: All tests which subclass this will run with a fixed delta of 0.5!
  */
 public class PowerTestFixture{
-    public static final float smallRoundingTolerance = Mathf.FLOAT_ROUNDING_ERROR;
-    public static final float mediumRoundingTolerance = Mathf.FLOAT_ROUNDING_ERROR * 10;
-    public static final float highRoundingTolerance = Mathf.FLOAT_ROUNDING_ERROR * 100;
 
     @BeforeAll
     static void initializeDependencies(){
         Core.graphics = new FakeGraphics();
         Vars.content = new ContentLoader();
+        content.createContent();
         Log.setUseColors(false);
         Time.setDeltaProvider(() -> 0.5f);
     }