[Acmcontester-developers] SF.net SVN: acmcontester:[533] nera/projects/nera.tester.runner/trunk

[<br...@us...>]

Revision: 533
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=533&view=rev
Author:   brus07
Date:     2009-07-20 12:02:08 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
Style refactoring.
Code refactoring (added new helper).
Check only submit result (not whole XML result).

Modified Paths:
--------------
    nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj
    nera/projects/nera.tester.runner/trunk/test/Class1.cs

Added Paths:
-----------
    nera/projects/nera.tester.runner/trunk/test/SubmitTestingHelper.cs

Modified: nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj
===================================================================
--- nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj	2009-07-20 11:51:36 UTC (rev 532)
+++ nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj	2009-07-20 12:02:08 UTC (rev 533)
@@ -28,6 +28,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Data, Version=1.0.3482.26403, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\Data.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Tools\nunit-v2.2.8\nunit.framework.dll</HintPath>
@@ -45,6 +49,7 @@
   <ItemGroup>
     <Compile Include="test\Class1.cs" />
     <Compile Include="test\Properties\AssemblyInfo.cs" />
+    <Compile Include="test\SubmitTestingHelper.cs" />
     <Compile Include="test\TestsHelper.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -53,21 +58,11 @@
   <Target Name="BeforeBuild">
   </Target>
   -->
-
   <ItemGroup>
-    <MySourceFiles
-        Include="test_files\test1\**\*.*"
-        Exclude="test_files\test1\**\.svn\**\*.*" />
+    <MySourceFiles Include="test_files\test1\**\*.*" Exclude="test_files\test1\**\.svn\**\*.*" />
   </ItemGroup>
-
   <Target Name="AfterBuild">
-    <Copy
-      SourceFiles="lib/Plugin.dll"
-      DestinationFolder="$(OutputPath)"
-    />
-    <Copy
-      SourceFiles="@(MySourceFiles)"
-      DestinationFiles="@(MySourceFiles->'$(OutputPath)\%(RecursiveDir)%(Filename)%(Extension)')"
-    />
+    <Copy SourceFiles="lib/Plugin.dll" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'$(OutputPath)\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 </Project>
\ No newline at end of file

Modified: nera/projects/nera.tester.runner/trunk/test/Class1.cs
===================================================================
--- nera/projects/nera.tester.runner/trunk/test/Class1.cs	2009-07-20 11:51:36 UTC (rev 532)
+++ nera/projects/nera.tester.runner/trunk/test/Class1.cs	2009-07-20 12:02:08 UTC (rev 533)
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using System.IO;
 using System;
 
 namespace Nera.Tester.Runner.Test
@@ -14,22 +13,9 @@
         }
 
         [Test]
-        public void Test2()
+        public void SubmitTest1()
         {
-            String code = "";
-            using (StreamReader sr = System.IO.File.OpenText(TestsHelper.SourceCode1))
-            {
-                code = sr.ReadToEnd();
-            }
-            string res = Nera.Tester.Runner.Checker.GetResult(code);
-
-            String result = "";
-            using (StreamReader sr = System.IO.File.OpenText(TestsHelper.Result1))
-            {
-                result = sr.ReadToEnd();
-            }
-
-            Assert.AreEqual(res, result);
+            SubmitTestingHelper.TestingCodeHelper(TestsHelper.SourceCode1, TestsHelper.Result1);
         }
 
     }

Added: nera/projects/nera.tester.runner/trunk/test/SubmitTestingHelper.cs
===================================================================
--- nera/projects/nera.tester.runner/trunk/test/SubmitTestingHelper.cs	                        (rev 0)
+++ nera/projects/nera.tester.runner/trunk/test/SubmitTestingHelper.cs	2009-07-20 12:02:08 UTC (rev 533)
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using System.IO;
+using AcmContester.Library.LibraryExtention.Data;
+
+namespace Nera.Tester.Runner.Test
+{
+    class SubmitTestingHelper
+    {
+        public static string ReadTextFromFile(string fileAddress)
+        {
+            string result = "";
+            using (StreamReader sr = System.IO.File.OpenText(fileAddress))
+            {
+                result = sr.ReadToEnd();
+            }
+            return result;
+        }
+        public static void TestingCodeHelper(string file1, string file2)
+        {
+            String code = ReadTextFromFile(file1);
+
+            string res = Nera.Tester.Runner.Checker.GetResult(code);
+
+            Result generaterRes = Result.CreateFromXml(res);
+
+            res = ReadTextFromFile(file2);
+
+            Result backupRes = Result.CreateFromXml(res);
+
+            Assert.AreEqual(generaterRes.res, backupRes.res, "Testing result was different");
+            //Assert.AreEqual(generaterRes.Submit, backupRes.Submit, "Submit in testing result was different");
+        }
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.