ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

PatchImplementationTest: Don't immediately fail upon finding an error

Browse Source
This commit is contained in:
Max Weber
2019-01-15 22:14:43 -07:00
parent a225789f0c
commit c017bd4a36
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/pom.xml
View File

@@ -220,6 +220,12 @@
<version>4.12</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>

3
runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/FarmingWorldTest.java
View File

@@ -21,7 +21,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/package net.runelite.client.plugins.timetracking.farming; */
package net.runelite.client.plugins.timetracking.farming;
import org.junit.Test; import org.junit.Test;

21
runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/PatchImplementationTest.java
View File

@@ -26,11 +26,16 @@ package net.runelite.client.plugins.timetracking.farming;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.junit.Assert; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ErrorCollector;
import static org.hamcrest.Matchers.*;
public class PatchImplementationTest public class PatchImplementationTest
{ {
@Rule
public ErrorCollector collector = new ErrorCollector();
@Test @Test
public void testRange() public void testRange()
{ {
@@ -43,20 +48,20 @@ public class PatchImplementationTest
if (s != null) if (s != null)
{ {
String pfx = impl.name() + "[" + i + "]"; String pfx = impl.name() + "[" + i + "]";
Assert.assertNotNull(pfx + ": null cropState", s.getCropState()); collector.checkThat(pfx + ": cropState", s.getCropState(), notNullValue());
Assert.assertNotNull(pfx + ": null produce", s.getProduce()); collector.checkThat(pfx + ": produce", s.getProduce(), notNullValue());
Assert.assertTrue(pfx + ": " + s.getStage() + " < 0", s.getStage() >= 0); collector.checkThat(pfx + ": negative stage", s.getStage(), greaterThanOrEqualTo(0));
int stages = s.getProduce().getStages(); int stages = s.getProduce().getStages();
if (s.getCropState() == CropState.HARVESTABLE) if (s.getCropState() == CropState.HARVESTABLE)
{ {
stages = s.getProduce().getHarvestStages(); stages = s.getProduce().getHarvestStages();
} }
Assert.assertTrue(pfx + ": " + s.getStage() + " >= " + stages, s.getStage() < stages); collector.checkThat(pfx + ": out of bounds stage", s.getStage(), lessThan(stages));
if (s.getCropState() == CropState.DEAD || s.getCropState() == CropState.DISEASED) if (s.getCropState() == CropState.DEAD || s.getCropState() == CropState.DISEASED)
{ {
Assert.assertTrue(pfx + ": dead seed", s.getStage() > 0); collector.checkThat(pfx + ": dead seed", s.getStage(), greaterThan(0));
} }
if (s.getCropState() == CropState.GROWING && s.getProduce() != Produce.WEEDS) if (s.getCropState() == CropState.GROWING && s.getProduce() != Produce.WEEDS && s.getStage() < stages)
{ {
harvestStages.computeIfAbsent(s.getProduce(), k -> new boolean[s.getProduce().getStages()])[s.getStage()] = true; harvestStages.computeIfAbsent(s.getProduce(), k -> new boolean[s.getProduce().getStages()])[s.getStage()] = true;
} }
@@ -69,7 +74,7 @@ public class PatchImplementationTest
// Alot of time the final stage is not hit, because some plants do not have a "Check-health" stage // Alot of time the final stage is not hit, because some plants do not have a "Check-health" stage
for (int i = 0; i < states.length - 1; i++) for (int i = 0; i < states.length - 1; i++)
{ {
Assert.assertTrue(produce.getKey().getName() + " stage " + i + " never found by varbit", states[i]); collector.checkThat(produce.getKey().getName() + " stage " + i + " never found by varbit", states[i], is(true));
} }
} }
} }