Upstream/SaneEconomy
1
0
Fork 0
mirror of https://github.com/AppleDash/SaneEconomy.git synced 2024-09-27 14:12:58 +02:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors - apparently my last changes were really lazy.

Browse Source
This commit is contained in:
AppleDash 2016-09-18 04:31:31 -04:00
parent f7dfe11358
commit eab9e0774b
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/TransactionReason.java
View File

@ -16,5 +16,9 @@ public enum TransactionReason {
/**
* Another plugin using the API.
*/
PLUGIN
PLUGIN,
/**
* Initial starting balance on join.
*/
STARTING_BALANCE
}

1
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/logger/TransactionLogger.java
View File

@ -10,4 +10,5 @@ import org.appledash.saneeconomy.economy.economable.Economable;
public interface TransactionLogger {
void logAddition(Economable economable, double amount, TransactionReason reason);
void logSubtraction(Economable economable, double amount, TransactionReason reason);
void logTransfer(Economable from, Economable to, double amount, TransactionReason reason);
}

3
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/listeners/JoinQuitListener.java
View File

@ -1,6 +1,7 @@
package org.appledash.saneeconomy.listeners;
import org.appledash.saneeconomy.SaneEconomy;
import org.appledash.saneeconomy.economy.TransactionReason;
import org.appledash.saneeconomy.economy.economable.Economable;
import org.appledash.saneeconomy.updates.GithubVersionChecker;
import org.appledash.saneeconomy.utils.MessageUtils;
@ -28,7 +29,7 @@ public class JoinQuitListener implements Listener {
/* A starting balance is configured AND they haven't been given it yet. */
if ((startBalance > 0) && !plugin.getEconomyManager().accountExists(economable)) {
plugin.getEconomyManager().setBalance(economable, startBalance);
plugin.getEconomyManager().setBalance(economable, startBalance, TransactionReason.STARTING_BALANCE);
MessageUtils.sendMessage(player, "You've been issued a starting balance of %s!", plugin.getEconomyManager().getCurrency().formatAmount(startBalance));
}

11
SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/EconomyManagerTest.java
View File

@ -2,6 +2,7 @@ package org.appledash.saneeconomy.test;
import org.appledash.saneeconomy.economy.Currency;
import org.appledash.saneeconomy.economy.EconomyManager;
import org.appledash.saneeconomy.economy.TransactionReason;
import org.appledash.saneeconomy.economy.economable.Economable;
import org.appledash.saneeconomy.test.mock.MockEconomyStorageBackend;
import org.appledash.saneeconomy.test.mock.MockOfflinePlayer;
@ -27,7 +28,7 @@ public class EconomyManagerTest {
Assert.assertEquals(economyManager.getBalance(playerOne), 0.0D, 0.0);
Assert.assertEquals(economyManager.getBalance(playerTwo), 0.0D, 0.0);
economyManager.setBalance(playerOne, 100.0D);
economyManager.setBalance(playerOne, 100.0D, TransactionReason.PLUGIN);
// Now one should have an account, but two should not
Assert.assertTrue(economyManager.accountExists(playerOne));
@ -45,9 +46,9 @@ public class EconomyManagerTest {
Assert.assertEquals(economyManager.getBalance(playerTwo), 50.0, 0.0);
// Ensure that balance addition and subtraction works...
Assert.assertEquals(economyManager.subtractBalance(playerOne, 25.0), 25.0, 0.0);
Assert.assertEquals(economyManager.addBalance(playerOne, 25.0), 50.0, 0.0);
Assert.assertEquals(economyManager.subtractBalance(playerTwo, Double.MAX_VALUE), 0.0, 0.0);
Assert.assertEquals(economyManager.subtractBalance(playerOne, 25.0, TransactionReason.PLUGIN), 25.0, 0.0);
Assert.assertEquals(economyManager.addBalance(playerOne, 25.0, TransactionReason.PLUGIN), 50.0, 0.0);
Assert.assertEquals(economyManager.subtractBalance(playerTwo, Double.MAX_VALUE, TransactionReason.PLUGIN), 0.0, 0.0);
// Ensure that hasBalance works
Assert.assertTrue(economyManager.hasBalance(playerOne, 50.0));
@ -60,6 +61,6 @@ public class EconomyManagerTest {
public void testNegativeBalance() {
EconomyManager economyManager = new EconomyManager(new Currency("test dollar", "test dollars", new DecimalFormat("0.00")), new MockEconomyStorageBackend());
Economable economable = Economable.wrap(new MockOfflinePlayer("Bob"));
economyManager.setBalance(economable, -1.0);
economyManager.setBalance(economable, -1.0, TransactionReason.PLUGIN);
}
}

5
SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockEconomyStorageBackend.java
View File

@ -17,4 +17,9 @@ public class MockEconomyStorageBackend extends EconomyStorageBackendCaching {
public void reloadDatabase() {
System.out.println("Reloading mock economy database (doing nothing).");
}
@Override
public void waitUntilFlushed() {
// Null op
}
}