Port nunit addin to simple tests

4 files changed, 130 insertions, 133 deletions

diff --git a/rocks/Test/Mono.Cecil.Rocks.Tests.csproj b/rocks/Test/Mono.Cecil.Rocks.Tests.csproj
index 93c5550..ea7afb3 100644
--- a/rocks/Test/Mono.Cecil.Rocks.Tests.csproj
+++ b/rocks/Test/Mono.Cecil.Rocks.Tests.csproj
@@ -1,106 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">net_4_0_Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Mono.Cecil.Rocks.Tests</RootNamespace>
-    <AssemblyName>Mono.Cecil.Rocks.Tests</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_3_5_Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\net_3_5_Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_3_5_Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\net_3_5_Release\</OutputPath>
-    <DefineConstants>TRACE;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_0_Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\net_4_0_Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_0_Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\net_4_0_Release\</OutputPath>
-    <DefineConstants>TRACE;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.core">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core.interfaces">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.core.interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Test\Mono.Cecil.Tests.csproj">
-      <Project>{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}</Project>
-      <Name>Mono.Cecil.Tests</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Mono.Cecil.Rocks.csproj">
-      <Project>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</Project>
-      <Name>Mono.Cecil.Rocks</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Mono.Cecil.Tests\Addin.cs" />
-    <Compile Include="Mono.Cecil.Tests\MethodDefinitionRocksTests.cs" />
-    <Compile Include="Mono.Cecil.Tests\ModuleDefinitionRocksTests.cs" />
-    <Compile Include="Mono.Cecil.Tests\SecurityDeclarationRocksTests.cs" />
-    <Compile Include="Mono.Cecil.Tests\TypeDefinitionRocksTests.cs" />
-    <Compile Include="Mono.Cecil.Tests\TypeReferenceRocksTests.cs" />
-    <Content Include="Resources\cs\Types.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\assemblies\decsec-att.dll" />
-    <Content Include="Resources\assemblies\decsec-xml.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">net_4_0_Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>Mono.Cecil.Rocks.Tests</RootNamespace>

+    <AssemblyName>Mono.Cecil.Rocks.Tests</AssemblyName>

+    <FileAlignment>512</FileAlignment>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_3_5_Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\net_3_5_Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NET_3_5</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_3_5_Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\net_3_5_Release\</OutputPath>

+    <DefineConstants>TRACE;NET_3_5</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_0_Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\net_4_0_Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NET_3_5;NET_4_0</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_0_Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\net_4_0_Release\</OutputPath>

+    <DefineConstants>TRACE;NET_3_5;NET_4_0</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="nunit.core">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.core.dll</HintPath>

+    </Reference>

+    <Reference Include="nunit.core.interfaces">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.core.interfaces.dll</HintPath>

+    </Reference>

+    <Reference Include="nunit.framework">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\Test\libs\nunit-2.6.2\nunit.framework.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\Mono.Cecil.csproj">

+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>

+      <Name>Mono.Cecil</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Test\Mono.Cecil.Tests.csproj">

+      <Project>{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}</Project>

+      <Name>Mono.Cecil.Tests</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Mono.Cecil.Rocks.csproj">

+      <Project>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</Project>

+      <Name>Mono.Cecil.Rocks</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Mono.Cecil.Tests\MethodDefinitionRocksTests.cs" />

+    <Compile Include="Mono.Cecil.Tests\ModuleDefinitionRocksTests.cs" />

+    <Compile Include="Mono.Cecil.Tests\SecurityDeclarationRocksTests.cs" />

+    <Compile Include="Mono.Cecil.Tests\TypeDefinitionRocksTests.cs" />

+    <Compile Include="Mono.Cecil.Tests\TypeReferenceRocksTests.cs" />

+    <Content Include="Resources\cs\Types.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Resources\assemblies\decsec-att.dll" />

+    <Content Include="Resources\assemblies\decsec-xml.dll" />

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\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>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->

 </Project>
