Rework photo bounds parsing, move bounds tests

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Photos.cs

@@ -47,8 +47,6 @@ public GamePhoto UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject
             PublishedAt = this._time.Now,
         };
 
-        float[] bounds = new float[PhotoHelper.SubjectBoundCount];
-
         List<GamePhotoSubject> gameSubjects = new(subjects.Count());
         foreach (IPhotoUploadSubject subject in subjects)
         {
@@ -57,7 +55,7 @@ public GamePhoto UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject
             if (!string.IsNullOrEmpty(subject.Username)) 
                 subjectUser = this.GetUserByUsername(subject.Username);
 
-            PhotoHelper.ParseBoundsList(subject.BoundsList, bounds);
+            float[] bounds = PhotoHelper.ParseBoundsList(subject.BoundsList);
 
             gameSubjects.Add(new GamePhotoSubject(subjectUser, subject.DisplayName, bounds));
 

Refresh.Database/Helpers/PhotoHelper.cs

@@ -4,30 +4,29 @@ namespace Refresh.Database.Helpers;
 
 public abstract class PhotoHelper
 {
-    public const byte SubjectBoundCount = 4;
+    public const byte SubjectBoundaryCount = 4;
 
-    public static void ParseBoundsList(ReadOnlySpan<char> input, float[] floats)
+    public static float[] ParseBoundsList(string input)
     {
-        byte start = 0;
-        byte floatIndex = 0;
+        if (string.IsNullOrWhiteSpace(input))
+            throw new ArgumentException($"Bounds are empty");
 
-        for (byte i = 0; i < input.Length; i++)
+        string[] boundsStr = input.Split(',');
+        if (boundsStr.Length != SubjectBoundaryCount)
+            throw new ArgumentException($"Number of bounds is invalid ({boundsStr.Length} instead of {SubjectBoundaryCount})");
+
+        float[] boundsParsed = new float[SubjectBoundaryCount];
+        for (int i = 0; i < SubjectBoundaryCount; i++)
         {
-            if(floatIndex == SubjectBoundCount - 1) break; // won't catch the last float - not worth reading
-            if (input[i] != ',') continue;
-            
-            if (!float.TryParse(input.Slice(start, i - start), NumberFormatInfo.InvariantInfo, out float f))
-                throw new FormatException("Invalid format");
-                
-            floats[floatIndex] = f;
-            floatIndex++;
-            start = (byte)(i + 1);
+            // No OutOfRangeExceptions as both arrays are ensured to be as long as the constant
+            string boundaryStr = boundsStr[i];
+
+            if (!float.TryParse(boundaryStr, NumberFormatInfo.InvariantInfo, out float f))
+                throw new FormatException($"Boundary {boundaryStr} ({i+1}/{SubjectBoundaryCount}) is not a float");
+
+            boundsParsed[i] = f;
         }
-        
-        // parse the last float value - bounds does not end with comma
-        if (!float.TryParse(input[start..], NumberFormatInfo.InvariantInfo, out float lastFloat))
-            throw new FormatException("Invalid format");
 
-        floats[SubjectBoundCount - 1] = lastFloat;
+        return boundsParsed;
     }
 }

RefreshTests.GameServer/Tests/Parsing/PhotoBoundsTests.cs

@@ -0,0 +1,47 @@
+using Refresh.Database.Helpers;
+
+namespace RefreshTests.GameServer.Tests.Photos;
+
+public class PhotoBoundsTests
+{
+    [Test]
+    public void ParsesBounds()
+    {
+        string bounds = "0.652369,0.710704,0.838377,0.997791";
+        float[] floats = PhotoHelper.ParseBoundsList(bounds);
+
+#pragma warning disable NUnit2045
+        Assert.That(floats.Length, Is.EqualTo(4));
+        Assert.That(floats[0], Is.EqualTo(0.652369f));
+        Assert.That(floats[1], Is.EqualTo(0.710704f));
+        Assert.That(floats[2], Is.EqualTo(0.838377f));
+        Assert.That(floats[3], Is.EqualTo(0.997791f));
+#pragma warning restore NUnit2045
+    }
+
+    [Test]
+    public void CatchesInvalidFloats()
+    {
+        const string bounds1 = "0.652369,0.71a0704,0.838377,0.997791";
+        const string bounds2 = "0.652369,0.710704,0.838377,0.9977a91";
+        
+        Assert.Multiple(() =>
+        {
+            Assert.That(() => PhotoHelper.ParseBoundsList(bounds1), Throws.TypeOf<FormatException>());
+            Assert.That(() => PhotoHelper.ParseBoundsList(bounds2), Throws.TypeOf<FormatException>());
+        });
+    }
+
+    [Test]
+    public void CatchesInvalidLength()
+    {
+        const string bounds1 = "0.652369,0.710704,0.838377,0.997791,1.0,2.0,67.0";
+        const string bounds2 = "0.652369";
+        
+        Assert.Multiple(() =>
+        {
+            Assert.That(() => PhotoHelper.ParseBoundsList(bounds1), Throws.TypeOf<ArgumentException>());
+            Assert.That(() => PhotoHelper.ParseBoundsList(bounds2), Throws.TypeOf<ArgumentException>());
+        });
+    }
+}