farming: Fix contract status for plots with diseased/dead crops
This commit fixes the farming contract manager's behavior when encountering crops which have become diseased. Previously, it would not take this into account and incorrectly report the crop as IN_PROGRESS or READY.
This commit is contained in:
Cyborger1
Jordan Atwood
@@ -82,9 +82,23 @@ class FarmingContractInfoBox extends InfoBox
|
||||
contractColor = ColorScheme.PROGRESS_ERROR_COLOR;
|
||||
break;
|
||||
case IN_PROGRESS:
|
||||
contractDescription = "Ready " + TabContentPanel.getFormattedEstimate(manager.getCompletionTime() - Instant.now().getEpochSecond(),
|
||||
config.timeFormatMode());
|
||||
contractColor = Color.GRAY;
|
||||
CropState cropState = manager.getContractCropState();
|
||||
switch (cropState)
|
||||
{
|
||||
case DISEASED:
|
||||
contractDescription = "Diseased";
|
||||
contractColor = cropState.getColor();
|
||||
break;
|
||||
case DEAD:
|
||||
contractDescription = "Dead";
|
||||
contractColor = cropState.getColor();
|
||||
break;
|
||||
default:
|
||||
contractDescription = "Ready " + TabContentPanel.getFormattedEstimate(manager.getCompletionTime() - Instant.now().getEpochSecond(),
|
||||
config.timeFormatMode());
|
||||
contractColor = Color.GRAY;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EMPTY:
|
||||
case UNKNOWN:
|
||||
|
||||
@@ -58,6 +58,9 @@ public class FarmingContractManager
|
||||
@Getter
|
||||
private SummaryState summary = SummaryState.UNKNOWN;
|
||||
|
||||
@Getter
|
||||
private CropState contractCropState;
|
||||
|
||||
@Inject
|
||||
private Client client;
|
||||
|
||||
@@ -229,7 +232,10 @@ public class FarmingContractManager
|
||||
PatchImplementation patchImplementation = contract.getPatchImplementation();
|
||||
|
||||
boolean hasEmptyPatch = false;
|
||||
boolean hasDiseasedPatch = false;
|
||||
boolean hasDeadPatch = false;
|
||||
completionTime = Long.MAX_VALUE;
|
||||
contractCropState = null;
|
||||
for (FarmingPatch patch : farmingWorld.getFarmingGuildRegion().getPatches())
|
||||
{
|
||||
if (patch.getImplementation() != patchImplementation)
|
||||
@@ -244,17 +250,22 @@ public class FarmingContractManager
|
||||
}
|
||||
|
||||
Produce produce = prediction.getProduce();
|
||||
CropState state = prediction.getCropState();
|
||||
if (completionTime == Long.MAX_VALUE)
|
||||
{
|
||||
if (produce == null || produce == Produce.WEEDS)
|
||||
{
|
||||
summary = SummaryState.EMPTY;
|
||||
// Don't report the empty state if there's a dead or diseased one
|
||||
if (!(hasDiseasedPatch || hasDeadPatch))
|
||||
{
|
||||
summary = SummaryState.EMPTY;
|
||||
}
|
||||
hasEmptyPatch = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((contract.requiresHealthCheck() && prediction.getCropState() == CropState.HARVESTABLE)
|
||||
&& !hasEmptyPatch)
|
||||
if ((contract.requiresHealthCheck() && state == CropState.HARVESTABLE)
|
||||
&& !(hasEmptyPatch || hasDiseasedPatch || hasDeadPatch))
|
||||
{
|
||||
summary = SummaryState.OCCUPIED;
|
||||
// Don't let this run into the "Completed" section!
|
||||
@@ -262,27 +273,53 @@ public class FarmingContractManager
|
||||
}
|
||||
}
|
||||
|
||||
if (produce != contract)
|
||||
// Herbs always turn into ANYHERB when dead, so let them through.
|
||||
if (produce != contract && produce != Produce.ANYHERB)
|
||||
{
|
||||
if (!hasEmptyPatch && completionTime == Long.MAX_VALUE)
|
||||
if (!(hasEmptyPatch || hasDiseasedPatch || hasDeadPatch) && completionTime == Long.MAX_VALUE)
|
||||
{
|
||||
summary = SummaryState.OCCUPIED;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
long estimatedTime = Math.min(prediction.getDoneEstimate(), completionTime);
|
||||
|
||||
if (estimatedTime <= Instant.now().getEpochSecond())
|
||||
// Ignore if crop is dead but there's another one in progress (either normal or diseased)
|
||||
if (state == CropState.DEAD && (hasDiseasedPatch || completionTime != Long.MAX_VALUE))
|
||||
{
|
||||
summary = SummaryState.COMPLETED;
|
||||
completionTime = 0;
|
||||
break;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Ignore if crop is diseased but there's another patch in progress
|
||||
if (state == CropState.DISEASED && completionTime != Long.MAX_VALUE)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
contractCropState = state;
|
||||
if (contractCropState == CropState.DISEASED)
|
||||
{
|
||||
hasDiseasedPatch = true;
|
||||
summary = SummaryState.IN_PROGRESS;
|
||||
}
|
||||
else if (contractCropState == CropState.DEAD)
|
||||
{
|
||||
hasDeadPatch = true;
|
||||
summary = SummaryState.IN_PROGRESS;
|
||||
}
|
||||
else
|
||||
{
|
||||
summary = SummaryState.IN_PROGRESS;
|
||||
completionTime = estimatedTime;
|
||||
long estimatedTime = Math.min(prediction.getDoneEstimate(), completionTime);
|
||||
if (estimatedTime <= Instant.now().getEpochSecond())
|
||||
{
|
||||
summary = SummaryState.COMPLETED;
|
||||
completionTime = 0;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
summary = SummaryState.IN_PROGRESS;
|
||||
completionTime = estimatedTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,577 @@
|
||||
/*
|
||||
* Copyright (c) 2020 Cyborger1
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.client.plugins.timetracking.farming;
|
||||
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.testing.fieldbinder.Bind;
|
||||
import com.google.inject.testing.fieldbinder.BoundFieldModule;
|
||||
import java.time.Instant;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import javax.inject.Inject;
|
||||
import net.runelite.api.Client;
|
||||
import net.runelite.api.Varbits;
|
||||
import net.runelite.client.Notifier;
|
||||
import net.runelite.client.config.ConfigManager;
|
||||
import net.runelite.client.game.ItemManager;
|
||||
import net.runelite.client.plugins.timetracking.SummaryState;
|
||||
import net.runelite.client.plugins.timetracking.TimeTrackingConfig;
|
||||
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import org.mockito.Mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class FarmingContractManagerTest
|
||||
{
|
||||
private Map<Varbits, FarmingPatch> farmingGuildPatches = new EnumMap<>(Varbits.class);
|
||||
|
||||
@Inject
|
||||
private FarmingContractManager farmingContractManager;
|
||||
|
||||
@Inject
|
||||
private FarmingWorld farmingWorld;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private TimeTrackingConfig config;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private Client client;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private FarmingTracker farmingTracker;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private ConfigManager configManager;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private Notifier notifier;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private ItemManager itemManager;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private InfoBoxManager infoBoxManager;
|
||||
|
||||
@Mock
|
||||
@Bind
|
||||
private ScheduledExecutorService executor;
|
||||
|
||||
@Before
|
||||
public void before()
|
||||
{
|
||||
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
|
||||
|
||||
for (FarmingPatch p : farmingWorld.getFarmingGuildRegion().getPatches())
|
||||
{
|
||||
farmingGuildPatches.put(p.getVarbit(), p);
|
||||
}
|
||||
|
||||
// Consider all patches to be empty by default
|
||||
when(farmingTracker.predictPatch(any(FarmingPatch.class)))
|
||||
.thenReturn(new PatchPrediction(null, null, 0, 0, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndCabbageHarvestable()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.COMPLETED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndPotatoHarvestable()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.POTATO, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.OCCUPIED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndEmptyPatch()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.EMPTY, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndCabbageGrowing()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expectedTime = unixNow + 60;
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(
|
||||
Produce.CABBAGE, CropState.GROWING, expectedTime, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.GROWING, farmingContractManager.getContractCropState());
|
||||
assertEquals(expectedTime, farmingContractManager.getCompletionTime());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndCabbageDiseased()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DISEASED, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DISEASED, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractOnionHarvestableAndCabbageDead()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.ONION, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DEAD, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageGrowingAndCabbageDead()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expected = unixNow + 60;
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.GROWING, expected, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageHarvestableAndCabbageDead()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DEAD, 0, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.COMPLETED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractTwoCabbagesGrowing()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expected1 = unixNow + 60;
|
||||
final long expected2 = unixNow + 120;
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.GROWING, expected1, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.GROWING, expected2, 1, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.GROWING, farmingContractManager.getContractCropState());
|
||||
// Prefer closest estimated time
|
||||
assertEquals(expected1, farmingContractManager.getCompletionTime());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageGrowingAndCabbageDiseased()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expectedTime = unixNow + 60;
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DISEASED, 0, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.GROWING, expectedTime, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
// Prefer healthy cabbages
|
||||
assertEquals(CropState.GROWING, farmingContractManager.getContractCropState());
|
||||
assertEquals(expectedTime, farmingContractManager.getCompletionTime());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageDiseasedAndCabbageGrowing()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expectedTime = unixNow + 60;
|
||||
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.GROWING, expectedTime, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DISEASED, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
// Prefer healthy cabbages
|
||||
assertEquals(CropState.GROWING, farmingContractManager.getContractCropState());
|
||||
assertEquals(expectedTime, farmingContractManager.getCompletionTime());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageDeadAndCabbageDiseased()
|
||||
{
|
||||
// Get the two allotment patches
|
||||
final FarmingPatch patch1 = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
final FarmingPatch patch2 = farmingGuildPatches.get(Varbits.FARMING_4774);
|
||||
|
||||
assertNotNull(patch1);
|
||||
assertNotNull(patch2);
|
||||
|
||||
// Specify the two allotment patches
|
||||
when(farmingTracker.predictPatch(patch1))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DISEASED, 0, 2, 3));
|
||||
when(farmingTracker.predictPatch(patch2))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
// Prefer diseased cabbages
|
||||
assertEquals(CropState.DISEASED, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageHarvestableAndEmptyPatch()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.COMPLETED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageDiseasedAndEmptyPatch()
|
||||
{
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DISEASED, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DISEASED, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cabbageContractCabbageDeadAndEmptyPatch()
|
||||
{
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4773);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.CABBAGE, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.CABBAGE);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DEAD, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractRedberriesHarvestable()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
// For berries, Harvestable means already checked
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.REDBERRIES, CropState.HARVESTABLE, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
|
||||
assertEquals(SummaryState.OCCUPIED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractRedberriesGrown()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
// For berries, Growing on the last stage is ready to be checked
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.REDBERRIES, CropState.GROWING, unixNow, 3, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
|
||||
assertEquals(SummaryState.COMPLETED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractRedberriesGrowing()
|
||||
{
|
||||
final long unixNow = Instant.now().getEpochSecond();
|
||||
final long expectedCompletion = unixNow + 60;
|
||||
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
// Not ready to check
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.REDBERRIES, CropState.GROWING, expectedCompletion, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.GROWING, farmingContractManager.getContractCropState());
|
||||
assertEquals(expectedCompletion, farmingContractManager.getCompletionTime());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractRedberriesDiseased()
|
||||
{
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.REDBERRIES, CropState.DISEASED, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DISEASED, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractRedberriesDead()
|
||||
{
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.REDBERRIES, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DEAD, farmingContractManager.getContractCropState());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void redberriesContractCadavaDead()
|
||||
{
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4772);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.CADAVABERRIES, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.REDBERRIES);
|
||||
assertEquals(SummaryState.OCCUPIED, farmingContractManager.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void guamContractGuamDead()
|
||||
{
|
||||
// Get the bush patch
|
||||
final FarmingPatch patch = farmingGuildPatches.get(Varbits.FARMING_4775);
|
||||
|
||||
assertNotNull(patch);
|
||||
|
||||
when(farmingTracker.predictPatch(patch))
|
||||
.thenReturn(new PatchPrediction(Produce.GUAM, CropState.DEAD, 0, 2, 3));
|
||||
|
||||
farmingContractManager.setContract(Produce.GUAM);
|
||||
|
||||
assertEquals(SummaryState.IN_PROGRESS, farmingContractManager.getSummary());
|
||||
assertEquals(CropState.DEAD, farmingContractManager.getContractCropState());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user