Merge pull request #57 from bdach/object-count-limits

Author: peppy

osu.Server.BeatmapSubmission.Tests/ValidationTest.cs

@@ -32,5 +32,32 @@ public void TestValidationRange()
 
             Assert.False(success);
         }
+
+        [Fact]
+        public void TestObjectCounts()
+        {
+            var beatmap = new osu_beatmap
+            {
+                beatmap_id = 100000,
+                filename = "100000.osu",
+                checksum = "deadbeef",
+                version = "a version",
+                diff_drain = 5,
+                diff_size = 5,
+                diff_overall = 5,
+                diff_approach = 5,
+                bpm = 120,
+                countNormal = ushort.MaxValue + 1,
+                countSlider = ushort.MaxValue + 1,
+                countSpinner = ushort.MaxValue + 1,
+                playmode = 1,
+            };
+
+            var errors = new List<ValidationResult>();
+            bool success = Validator.TryValidateObject(beatmap, new ValidationContext(beatmap), errors, validateAllProperties: true);
+
+            Assert.False(success);
+            Assert.Equal(3, errors.Count);
+        }
     }
 }

osu.Server.BeatmapSubmission/Models/Database/osu_beatmap.cs

@@ -34,13 +34,13 @@ public class osu_beatmap : IValidatableObject
         [Range(typeof(uint), "0", "16777215", ErrorMessage = "The beatmap has too many objects.")]
         public uint countTotal { get; set; }
 
-        [Range(typeof(uint), "0", "16777215", ErrorMessage = "The beatmap has too many objects.")]
+        [Range(typeof(uint), "0", "65535", ErrorMessage = "The beatmap has too many objects.")]
         public uint countNormal { get; set; }
 
-        [Range(typeof(uint), "0", "16777215", ErrorMessage = "The beatmap has too many objects.")]
+        [Range(typeof(uint), "0", "65535", ErrorMessage = "The beatmap has too many objects.")]
         public uint countSlider { get; set; }
 
-        [Range(typeof(uint), "0", "16777215", ErrorMessage = "The beatmap has too many objects.")]
+        [Range(typeof(uint), "0", "65535", ErrorMessage = "The beatmap has too many objects.")]
         public uint countSpinner { get; set; }
 
         [Range(0.0, 10.0, ErrorMessage = "The drain rate of the beatmap is out of range.")]