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

More fixing of energy value tests

Browse source
This commit is contained in:
Pahimar 2016-05-25 11:17:10 -04:00
parent 7cace9895a
commit b70bbe0e23
3 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/com/pahimar/ee3/command/CommandRunTest.java
View file

@ -15,29 +15,26 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class CommandRunTest extends CommandEE
{
public class CommandRunTest extends CommandEE {
@Override
public String getCommandName()
{
public String getCommandName() {
return Names.Commands.RUN_TEST;
}
@Override
public int getRequiredPermissionLevel()
{
public int getRequiredPermissionLevel() {
return 2;
}
@Override
public String getCommandUsage(ICommandSender commandSender)
{
public String getCommandUsage(ICommandSender commandSender) {
return Messages.Commands.RUN_TEST_USAGE;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
{
public void processCommand(ICommandSender commandSender, String[] args) {
if (args.length == 2) {
boolean testFound = false;
@ -64,27 +61,26 @@ public class CommandRunTest extends CommandEE
throw new WrongUsageException(Messages.Commands.RUN_TEST_USAGE);
}
}
else
{
else {
throw new WrongUsageException(Messages.Commands.RUN_TEST_USAGE);
}
}
@Override
public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
{
if (args.length == 2)
{
public List addTabCompletionOptions(ICommandSender commandSender, String[] args) {
if (args.length == 2) {
File testCaseDirectory = new File(FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory(), "data" + File.separator + Reference.LOWERCASE_MOD_ID + File.separator + "energyvalues" + File.separator + "testcases");
testCaseDirectory.mkdirs();
ArrayList<String> fileNames = new ArrayList<String>();
ArrayList<String> fileNames = new ArrayList<>();
for (File testCaseFile : testCaseDirectory.listFiles())
{
if (testCaseFile.isFile() && testCaseFile.getAbsolutePath().endsWith(".json"))
{
fileNames.add(testCaseFile.getName());
if (Tests.globalTestDirectory != null) {
for (File testCaseFile : Tests.globalTestDirectory.listFiles()) {
if (testCaseFile.isFile() && testCaseFile.getAbsolutePath().endsWith(".json")) {
fileNames.add(testCaseFile.getName());
}
}
}

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

@ -30,6 +30,7 @@ public class Files {
globalDataDirectory = new File(event.getModConfigurationDirectory().getParentFile(), "data" + File.separator + Reference.LOWERCASE_MOD_ID);
Tests.globalTestDirectory = new File(globalDataDirectory, "tests");
Tests.globalTestDirectory.mkdirs();
Tests.VANILLA_TEST_SUITE.save();
EnergyValueRegistry.energyValuesDirectory = new File(globalDataDirectory, "energy-values");
EnergyValueRegistry.energyValuesDirectory.mkdirs();

4
src/main/java/com/pahimar/ee3/reference/Tests.java
View file

@ -1,12 +1,12 @@
package com.pahimar.ee3.reference;
import com.pahimar.ee3.test.EnergyValueTestSuite;
import com.pahimar.ee3.test.VanillaTestSuite;
import java.io.File;
public class Tests {
public static File globalTestDirectory;
public static final EnergyValueTestSuite VANILLA_TEST_SUITE = new VanillaTestSuite();
public static final VanillaTestSuite VANILLA_TEST_SUITE = new VanillaTestSuite();
}