Removed Gallio to use NUnit (Easier on Mono)

Simplified tests. Removed Hexa.Core.Mono.Tests project.
cmendible · Oct 14, 2011 · 8b30c75 · 8b30c75
1 parent 84843b0
commit 8b30c75
Show file tree

Hide file tree

Showing 132 changed files with 1,007 additions and 60,811 deletions.
diff --git a/BuildAndTest.msbuild b/BuildAndTest.msbuild
@@ -24,8 +24,8 @@
     <ProjectDirectory>$(MSBuildProjectDirectory)</ProjectDirectory>
   </PropertyGroup>
 
-  <!-- This is needed by MSBuild to locate the Gallio task -->
-  <UsingTask AssemblyFile="$(ProjectDirectory)\libs\Gallio\Gallio.MsBuildTasks.dll" TaskName="Gallio" />
+  <!-- This is needed by MSBuild to locate the NUnit task -->
+  <UsingTask AssemblyFile="$(ProjectDirectory)\libs\MSBuild.Community.Tasks\MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.NUnit" />
 
   <!-- Specify the Solutions to build -->
   <ItemGroup>
@@ -38,7 +38,7 @@
 
     <!-- Builds Solutions -->
     <MSBuild Projects="@(ProjectFiles)"
-       Properties="Configuration=Release"
+       Properties="Configuration=Release; Platform=Any CPU"
        Targets="Build" />
 
     <Message Text="Starting Tests..." Importance="high" />
@@ -50,29 +50,18 @@
 
     <Message Text="TestFiles: @(TestFiles)" Importance="high"/>
 
-    <Message Text="Cleaning up old test results..." Importance="high" />
-
-    <PropertyGroup>
-      <TestResultsDirectory>$(ProjectDirectory)\TestResults</TestResultsDirectory>
-    </PropertyGroup>
-
     <ItemGroup>
-      <FilesToDelete Include="$(TestResultsDirectory)\**\*.*"/>
+      <FilesToDelete Include="TestResults.xml"/>
     </ItemGroup>
 
     <Delete Files="@(FilesToDelete)" />
 
-    <RemoveDir Directories="$(TestResultsDirectory)"
-           ContinueOnError="true" />
-
     <!-- Runs Tests -->
-    <Gallio IgnoreFailures="true" Files="@(TestFiles)"
-            PluginDirectories="$(ProjectDirectory)\libs\Gallio\"
-            ReportDirectory="$(TestResultsDirectory)"
-            ReportTypes="html;xml">
-      <Output TaskParameter="ExitCode" PropertyName="ExitCode" />
-    </Gallio>
-    <Error Text="Tests execution failed" Condition=" '$(ExitCode)' != 0 And '@(TestFiles)' != '' " />
+    <NUnit 
+		ToolPath="$(ProjectDirectory)\libs\NUnit"
+		Assemblies="@(TestFiles)" 
+		OutputXmlFile="TestResults.xml"
+		ContinueOnError="false" />
 
     <Message Text="Build Completed..." Importance="high" />
 

diff --git a/Hexa.Core.Mono.Tests/Hexa.Core.Mono.Tests.csproj b/Hexa.Core.Mono.Tests/Hexa.Core.Mono.Tests.csproj
diff --git a/Hexa.Core.Mono.Tests/Hexa.Core.Mono.Tests.pidb b/Hexa.Core.Mono.Tests/Hexa.Core.Mono.Tests.pidb
diff --git a/Hexa.Core.Mono.Tests/app.config b/Hexa.Core.Mono.Tests/app.config
diff --git a/Hexa.Core.Tests/BaseDatabaseTest.cs b/Hexa.Core.Tests/BaseDatabaseTest.cs
diff --git a/Hexa.Core.Tests/Core.Domain.Tests/BaseRepository.cs b/Hexa.Core.Tests/Core.Domain.Tests/BaseRepository.cs
@@ -15,7 +15,7 @@
 using Hexa.Core.Domain.Specification;
 using Hexa.Core.Logging;
 using Hexa.Core.Tests;
