diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 2b4f9ec7f1..b2847da18f 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -328,8 +328,7 @@ public class ItemManager { return wikiPrice; } - int d = jagPrice - (int) (jagPrice * activePriceThreshold); - return wikiPrice >= jagPrice - d && wikiPrice <= jagPrice + d ? wikiPrice : jagPrice; + return wikiPrice < jagPrice * activePriceThreshold ? wikiPrice : jagPrice; } /** diff --git a/runelite-client/src/test/java/net/runelite/client/game/ItemManagerTest.java b/runelite-client/src/test/java/net/runelite/client/game/ItemManagerTest.java new file mode 100644 index 0000000000..dfcc12242b --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/game/ItemManagerTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2022, Adam + * 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.game; + +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.testing.fieldbinder.Bind; +import com.google.inject.testing.fieldbinder.BoundFieldModule; +import java.util.concurrent.ScheduledExecutorService; +import javax.inject.Named; +import net.runelite.api.Client; +import net.runelite.api.ItemID; +import net.runelite.client.callback.ClientThread; +import net.runelite.client.config.RuneLiteConfig; +import net.runelite.http.api.item.ItemPrice; +import static org.junit.Assert.assertEquals; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class ItemManagerTest +{ + @Inject + private ItemManager itemManager; + + @Mock + @Bind + private Client client; + + @Mock + @Bind + private ScheduledExecutorService scheduledExecutorService; + + @Mock + @Bind + private ClientThread clientThread; + + @Mock + @Bind + private ItemClient itemClient; + + @Mock + @Bind + private RuneLiteConfig runeLiteConfig; + + @Bind + @Named("activePriceThreshold") + private double activePriceThreshold = 5; + + @Bind + @Named("lowPriceThreshold") + private int lowPriceThreshold = 1000; + + @Before + public void before() + { + Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); + } + + @Test + public void testGetWikiPrice() + { + ItemPrice itemPrice = new ItemPrice(); + itemPrice.setId(ItemID.YEW_SEED); + itemPrice.setName("Yew seed"); + itemPrice.setPrice(47_975); + itemPrice.setWikiPrice(50_754); + assertEquals(itemPrice.getWikiPrice(), itemManager.getWikiPrice(itemPrice)); + + itemPrice.setWikiPrice(300_000); // outside of 5x range + assertEquals(itemPrice.getPrice(), itemManager.getWikiPrice(itemPrice)); + } +} \ No newline at end of file