\ No newline at end of file
diff --git a/rocks/Test/Mono.Cecil.Tests/Addin.cs b/rocks/Test/Mono.Cecil.Tests/Addin.cs
deleted file mode 100644
index 5a9f85f..0000000
--- a/rocks/Test/Mono.Cecil.Tests/Addin.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using NUnit.Core.Extensibility;
-
-namespace Mono.Cecil.Tests {
-
-	[NUnitAddin]
-	public class CecilRocksAddin : CecilTestAddin {
-	}
-}
diff --git a/rocks/Test/Mono.Cecil.Tests/ModuleDefinitionRocksTests.cs b/rocks/Test/Mono.Cecil.Tests/ModuleDefinitionRocksTests.cs
index f172b40..d0f5d01 100644
--- a/rocks/Test/Mono.Cecil.Tests/ModuleDefinitionRocksTests.cs
+++ b/rocks/Test/Mono.Cecil.Tests/ModuleDefinitionRocksTests.cs
@@ -9,10 +9,11 @@ namespace Mono.Cecil.Tests {
 	[TestFixture]
 	public class ModuleDefinitionRocksTests : BaseTestFixture {
 
-		[TestCSharp ("Types.cs")]
-		public void GetAllTypesTest (ModuleDefinition module)
+		[Test]
+		public void GetAllTypesTest ()
 		{
-			var sequence = new [] {
+			TestCSharp ("Types.cs", module => {
+				var sequence = new [] {
 				module.GetType ("<Module>"),
 				module.GetType ("Foo"),
 				module.GetType ("Foo/Bar"),
@@ -21,7 +22,8 @@ namespace Mono.Cecil.Tests {
 				module.GetType ("Pan"),
 			};
 
-			Assert.IsTrue (sequence.SequenceEqual (module.GetAllTypes ()));
+				Assert.IsTrue (sequence.SequenceEqual (module.GetAllTypes ()));
+			});
 		}
 	}
 }
diff --git a/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs b/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs
index e7efba1..6598df7 100644
--- a/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs
+++ b/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs
@@ -9,50 +9,54 @@ namespace Mono.Cecil.Tests {
 	[TestFixture]
 	public class SecurityDeclarationRocksTests : BaseTestFixture {
 
-		[TestModule ("decsec-xml.dll")]
-		public void ToPermissionSetFromPermissionSetAttribute (ModuleDefinition module)
+		[Test]
+		public void ToPermissionSetFromPermissionSetAttribute ()
 		{
-			var type = module.GetType ("SubLibrary");
+			TestModule ("decsec-xml.dll", module => {
+				var type = module.GetType ("SubLibrary");
 
-			Assert.IsTrue (type.HasSecurityDeclarations);
-			Assert.AreEqual (1, type.SecurityDeclarations.Count);
+				Assert.IsTrue (type.HasSecurityDeclarations);
+				Assert.AreEqual (1, type.SecurityDeclarations.Count);
 
-			var declaration = type.SecurityDeclarations [0];
+				var declaration = type.SecurityDeclarations [0];
 
-			var permission_set = declaration.ToPermissionSet ();
+				var permission_set = declaration.ToPermissionSet ();
 
-			Assert.IsNotNull (permission_set);
+				Assert.IsNotNull (permission_set);
 
-			string permission_set_value = "<PermissionSet class=\"System.Security.PermissionSe"
+				string permission_set_value = "<PermissionSet class=\"System.Security.PermissionSe"
 	+ "t\"\r\nversion=\"1\">\r\n<IPermission class=\"{0}\"\r\nversion=\"1\"\r\nFla"
 	+ "gs=\"UnmanagedCode\"/>\r\n</PermissionSet>\r\n";
 
-			permission_set_value = string.Format (permission_set_value, typeof (SecurityPermission).AssemblyQualifiedName);
+				permission_set_value = string.Format (permission_set_value, typeof (SecurityPermission).AssemblyQualifiedName);
 
-			Assert.AreEqual (Normalize (permission_set_value), Normalize (permission_set.ToXml ().ToString ()));
+				Assert.AreEqual (Normalize (permission_set_value), Normalize (permission_set.ToXml ().ToString ()));
+			});
 		}
 
-		[TestModule ("decsec-att.dll")]
-		public void ToPermissionSetFromSecurityAttribute (ModuleDefinition module)
+		[Test]
+		public void ToPermissionSetFromSecurityAttribute ()
 		{
-			var type = module.GetType ("SubLibrary");
+			TestModule ("decsec-att.dll", module => {
+				var type = module.GetType ("SubLibrary");
 
-			Assert.IsTrue (type.HasSecurityDeclarations);
-			Assert.AreEqual (1, type.SecurityDeclarations.Count);
+				Assert.IsTrue (type.HasSecurityDeclarations);
+				Assert.AreEqual (1, type.SecurityDeclarations.Count);
 
-			var declaration = type.SecurityDeclarations [0];
+				var declaration = type.SecurityDeclarations [0];
 
-			var permission_set = declaration.ToPermissionSet ();
+				var permission_set = declaration.ToPermissionSet ();
 
-			Assert.IsNotNull (permission_set);
+				Assert.IsNotNull (permission_set);
 
-			string permission_set_value = "<PermissionSet class=\"System.Security.PermissionSe"
+				string permission_set_value = "<PermissionSet class=\"System.Security.PermissionSe"
 	+ "t\"\r\nversion=\"1\">\r\n<IPermission class=\"{0}\"\r\nversion=\"1\"\r\nFla"
 	+ "gs=\"UnmanagedCode\"/>\r\n</PermissionSet>\r\n";
 
-			permission_set_value = string.Format (permission_set_value, typeof (SecurityPermission).AssemblyQualifiedName);
+				permission_set_value = string.Format (permission_set_value, typeof (SecurityPermission).AssemblyQualifiedName);
 
-			Assert.AreEqual (Normalize (permission_set_value), Normalize (permission_set.ToXml ().ToString ()));
+				Assert.AreEqual (Normalize (permission_set_value), Normalize (permission_set.ToXml ().ToString ()));
+			});
 		}
 
 		static string Normalize (string s)