-using MbUnit.Framework;
+using NUnit.Framework;
 using Rhino.Mocks;
 using SL = Microsoft.Practices.ServiceLocation;
 
@@ -31,7 +31,7 @@ public class BaseRepositoryTests
             DictionaryServicesContainer _dictionaryContainer;
             private IoCContainer _container;
 
-            [FixtureSetUp]
+            [TestFixtureSetUp]
             public void FixtureSetUp()
             {
                 _dictionaryContainer = new DictionaryServicesContainer();

diff --git a/Hexa.Core.Tests/Core.Domain.Tests/BaseRepositoryTestsBase.cs b/Hexa.Core.Tests/Core.Domain.Tests/BaseRepositoryTestsBase.cs
@@ -14,7 +14,7 @@
 using System.Linq.Expressions;
 using Hexa.Core.Domain.Specification;
 using Hexa.Core.Logging;
-using MbUnit.Framework;
+using NUnit.Framework;
 
 namespace Hexa.Core.Domain.Tests
 {

diff --git a/Hexa.Core.Tests/Core.Domain.Tests/Specifications.cs b/Hexa.Core.Tests/Core.Domain.Tests/Specifications.cs
@@ -14,7 +14,7 @@
 using System.Linq.Expressions;
 using Hexa.Core.Domain.Specification;
 using Hexa.Core.Tests;
-using MbUnit.Framework;
+using NUnit.Framework;
 
 namespace Hexa.Core.Domain.Tests
 {

diff --git a/Hexa.Core.Tests/Hexa.Core.Tests.csproj b/Hexa.Core.Tests/Hexa.Core.Tests.csproj
@@ -107,17 +107,16 @@
     <Reference Include="FluentNHibernate">
       <HintPath>..\libs\NHibernate\FluentNHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Gallio, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libs\Gallio\Gallio.dll</HintPath>
-    </Reference>
-    <Reference Include="MbUnit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libs\Gallio\MbUnit.dll</HintPath>
-    </Reference>
     <Reference Include="NHibernate">
       <HintPath>..\libs\NHibernate\NHibernate.dll</HintPath>
     </Reference>
+    <Reference Include="Npgsql">
+      <HintPath>..\libs\Npgsql\Npgsql.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\libs\NUnit\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="Raven.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\libs\RavenDB\Raven.Client.dll</HintPath>
@@ -165,15 +164,16 @@
     <Compile Include="..\Hexa.Core\IoC\DictionaryServicesContainer.cs">
       <Link>IoC\DictionaryServicesContainer.cs</Link>
     </Compile>
-    <Compile Include="BaseDatabaseTest.cs" />
+    <Compile Include="NHibernate\BaseDatabaseTest.cs" />
     <Compile Include="Core.Domain.Tests\BaseRepository.cs" />
     <Compile Include="Core.Domain.Tests\BaseRepositoryTestsBase.cs" />
     <Compile Include="Core.Domain.Tests\Entity.cs" />
     <Compile Include="Data\Repositories\HumanRepository.cs" />
     <Compile Include="Domain\Human.cs" />
     <Compile Include="Data\Mappings\HumanMap.cs" />
     <Compile Include="Domain\Repositories\IHumanRepository.cs" />
-    <Compile Include="Firebird\FirebirdTests.cs" />
+    <Compile Include="NHibernate\FirebirdTests.cs" />
+    <Compile Include="NHibernate\PostgreSQLTest.cs" />
     <Compile Include="Pool\Pool.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -183,14 +183,16 @@
     </Compile>
     <Compile Include="Core.Domain.Tests\Specifications.cs" />
     <Compile Include="RavenDb\RavenTests.cs" />
-    <Compile Include="SqlCe\SqlCeTests.cs" />
-    <Compile Include="Sql\SqlTests.cs" />
+    <Compile Include="NHibernate\SqlCeTests.cs" />
+    <Compile Include="NHibernate\SqlTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Hexa.Core.snk">
       <Link>Hexa.Core.snk</Link>
     </None>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />