Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester:[546] nera
|
From: <br...@us...> - 2009-07-25 21:29:00
|
Revision: 546
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=546&view=rev
Author: brus07
Date: 2009-07-25 21:28:53 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
Convert Test project to new script structure.
Added new project to solution file.
Move test source file to new structure.
Added property in Global.targets file for NUnit.
Modified Paths:
--------------
nera/Targets/Global.targets
nera/projects/nera.tester.runner/trunk/Build.dependencies
nera/projects/nera.tester.runner/trunk/nera.tester.runner VS 2005.sln
Added Paths:
-----------
nera/projects/nera.tester.runner/trunk/Component Tests.csproj
nera/projects/nera.tester.runner/trunk/src/csharp/tests/
nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/
nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/
nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/
nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/Class1.cs
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
Removed Paths:
-------------
nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj
nera/projects/nera.tester.runner/trunk/test/
Modified: nera/Targets/Global.targets
===================================================================
--- nera/Targets/Global.targets 2009-07-25 21:01:15 UTC (rev 545)
+++ nera/Targets/Global.targets 2009-07-25 21:28:53 UTC (rev 546)
@@ -2,5 +2,12 @@
<PropertyGroup>
<MainPath>..</MainPath>
<ToolsDir>$(MainPath)\tools</ToolsDir>
+
+ <!-- Reference to NUnit -->
+ <NUnitDir>$(ToolsDir)\nunit-v2.2.8\bin</NUnitDir>
+ <NUnit>$(NUnitDir)\nunit.framework.dll</NUnit>
+ <NUnitConsole>$(NUnitDir)\nunit-console.exe</NUnitConsole>
+ <NUnitSummaryTransform>$(NUnitDir)\..\doc\files\Summary.xslt</NUnitSummaryTransform>
+
</PropertyGroup>
</Project>
Modified: nera/projects/nera.tester.runner/trunk/Build.dependencies
===================================================================
--- nera/projects/nera.tester.runner/trunk/Build.dependencies 2009-07-25 21:01:15 UTC (rev 545)
+++ nera/projects/nera.tester.runner/trunk/Build.dependencies 2009-07-25 21:28:53 UTC (rev 546)
@@ -41,15 +41,38 @@
<Reference Include="System.Xml" />
</ItemGroup>
- <!--Component sources and referenced assemblies-->
- <PropertyGroup>
- <AssemblyName>$(ComponentPackage)</AssemblyName>
- <RootNamespace>$(ComponentPackage)</RootNamespace>
- <DocumentationFile>$(BuildClassDir)\$(ComponentPackage).xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="$(DotNetMain)\**\*.cs">
- <Visible>true</Visible>
- </Compile>
- </ItemGroup>
+ <Choose>
+ <When Condition="$(ProjectKind)=='ComponentSources'">
+ <!--Component sources and referenced assemblies-->
+ <PropertyGroup>
+ <AssemblyName>$(ComponentPackage)</AssemblyName>
+ <RootNamespace>$(ComponentPackage)</RootNamespace>
+ <DocumentationFile>$(BuildClassDir)\$(ComponentPackage).xml</DocumentationFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="$(DotNetMain)\**\*.cs">
+ <Visible>true</Visible>
+ </Compile>
+ </ItemGroup>
+ </When>
+ <When Condition="$(ProjectKind)=='ComponentTests'">
+ <!--Component test sources and referenced assemblies-->
+ <PropertyGroup>
+ <AssemblyName>$(ComponentPackage).Test</AssemblyName>
+ <RootNamespace>$(ComponentPackage)</RootNamespace>
+ <DocumentationFile>$(BuildClassDir)\$(ComponentPackage).Test.xml</DocumentationFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="$(DotNetSrc)\**\*.cs">
+ <Visible>true</Visible>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>$(NUnit)</HintPath>
+ </Reference>
+ </ItemGroup>
+ </When>
+ </Choose>
</Project>
Copied: nera/projects/nera.tester.runner/trunk/Component Tests.csproj (from rev 540, nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj)
===================================================================
--- nera/projects/nera.tester.runner/trunk/Component Tests.csproj (rev 0)
+++ nera/projects/nera.tester.runner/trunk/Component Tests.csproj 2009-07-25 21:28:53 UTC (rev 546)
@@ -0,0 +1,19 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{51B5DCD7-8746-45DB-AB02-AACDE8C94F51}</ProjectGuid>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <!-- Added for making the difference in Build.dependencies file between sources & tests projects -->
+ <ProjectKind>ComponentTests</ProjectKind>
+ </PropertyGroup>
+
+ <Import Project="Reference.targets" />
+
+</Project>
\ No newline at end of file
Modified: nera/projects/nera.tester.runner/trunk/nera.tester.runner VS 2005.sln
===================================================================
--- nera/projects/nera.tester.runner/trunk/nera.tester.runner VS 2005.sln 2009-07-25 21:01:15 UTC (rev 545)
+++ nera/projects/nera.tester.runner/trunk/nera.tester.runner VS 2005.sln 2009-07-25 21:28:53 UTC (rev 546)
@@ -3,6 +3,8 @@
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Component Sources", "Component Sources.csproj", "{052D9F77-17AF-42F3-BFBF-975A19383496}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Component Tests", "Component Tests.csproj", "{51B5DCD7-8746-45DB-AB02-AACDE8C94F51}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -10,6 +12,8 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{052D9F77-17AF-42F3-BFBF-975A19383496}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{052D9F77-17AF-42F3-BFBF-975A19383496}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {51B5DCD7-8746-45DB-AB02-AACDE8C94F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {51B5DCD7-8746-45DB-AB02-AACDE8C94F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Deleted: nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj
===================================================================
--- nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj 2009-07-25 21:01:15 UTC (rev 545)
+++ nera/projects/nera.tester.runner/trunk/nera.tester.runner.test.csproj 2009-07-25 21:28:53 UTC (rev 546)
@@ -1,70 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{51B5DCD7-8746-45DB-AB02-AACDE8C94F51}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Nera.Tester.Runner.Test</RootNamespace>
- <AssemblyName>nera.tester.runner.test</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <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\bin\nunit.framework.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="nera.tester.runner.csproj">
- <Project>{052D9F77-17AF-42F3-BFBF-975A19383496}</Project>
- <Name>nera.tester.runner</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="test\Class1.cs" />
- <Compile Include="test\DemoTester.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="test\Properties\AssemblyInfo.cs" />
- <Compile Include="test\SubmitTestingHelper.cs" />
- <Compile Include="test\TestsHelper.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- -->
- <ItemGroup>
- <MySourceFiles Include="test_files\test1\**\*.*" Exclude="test_files\test1\**\.svn\**\*.*" />
- </ItemGroup>
- <Target Name="AfterBuild">
- <Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'$(OutputPath)\%(RecursiveDir)%(Filename)%(Extension)')" />
- </Target>
-</Project>
\ No newline at end of file
Copied: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/Class1.cs (from rev 538, nera/projects/nera.tester.runner/trunk/test/Class1.cs)
===================================================================
--- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/Class1.cs (rev 0)
+++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/Class1.cs 2009-07-25 21:28:53 UTC (rev 546)
@@ -0,0 +1,15 @@
+using NUnit.Framework;
+using System;
+
+namespace Nera.Tester.Runner.Test
+{
+ [TestFixture]
+ public class Class1
+ {
+ [Test]
+ public void Test1()
+ {
+ Assert.AreEqual(4, 4);
+ }
+ }
+}
Copied: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs (from rev 538, nera/projects/nera.tester.runner/trunk/test/DemoTester.cs)
===================================================================
--- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs (rev 0)
+++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/DemoTester.cs 2009-07-25 21:28:53 UTC (rev 546)
@@ -0,0 +1,47 @@
+using NUnit.Framework;
+using System;
+
+namespace Nera.Tester.Runner.Test
+{
+ [TestFixture]
+ public class DemoTester
+ {
+ private const string PluginFileAddres = "../../test_files/lib/Plugin.dll";
+ private const string PluginFileName = "Plugin.dll";
+
+ /// <summary>
+ /// <para>
+ /// Sets up the test environment.
+ /// </para>
+ /// </summary>
+ [SetUp]
+ public void SetUp()
+ {
+ System.IO.File.Copy(PluginFileAddres, PluginFileName, true);
+ }
+
+ /// <summary>
+ /// <para>
+ /// Cleans up the test environment.
+ /// </para>
+ /// </summary>
+ [TearDown]
+ public void TearDown()
+ {
+ System.IO.File.Delete(PluginFileName);
+ }
+
+ [Test]
+ public void SubmitTest1()
+ {
+ SubmitTestingHelper.TestingCodeHelper(TestsHelper.SourceCode1, TestsHelper.Result1);
+ }
+
+ [Test]
+ public void SubmitTest2()
+ {
+ SubmitTestingHelper.TestingCodeHelper(TestsHelper.SourceCode2, TestsHelper.Result2);
+ }
+
+ }
+}
Copied: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs (from rev 536, nera/projects/nera.tester.runner/trunk/test/SubmitTestingHelper.cs)
===================================================================
--- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs (rev 0)
+++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/SubmitTestingHelper.cs 2009-07-25 21:28:53 UTC (rev 546)
@@ -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");
+ }
+ }
+}
Copied: nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs (from rev 536, nera/projects/nera.tester.runner/trunk/test/TestsHelper.cs)
===================================================================
--- nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs (rev 0)
+++ nera/projects/nera.tester.runner/trunk/src/csharp/tests/Nera/Tester/Runner/TestsHelper.cs 2009-07-25 21:28:53 UTC (rev 546)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Nera.Tester.Runner.Test
+{
+ class TestsHelper
+ {
+ internal const string SourceCode1 = "../../test_files/test1.txt";
+ internal const string Result1 = "../../test_files/result1.txt";
+
+ internal const string SourceCode2 = "../../test_files/test2.txt";
+ internal const string Result2 = "../../test_files/result2.txt";
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
