Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add some more log markers for tests

Browse source
This commit is contained in:
Pahimar 2016-05-25 11:29:18 -04:00
parent b70bbe0e23
commit b878506cf3
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/pahimar/ee3/reference/Files.java
View file

@ -22,9 +22,6 @@ public class Files {
public static final String KNOWLEDGE_BLACKLIST_FILENAME = "knowledge-blacklist.json";
public static final String EXCHANGE_BLACKLIST_FILENAME = "exchange-blacklist.json";
public static File abilitiesDataDirectory;
public static File abilitiesDataFile;
public static void init(FMLPreInitializationEvent event) {
globalDataDirectory = new File(event.getModConfigurationDirectory().getParentFile(), "data" + File.separator + Reference.LOWERCASE_MOD_ID);
@ -44,10 +41,6 @@ public class Files {
BlacklistRegistry.knowledgeBlacklistFile = new File(globalDataDirectory, "blacklist" + File.separator + KNOWLEDGE_BLACKLIST_FILENAME);
BlacklistRegistry.exchangeBlacklistFile = new File(globalDataDirectory, "blacklist" + File.separator + EXCHANGE_BLACKLIST_FILENAME);
abilitiesDataDirectory = new File(globalDataDirectory, "abilities");
abilitiesDataDirectory.mkdirs();
abilitiesDataFile = new File(abilitiesDataDirectory, "abilities.json");
}
/**

13
src/main/java/com/pahimar/ee3/test/EnergyValueTestSuite.java
View file

@ -15,8 +15,10 @@ import java.util.*;
public class EnergyValueTestSuite {
public static final Marker TEST_MARKER = MarkerManager.getMarker("EE3_ENERGY_VALUE_TEST", LogHelper.MOD_MARKER);
private static final Marker SUCCESS_MARKER = MarkerManager.getMarker("EE3_ENERGY_VALUE_TEST_SUCCESS", TEST_MARKER);
private static final Marker FAILURE_MARKER = MarkerManager.getMarker("EE3_ENERGY_VALUE_TEST_FAILURE", TEST_MARKER);
private static final Marker SUCCESS_MARKER = MarkerManager.getMarker("EE3_TEST_SUCCESS", TEST_MARKER);
private static final Marker FAILURE_MARKER = MarkerManager.getMarker("EE3_TEST_FAILURE", TEST_MARKER);
private static final Marker FAILURE_WRONG_VALUE_MARKER = MarkerManager.getMarker("EE3_TEST_FAILURE_WRONG_VALUE", FAILURE_MARKER);
private static final Marker FAILURE_NO_VALUE_MARKER = MarkerManager.getMarker("EE3_TEST_FAILURE_NO_VALUE", FAILURE_MARKER);
private Map<WrappedStack, EnergyValue> testSuiteValueMap;
private transient Set<WrappedStack> stacksWithCorrectValue;
@ -111,11 +113,11 @@ public class EnergyValueTestSuite {
}
for (String failureMessage : failureMessagesWrongValue) {
LogHelper.warn(FAILURE_MARKER, failureMessage);
LogHelper.warn(FAILURE_WRONG_VALUE_MARKER, failureMessage);
}
for (String failureMessage : failureMessagesNoValue) {
LogHelper.warn(FAILURE_MARKER, failureMessage);
LogHelper.warn(FAILURE_NO_VALUE_MARKER, failureMessage);
}
}
@ -136,8 +138,7 @@ public class EnergyValueTestSuite {
return this;
}
public EnergyValueTestSuite save(File file) {
public void save(File file) {
SerializationHelper.writeMapToFile(testSuiteValueMap, file);
return this;
}
}