From: <br...@us...> - 2009-10-08 00:04:03
|
Revision: 572 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=572&view=rev Author: brus07 Date: 2009-10-08 00:03:55 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Added new problem (swap - 1000). But now with new tests, in future need copy real tests from server. Added new simple tests. Modified Paths: -------------- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs nera/projects/nera.tester.runner/trunk/test_files/test1/scriptExample.txt Added Paths: ----------- nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15051.xml nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15536.xml nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15564.xml nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/submits1000pascalsimple.xml nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/ProblemData.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/solution.pas nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/in.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/out.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/in.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/out.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/in.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/out.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/in.txt nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/out.txt Modified: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs =================================================================== --- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs 2009-10-07 11:02:03 UTC (rev 571) +++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs 2009-10-08 00:03:55 UTC (rev 572) @@ -18,5 +18,11 @@ SubmitTestingHelper.TestingCodeHelper(TestsHelper.SourceCode2, TestsHelper.Result2); } + [Test] + public void Submit1000SimpleTest() + { + SubmitTestingHelper.TestingListCodeHelper(TestsHelper.Sumits100PascalSimple); + } + } } Modified: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs =================================================================== --- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs 2009-10-07 11:02:03 UTC (rev 571) +++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs 2009-10-08 00:03:55 UTC (rev 572) @@ -33,5 +33,27 @@ Assert.AreEqual(generaterRes.res, backupRes.res, "Testing result was different"); //Assert.AreEqual(generaterRes.Submit, backupRes.Submit, "Submit in testing result was different"); } + + internal static void TestingListCodeHelper(string file1) + { + String code = ReadTextFromFile(file1); + SubmitList list = SubmitList.CreateFromXml(code); + + foreach (Submit submit in list.SubmitItems) + { + code = submit.ToString(); + string file2 = TestsHelper.ResultsDirSumits100Pascal + submit.id.ToString() + ".xml"; + 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"); + } + } } } Modified: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs =================================================================== --- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs 2009-10-07 11:02:03 UTC (rev 571) +++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs 2009-10-08 00:03:55 UTC (rev 572) @@ -11,5 +11,9 @@ internal const string SourceCode2 = "../../test_files/test2.txt"; internal const string Result2 = "../../test_files/result2.txt"; + + + internal const string ResultsDirSumits100Pascal = "../../test_files/pascal1000full/results/"; + internal const string Sumits100PascalSimple = "../../test_files/pascal1000full/submits1000pascalsimple.xml"; } } Added: nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15051.xml =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15051.xml (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15051.xml 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-16"?> +<result xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <res>Accepted</res> + <result>10</result> + <usedTime>0.015</usedTime> + <usedMemory>1112</usedMemory> + <testNumber>4</testNumber> + + <compOutput /> + <submit> + <id>15051</id> + <problem>1000</problem> + <sourceCode><![CDATA[program ss; +var a,b:integer; +begin readln(a,b); +writeln(b,' ',a); +end.]]></sourceCode> + <language>1</language> + </submit> + +</result> Added: nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15536.xml =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15536.xml (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15536.xml 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-16"?> +<result xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <res>Accepted</res> + <result>10</result> + <usedTime>0.015</usedTime> + <usedMemory>1196</usedMemory> + + <testNumber>4</testNumber> + <compOutput /> + <submit> + <id>15536</id> + <problem>1000</problem> + <sourceCode><![CDATA[var + a,b,c:integer; +begin + read(a,b); + c:=a; + a:=b; + b:=c; + write(a,' ',b); +end.]]></sourceCode> + <language>1</language> + + </submit> +</result> Added: nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15564.xml =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15564.xml (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/results/15564.xml 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-16"?> +<result xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <res>WrongAnswer</res> + <result>3</result> + <usedTime>0.015</usedTime> + + <usedMemory>1176</usedMemory> + <testNumber>1</testNumber> + <compOutput /> + <submit> + <id>15564</id> + <problem>1000</problem> + <sourceCode><![CDATA[var + a,b:integer; + + +begin + read(a,b); + write(b,a); +end.]]></sourceCode> + + <language>1</language> + </submit> +</result> Added: nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/submits1000pascalsimple.xml =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/submits1000pascalsimple.xml (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/pascal1000full/submits1000pascalsimple.xml 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-16"?> +<submitList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <submit> + <id>15051</id> + <problem>1000</problem> + <sourceCode><![CDATA[program ss; +var a,b:integer; +begin readln(a,b); +writeln(b,' ',a); +end.]]></sourceCode> + <language>1</language> + </submit> + + <submit> + <id>15536</id> + <problem>1000</problem> + <sourceCode><![CDATA[var + a,b,c:integer; +begin + read(a,b); + c:=a; + a:=b; + b:=c; + write(a,' ',b); +end.]]></sourceCode> + <language>1</language> + </submit> + <submit> + <id>15564</id> + <problem>1000</problem> + <sourceCode><![CDATA[var + a,b:integer; + + +begin + read(a,b); + write(b,a); +end.]]></sourceCode> + <language>1</language> + </submit> +</submitList> Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/ProblemData.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/ProblemData.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/ProblemData.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,10 @@ +CodeLimit: 65536 +CompilationTimeLimit: 100000 +MemoryLimit: 5120000 +OutputLimit: 204800 +RealTimeLimit: 200000 +TimeLimit: 1000 +MaxThreads: 1 +Checker: scriptExample.txt +CheckPlugin: Plugin.dll +TestFolderName: tests/test* \ No newline at end of file Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/solution.pas =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/solution.pas (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/solution.pas 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,7 @@ +var + a,b:integer; + +begin +read(a,b); +write(a,' ',b); +end. \ No newline at end of file Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/in.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/in.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/in.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +1 2 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/out.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/out.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test1/out.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +2 1 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/in.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/in.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/in.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1,2 @@ +0 0 + Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/out.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/out.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test2/out.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +0 0 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/in.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/in.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/in.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +123 321 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/out.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/out.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test3/out.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +321 123 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/in.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/in.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/in.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +123 321 Added: nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/out.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/out.txt (rev 0) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/Problem/1000/tests/test4/out.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -0,0 +1 @@ +321 123 Modified: nera/projects/nera.tester.runner/trunk/test_files/test1/scriptExample.txt =================================================================== --- nera/projects/nera.tester.runner/trunk/test_files/test1/scriptExample.txt 2009-10-07 11:02:03 UTC (rev 571) +++ nera/projects/nera.tester.runner/trunk/test_files/test1/scriptExample.txt 2009-10-08 00:03:55 UTC (rev 572) @@ -1,3 +1,3 @@ -if (output==correctOutput) +if (output.TrimEnd(null) == correctOutput.TrimEnd(null)) result='AC'; else result='WA'; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |