fix match key validation for 2023 CMP double elim matches (#979)

the-blue-alliance · Jan 15, 2024 · 584359b · 584359b
1 parent 586016b
commit 584359b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/android/src/main/java/com/thebluealliance/androidclient/helpers/MatchHelper.java b/android/src/main/java/com/thebluealliance/androidclient/helpers/MatchHelper.java
@@ -28,7 +28,7 @@ private MatchHelper() {
     public static boolean validateMatchKey(String key) {
         if (key == null || key.isEmpty()) return false;
 
-        return key.matches("^[1-9]\\d{3}[a-z,0-9]+_(?:qm|ef\\dm|qf\\dm|sf\\dm|f\\dm)\\d+$");
+        return key.matches("^[1-9]\\d{3}[a-z,0-9]+_(?:qm|ef\\d+m|qf\\d+m|sf\\d+m|f\\d+m)\\d+$");
     }
 
     public static String getEventKeyFromMatchKey(String matchKey) {

diff --git a/android/src/test/java/com/thebluealliance/androidclient/helpers/MatchHelperTest.java b/android/src/test/java/com/thebluealliance/androidclient/helpers/MatchHelperTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -46,6 +47,15 @@ public void testGetScore() {
         assertEquals(0, Match.getBlueScore(mMatch.getAlliances()).intValue());
     }
 
+    @Test
+    public void testValidateMatchKey() {
+        assertTrue(MatchHelper.validateMatchKey("2016cthar_qm1"));
+        assertTrue(MatchHelper.validateMatchKey("2016cmpmi_ef1m2"));
+        assertTrue(MatchHelper.validateMatchKey("2016cmpmi_sf1m3"));
+        assertTrue(MatchHelper.validateMatchKey("2016cthar_qf1m2"));
+        assertTrue(MatchHelper.validateMatchKey("2023cmptx_sf10m1"));
+    }
+
     @Test
     public void testEventKeyFromMatchKey() {
         assertEquals(MatchHelper.getEventKeyFromMatchKey("2015cthar_f1m1"), "2015cthar");