From 96d95f55e164d047b5778eaa6b186c7302520a3d Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Mon, 15 Apr 2024 00:15:22 -0500
Subject: [PATCH] Additional unit test functions for rings

---
 .../lotro/cards/GenericCardTestHelper.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
index 38bb03cf7..48d033758 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
@@ -168,6 +168,14 @@ public class GenericCardTestHelper extends AbstractAtTest {
                 .findFirst().orElse(null);
     }
 
+    public PhysicalCardImpl GetFreepsRing() {
+        return (PhysicalCardImpl)_game.getGameState().getRing(P1);
+    }
+    public PhysicalCardImpl GetShadowRing() {
+        return (PhysicalCardImpl)_game.getGameState().getRing(P2);
+    }
+    public PhysicalCardImpl GetRingBearer() { return (PhysicalCardImpl)_game.getGameState().getRingBearer(P1); }
+    public PhysicalCardImpl GetShadowRingBearer() { return (PhysicalCardImpl)_game.getGameState().getRingBearer(P2); }
     public PhysicalCardImpl GetFreepsSite(int siteNum) { return GetSite(P1, siteNum); }
     public PhysicalCardImpl GetShadowSite(int siteNum) { return GetSite(P2, siteNum); }
     public PhysicalCardImpl GetSite(String playerID, int siteNum)
@@ -628,8 +636,6 @@ public class GenericCardTestHelper extends AbstractAtTest {
 
     public int GetMoveCount() { return _game.getGameState().getMoveCount(); }
 
-    public PhysicalCardImpl GetRingBearer() { return (PhysicalCardImpl)_game.getGameState().getRingBearer(P1); }
-
     public boolean RBWearingOneRing() { return _game.getGameState().isWearingRing(); }
     public PhysicalCardImpl GetCurrentSite() { return (PhysicalCardImpl)_game.getGameState().getCurrentSite(); }
 
@@ -1052,7 +1058,7 @@ public class GenericCardTestHelper extends AbstractAtTest {
         }
         while(ShadowDecisionAvailable("discard down"))
         {
-            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().get(0));
+            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().getFirst());
         }
         if(FreepsDecisionAvailable("another move"))
         {
@@ -1064,7 +1070,7 @@ public class GenericCardTestHelper extends AbstractAtTest {
         }
         if(FreepsDecisionAvailable("discard down"))
         {
-            FreepsChooseCard((PhysicalCardImpl) GetFreepsHand().get(0));
+            FreepsChooseCard((PhysicalCardImpl) GetFreepsHand().getFirst());
         }
 
         //Shadow player
@@ -1077,7 +1083,7 @@ public class GenericCardTestHelper extends AbstractAtTest {
         }
         if(FreepsDecisionAvailable("discard down"))
         {
-            FreepsChooseCard((PhysicalCardImpl) GetFreepsHand().get(0));
+            FreepsChooseCard((PhysicalCardImpl) GetFreepsHand().getFirst());
         }
         if(ShadowDecisionAvailable("another move"))
         {
@@ -1089,7 +1095,7 @@ public class GenericCardTestHelper extends AbstractAtTest {
         }
         if(ShadowDecisionAvailable("discard down"))
         {
-            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().get(0));
+            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().getFirst());
         }
 
         Assert.assertTrue(GetCurrentPhase() == Phase.BETWEEN_TURNS