From ee35fd9e3721d79bafb2366e820154db3e10200d Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Sat, 18 Sep 2021 12:17:28 +0100 Subject: [PATCH] FIX to recognise SB as Sideboard placeholder Signed-off-by: leriomaggio --- forge-core/src/main/java/forge/deck/DeckRecognizer.java | 4 ++-- .../src/test/java/forge/deck/DeckRecognizerTest.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index 4173cea58ff..06f04448628 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -87,8 +87,8 @@ public class DeckRecognizer { } public static Token DeckSection(final String sectionName0){ - String sectionName = sectionName0.toLowerCase(); - if (sectionName.equals("side") || sectionName.contains("sideboard")) + String sectionName = sectionName0.toLowerCase().trim(); + if (sectionName.equals("side") || sectionName.contains("sideboard") || sectionName.equals("sb")) return new Token(TokenType.DECK_SECTION_NAME, DeckSection.Sideboard.name()); if (sectionName.equals("main") || sectionName.contains("card") || sectionName.equals("mainboard") || sectionName.equals("deck")) diff --git a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java index 1ad39134d51..c35dba2c0a2 100644 --- a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java +++ b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java @@ -242,6 +242,12 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase { @Test void testSBshortAsPlaceholderForSideboard(){ String dckSec = "SB:"; assertTrue(DeckRecognizer.isDeckSectionName(dckSec)); + + DeckRecognizer recognizer = new DeckRecognizer(); + Token token = recognizer.recogniseNonCardToken(dckSec); + assertNotNull(token); + assertEquals(token.getType(), TokenType.DECK_SECTION_NAME); + assertEquals(token.getText(), "Sideboard"); } @Test void testMatchCardTypes(){