Synced the latest code from the TFS: changeset 2305 build 3508

Author: NikolayIT

Open Judge System/OJS.Common/Extensions/StringExtensions.cs

@@ -138,22 +138,6 @@ public static SecureString ToSecureString(this string sourceString)
             return secureString;
         }
 
-        // TODO: Remove and replace with ToUrl
-        public static string ToUrlSafeString(this string input)
-        {
-            input = input.Replace("+", "Plus");
-            input = input.Replace("#", "Sharp");
-            return input;
-        }
-
-        // TODO: Remove and replace with ToUrl
-        public static string FromUrlSafeString(this string input)
-        {
-            input = input.Replace("Plus", "+");
-            input = input.Replace("Sharp", "#");
-            return input;
-        }
-
         // TODO: Test
         public static string ToValidFileName(this string input)
         {

Open Judge System/Tests/OJS.Web.Tests/Controllers/Contests/CompeteControllerTests/ProblemActionTests.cs

@@ -10,7 +10,7 @@
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     using OJS.Data.Models;
-    using OJS.Web.Areas.Contests.ViewModels;
+    using OJS.Web.Areas.Contests.ViewModels.Contests;
 
     [TestClass]
     public class ProblemActionTests : CompeteControllerBaseTestsClass

Open Judge System/Tests/OJS.Web.Tests/Controllers/Contests/CompeteControllerTests/RegisterActionTests.cs

@@ -11,7 +11,7 @@
     using OJS.Common;
     using OJS.Data.Models;
     using OJS.Web.Areas.Contests.Models;
-    using OJS.Web.Areas.Contests.ViewModels;
+    using OJS.Web.Areas.Contests.ViewModels.Contests;
 
     [TestClass]
     public class RegisterActionTests : CompeteControllerBaseTestsClass

Open Judge System/Tests/OJS.Web.Tests/Controllers/Contests/CompeteControllerTests/ValidateSubmissionTypeTests.cs

@@ -0,0 +1,51 @@
+namespace OJS.Web.Tests.Controllers.Contests.CompeteControllerTests
+{
+    using System.Net;
+    using System.Web;
+    using System.Collections.Generic;
+    
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    
+    using OJS.Data.Models;
+    using OJS.Web.Areas.Contests.Controllers;
+    
+    [TestClass]
+    public class ValidateSubmissionTypeTests
+    {
+        [TestMethod]
+        public void ValidateSubmissionTypeWhenSubmissionTypeIsNotFoundThrowException()
+        {
+            var contest = new Contest
+            {
+                SubmissionTypes = new List<SubmissionType>
+                {
+                    new SubmissionType { Id = 1 },
+                }
+            };
+
+            try
+            {
+                CompeteController.ValidateSubmissionType(0, contest);
+                Assert.Fail("Expected an exception when submission type is null");
+            }
+            catch (HttpException ex)
+            {
+                Assert.AreEqual((int)HttpStatusCode.BadRequest, ex.GetHttpCode());
+            }
+        }
+
+        [TestMethod]
+        public void ValidateSubmissionTypeWhenSubmissionTypeIsFoundShouldNotThrowException()
+        {
+            var contest = new Contest
+            {
+                SubmissionTypes = new List<SubmissionType>
+                {
+                    new SubmissionType { Id = 1 },
+                }
+            };
+
+            CompeteController.ValidateSubmissionType(1, contest);
+        }
+    }
+}

Open Judge System/Tests/OJS.Web.Tests/Controllers/Contests/ContestsControllerTests/DetailsActionTests.cs

@@ -9,7 +9,7 @@
 
     using OJS.Data.Models;
     using OJS.Web.Areas.Contests.Controllers;
-    using OJS.Web.Areas.Contests.ViewModels;
+    using OJS.Web.Areas.Contests.ViewModels.Contests;
 
     [TestClass]
     public class DetailsActionTests : BaseWebTests, IDisposable

Open Judge System/Tests/OJS.Web.Tests/OJS.Web.Tests.csproj

@@ -150,6 +150,7 @@
     <Compile Include="Controllers\Contests\CompeteControllerTests\DownloadResourceActionTests.cs" />
     <Compile Include="Controllers\Contests\CompeteControllerTests\SubmitActionTests.cs" />
     <Compile Include="Controllers\Contests\CompeteControllerTests\ValidateContestTests.cs" />
+    <Compile Include="Controllers\Contests\CompeteControllerTests\ValidateSubmissionTypeTests.cs" />
     <Compile Include="Controllers\Contests\ContestsControllerTests\DetailsActionTests.cs" />
     <Compile Include="Controllers\HomeControllerTests.cs" />
     <Compile Include="Controllers\FeedbackControllerTests.cs" />

Open Judge System/Web/OJS.Web/App_GlobalResources/Areas/Contests/ContestsGeneral.Designer.cs

@@ -153,6 +153,9 @@
   <data name="Submission_too_long" xml:space="preserve">
     <value>Изпратеният код е прекалено дълъг!</value>
   </data>
+  <data name="Submission_type_not_found" xml:space="preserve">
+    <value>Грешен тип за оценяване на решението!</value>
+  </data>
   <data name="Submission_was_sent_too_soon" xml:space="preserve">
     <value>Решението е изпратено прекалено скоро!</value>
   </data>

Open Judge System/Web/OJS.Web/App_GlobalResources/Areas/Contests/ContestsGeneral.bg.resx

@@ -153,6 +153,9 @@
   <data name="Submission_too_long" xml:space="preserve">
     <value>The submitted code is too long!</value>
   </data>
+  <data name="Submission_type_not_found" xml:space="preserve">
+    <value>Wrong submission type!</value>
+  </data>
   <data name="Submission_was_sent_too_soon" xml:space="preserve">
     <value>Submission was sent too soon!</value>
   </data>

Open Judge System/Web/OJS.Web/App_GlobalResources/Areas/Contests/ContestsGeneral.resx

@@ -25,8 +25,8 @@ public override void RegisterArea(AreaRegistrationContext context)
 
             context.MapRoute(
                 "Contests_by_submission_type",
-                "Contests/BySubmissionType/{submissionType}",
-                new { controller = "List", action = "BySubmissionType", submissionType = UrlParameter.Optional });
+                "Contests/BySubmissionType/{id}/{submissionTypeName}",
+                new { controller = "List", action = "BySubmissionType", id = UrlParameter.Optional, submissionTypeName = UrlParameter.Optional });
 
             context.MapRoute(
                 "Contests_by_category",