diff --git a/runelite-api/src/main/java/net/runelite/api/Prayer.java b/runelite-api/src/main/java/net/runelite/api/Prayer.java index 254c8102b7..6d94c9bebc 100644 --- a/runelite-api/src/main/java/net/runelite/api/Prayer.java +++ b/runelite-api/src/main/java/net/runelite/api/Prayer.java @@ -125,10 +125,6 @@ public enum Prayer * Smite (Level 52). */ SMITE(Varbits.PRAYER_SMITE), - /** - * Preserve (Level 55). - */ - PRESERVE(Varbits.PRAYER_PRESERVE), /** * Chivalry (Level 60, Defence/Strength/Attack). */ @@ -137,6 +133,10 @@ public enum Prayer * Piety (Level 70, Defence/Strength/Attack). */ PIETY(Varbits.PRAYER_PIETY), + /** + * Preserve (Level 55). + */ + PRESERVE(Varbits.PRAYER_PRESERVE), /** * Rigour (Level 74, Ranging/Damage/Defence). */ diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java new file mode 100644 index 0000000000..68caebae42 --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2018, 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.plugins.reorderprayers; + +import net.runelite.api.Prayer; +import static net.runelite.api.Prayer.*; +import static org.junit.Assert.*; +import org.junit.Test; + +public class ReorderPrayersPluginTest +{ + private static final Prayer[] PRAYER_ORDER = new Prayer[]{ + THICK_SKIN, + BURST_OF_STRENGTH, + CLARITY_OF_THOUGHT, + SHARP_EYE, + MYSTIC_WILL, + ROCK_SKIN, + SUPERHUMAN_STRENGTH, + IMPROVED_REFLEXES, + RAPID_RESTORE, + RAPID_HEAL, + PROTECT_ITEM, + HAWK_EYE, + MYSTIC_LORE, + STEEL_SKIN, + ULTIMATE_STRENGTH, + INCREDIBLE_REFLEXES, + PROTECT_FROM_MAGIC, + PROTECT_FROM_MISSILES, + PROTECT_FROM_MELEE, + EAGLE_EYE, + MYSTIC_MIGHT, + RETRIBUTION, + REDEMPTION, + SMITE, + CHIVALRY, + PIETY, + PRESERVE, + RIGOUR, + AUGURY + }; + + @Test + public void testPrayerOrder() + { + // the reorder prayers plugin depends on the Prayer enum order + assertArrayEquals(Prayer.values(), PRAYER_ORDER); + } +} \ No newline at end of file