diff options
89 files changed, 307 insertions, 921 deletions
diff --git a/main/.nuget/packages.config b/main/.nuget/packages.config index b5272b3e87..0901fded19 100644 --- a/main/.nuget/packages.config +++ b/main/.nuget/packages.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="NuGet.CommandLine" version="2.8.2" />
+<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="NuGet.CommandLine" version="2.8.2" /> </packages>
\ No newline at end of file diff --git a/main/Main.sln b/main/Main.sln index b58734a3ae..491a0e2ee9 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -115,11 +115,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml.Tests", "sr EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml", "src\addins\Xml\MonoDevelop.Xml.csproj", "{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.UnitTesting", "MonoDevelop.UnitTesting", "{DE462010-393D-4655-A42C-2C78BB14D2FA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTesting", "UnitTesting", "{DE462010-393D-4655-A42C-2C78BB14D2FA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.UnitTesting", "src\addins\NUnit\MonoDevelop.UnitTesting.csproj", "{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.UnitTesting", "src\addins\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj", "{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitRunner", "src\addins\NUnit\NUnitRunner\NUnitRunner.csproj", "{0AF16AF1-0876-413E-9803-08BD33C19E00}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitRunner", "src\addins\MonoDevelop.UnitTesting.NUnit\NUnitRunner\NUnitRunner.csproj", "{0AF16AF1-0876-413E-9803-08BD33C19E00}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform", "src\addins\MacPlatform\MacPlatform.csproj", "{50D6768C-C072-4E79-AFC5-C1C40767EF45}"
EndProject
@@ -296,10 +296,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CSharpBinding.T EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj", "{8EE5A588-9445-48EC-97BD-BF066E7FFD51}"
EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.UnitTesting.NUnit", "src\addins\MonoDevelop.UnitTesting.NUnit\MonoDevelop.UnitTesting.NUnit.csproj", "{6224D87E-2AC1-4D9F-91ED-714F797297BF}"
EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{FFA0B9E0-BF18-4ED2-985F-B91786C1A086}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -904,15 +904,15 @@ Global {7B57882B-AD46-469B-84E7-06DF98D11468}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
- {7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.Build.0 = Release|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU
- {7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+ {7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1922,15 +1922,6 @@ Global {8EE5A588-9445-48EC-97BD-BF066E7FFD51}.Debug|x86.Build.0 = Debug|Any CPU
{8EE5A588-9445-48EC-97BD-BF066E7FFD51}.Release|x86.ActiveCfg = Release|Any CPU
{8EE5A588-9445-48EC-97BD-BF066E7FFD51}.Release|x86.Build.0 = Release|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
- {1ACD6137-2097-4A16-8B69-B2F48B2EA5BF}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1951,6 +1942,15 @@ Global {6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|x86.Build.0 = Debug|Any CPU
{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|x86.ActiveCfg = Release|Any CPU
{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|x86.Build.0 = Release|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
+ {FFA0B9E0-BF18-4ED2-985F-B91786C1A086}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{7525BB88-6142-4A26-93B9-A30C6983390A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
@@ -2095,7 +2095,7 @@ Global $2.TabsToSpaces = False
$2.inheritsSet = null
$2.inheritsScope = text/plain
- $2.scope = application/json
+ $2.scope = application/config+xml
$0.DotNetNamingPolicy = $3
$3.DirectoryNamespaceAssociation = Flat
$3.ResourceNamePolicy = FileName
@@ -2131,8 +2131,8 @@ Global $12.inheritsSet = null
$12.scope = image/svg+xml
$0.XmlFormattingPolicy = $13
- $13.inheritsSet = null
- $13.scope = application/config+xml
+ $13.inheritsSet = Mono
+ $13.scope = application/xml
$13.inheritsScope = application/xml
$0.TextStylePolicy = $14
$14.TabsToSpaces = False
diff --git a/main/configure.in b/main/configure.in index 20a0aa197a..f5dc20818a 100644 --- a/main/configure.in +++ b/main/configure.in @@ -319,8 +319,9 @@ src/tools/mdmonitor/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile -src/addins/NUnit/Makefile -src/addins/NUnit/NUnitRunner/Makefile +src/addins/MonoDevelop.UnitTesting/Makefile +src/addins/MonoDevelop.UnitTesting.NUnit/Makefile +src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/Makefile diff --git a/main/external/debugger-libs b/main/external/debugger-libs -Subproject dd327bd2bdc85a96333a8ff72a12d9ca977f69f +Subproject 03c4af4b2e552b7381a5a172c52ab6960756551 diff --git a/main/external/libgit-binary b/main/external/libgit-binary -Subproject 8d9ac291c1e34357efc6c95891ff420c513ff00 +Subproject 944fba6f5eb9636542e824b6fd95c294d91e97a diff --git a/main/external/libgit2 b/main/external/libgit2 -Subproject ab8e88a96b5b9e1a59a6f8742fe0136b1315871 +Subproject e8b8948f5a07cd813ccad7b97490b7f040d364c diff --git a/main/external/libgit2sharp b/main/external/libgit2sharp -Subproject d8d8326121cb3e79558e88a86b73e5531d57aa9 +Subproject 06bbc96251eea534ed66a32e8f2e2edaaa90307 diff --git a/main/external/monomac b/main/external/monomac -Subproject 1d878426361aea31f9e31b509783703fbd797c8 +Subproject 36508cffdd4ce29f6c6e87f7c30d621d3cc512f diff --git a/main/external/nuget-binary b/main/external/nuget-binary -Subproject c4bbc4c7b697f0663605046921cecd23f487400 +Subproject 4612ea9166f27f5193b4abb3c0825e52df08eb8 diff --git a/main/external/roslyn b/main/external/roslyn -Subproject 16e117c2400d0ab930e7d89512f9894a169a0e6 +Subproject 571132d0df9b754e525c2ea2aaefed5d7677883 diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index b640c01f70..ea87d0944f 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -111,21 +111,27 @@ </Reference> <Reference Include="System.Web.Razor"> <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.Helpers"> <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.WebPages.Deployment"> <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.WebPages"> <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.WebPages.Razor"> <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.Mvc"> <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Web.Mvc" Condition="!Exists('$(SolutionDir)\..\.git')" /> <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 1955fe1ecb..f7c1aa4dca 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -107,11 +107,6 @@ <Name>Xwt</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\NUnit\MonoDevelop.NUnit.csproj"> - <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> - <Name>MonoDevelop.UnitTesting</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj"> <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project> <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name> @@ -126,6 +121,10 @@ <Name>RefactoringEssentials</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj"> + <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> + <Name>MonoDevelop.UnitTesting</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs index a1b878aea2..c06dce213b 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using MonoDevelop.NUnit; +using MonoDevelop.UnitTesting; using MonoDevelop.Ide.TypeSystem; using System.Threading; using Microsoft.CodeAnalysis; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs index 3c1cbe3c31..a51e91ba5a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs @@ -26,7 +26,7 @@ using System; using MonoDevelop.Refactoring; using System.Collections.Generic; -using MonoDevelop.NUnit; +using MonoDevelop.UnitTesting; using MonoDevelop.Core; using System.Text; using System.Threading; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index fc22c1e614..ae5a9c994c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -37,7 +37,6 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Simplification; using Microsoft.CodeAnalysis.CSharp.Formatting; using System.Collections.Immutable; -using MonoDevelop.NUnit; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp; using MonoDevelop.Ide.Editor; diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am index 2baa722c8e..7700dac213 100644 --- a/main/src/addins/Makefile.am +++ b/main/src/addins/Makefile.am @@ -17,7 +17,8 @@ SUBDIRS = \ AspNet \
CSharpBinding \
ILAsmBinding \
- NUnit \
+ MonoDevelop.UnitTesting \
+ MonoDevelop.UnitTesting.NUnit \
MonoDeveloperExtensions \
VBNetBinding \
MonoDevelop.GtkCore \
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs new file mode 100644 index 0000000000..6a99bf020a --- /dev/null +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs @@ -0,0 +1,16 @@ + +using System; +using Mono.Addins; +using Mono.Addins.Description; + +[assembly:Addin ("UnitTesting.NUnit", + Namespace = "MonoDevelop", + Version = MonoDevelop.BuildInfo.Version, + Category = "Testing")] + +[assembly:AddinName ("NUnit support")] +[assembly:AddinDescription ("Integrates NUnit into the MonoDevelop IDE")] + +[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)] +[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)] +[assembly:AddinDependency ("UnitTesting", MonoDevelop.BuildInfo.Version)] diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/AssemblyInfo.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AssemblyInfo.cs new file mode 100644 index 0000000000..7b21277467 --- /dev/null +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Autogenerated from MonoDevelopNUnit.addin.xml + +using System.Reflection; + +[assembly: AssemblyProduct ("MonoDevelop")] +[assembly: AssemblyTitle ("NUnit support")] +[assembly: AssemblyDescription ("Integrates NUnit into the MonoDevelop IDE.")] +[assembly: AssemblyVersion ("2.6")] +[assembly: AssemblyCopyright ("MIT X11")] diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am new file mode 100644 index 0000000000..3ae131ae68 --- /dev/null +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = NUnitRunner . + +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj index 0459061215..2ebc6f4ca8 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj @@ -5,10 +5,10 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</ProjectGuid> + <ProjectGuid>{6224D87E-2AC1-4D9F-91ED-714F797297BF}</ProjectGuid> <OutputType>Library</OutputType> - <AssemblyName>MonoDevelop.NUnit</AssemblyName> - <RootNamespace>MonoDevelop.NUnit</RootNamespace> + <AssemblyName>MonoDevelop.UnitTesting.NUnit</AssemblyName> + <RootNamespace>MonoDevelop.UnitTesting.NUnit</RootNamespace> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -23,7 +23,7 @@ </Execution> <DefineConstants>DEBUG</DefineConstants> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -36,7 +36,7 @@ </Execution> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -119,28 +119,54 @@ <Name>ICSharpCode.NRefactory</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj"> + <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> + <Name>MonoDevelop.UnitTesting</Name> + </ProjectReference> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="gtk-gui\gui.stetic"> - <LogicalName>gui.stetic</LogicalName> + <EmbeddedResource Include="MonoDevelopNUnit.addin.xml"> + <LogicalName>MonoDevelopNUnit.addin.xml</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project.png"> + <LogicalName>nunit-library-project.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project%402x.png"> + <LogicalName>nunit-library-project@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project~dark.png"> + <LogicalName>nunit-library-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project~dark%402x.png"> + <LogicalName>nunit-library-project~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml"> + <LogicalName>NUnitAssemblyGroup.xpt.xml</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\NUnitProject.xpt.xml"> + <LogicalName>NUnitProject.xpt.xml</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml"> + <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\NUnitTestClass.xft.xml"> + <LogicalName>NUnitTestClass.xft.xml</LogicalName> </EmbeddedResource> </ItemGroup> <ItemGroup> - <Compile Include="gtk-gui\generated.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\AbstractUnitTestEditorExtension.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\ExternalTestRunner.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitAssemblyGroupConfigurationNodeBuilder.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitAssemblyGroupNodeBuilder.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitAssemblyGroupProject.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitAssemblyTestSuite.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitProjectTestSuite.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitTestCase.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitTestSuite.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\SystemTestProvider.cs" /> <Compile Include="MonoDevelop.UnitTesting.NUnit\TcpTestListener.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\TestAssembly.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\TestAssemblyCollection.cs" /> - <Compile Include="MonoDevelop.UnitTesting.NUnit\TestAssemblyNodeBuilder.cs" /> + <Compile Include="AddinInfo.cs" /> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="MonoDevelop.UnitTesting.NUnit\InitCommand.cs" /> + </ItemGroup> + <ItemGroup> + <Folder Include="templates\" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs index b68624124e..f211065b9c 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs @@ -42,7 +42,7 @@ using NUnit.Util; using NF = NUnit.Framework; using NC = NUnit.Core; -namespace MonoDevelop.UnitTesting.External +namespace MonoDevelop.UnitTesting.NUnit.External { class ExternalTestRunner: RemoteProcessObject { diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/InitCommand.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/InitCommand.cs new file mode 100644 index 0000000000..6c354e1aad --- /dev/null +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/InitCommand.cs @@ -0,0 +1,49 @@ +// +// InitCommand.cs +// +// Author: +// Lluis Sanchez Gual <lluis@xamarin.com> +// +// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using MonoDevelop.Components.Commands; +using MonoDevelop.Ide; +using MonoDevelop.Projects; +using System.Threading; + +namespace MonoDevelop.UnitTesting.NUnit +{ + public class InitCommand: CommandHandler + { + protected override void Run () + { + IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChanged; + IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChanged; + } + + void OnReferenceChanged (object s, ProjectReferenceEventArgs args) + { + if (NUnitProjectTestSuite.IsNUnitReference (args.ProjectReference)) + UnitTestService.Instance.RefreshTests (CancellationToken.None); + } + } +} + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupConfigurationNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupConfigurationNodeBuilder.cs deleted file mode 100644 index bdd551d00b..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupConfigurationNodeBuilder.cs +++ /dev/null @@ -1,121 +0,0 @@ -// -// NUnitAssemblyGroupConfigurationNodeBuilder.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; - -using MonoDevelop.Projects; -using MonoDevelop.Core; -using MonoDevelop.Components.Commands; -using MonoDevelop.UnitTesting.Commands; -using MonoDevelop.Components; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Ide.Gui.Components; -using MonoDevelop.Ide; - -namespace MonoDevelop.UnitTesting -{ - public class NUnitAssemblyGroupConfigurationNodeBuilder: TypeNodeBuilder - { - public override Type CommandHandlerType { - get { return typeof(NUnitAssemblyGroupConfigurationNodeCommandHandler); } - } - - public override string ContextMenuAddinPath { - get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration"; } - } - - public override Type NodeDataType { - get { return typeof(NUnitAssemblyGroupProjectConfiguration); } - } - - public override string GetNodeName (ITreeNavigator thisNode, object dataObject) - { - return ((SolutionItemConfiguration)dataObject).Id; - } - - public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo) - { - var conf = (SolutionItemConfiguration) dataObject; - nodeInfo.Label = conf.Id; - nodeInfo.Icon = Context.GetIcon (Stock.ClosedFolder); - } - - public override void BuildChildNodes (ITreeBuilder builder, object dataObject) - { - var config = (NUnitAssemblyGroupProjectConfiguration) dataObject; - - foreach (TestAssembly ta in config.Assemblies) - builder.AddChild (ta); - } - - public override bool HasChildNodes (ITreeBuilder builder, object dataObject) - { - var config = (NUnitAssemblyGroupProjectConfiguration) dataObject; - return config.Assemblies.Count > 0; - } - - public override void OnNodeAdded (object dataObject) - { - var config = (NUnitAssemblyGroupProjectConfiguration) dataObject; - config.AssembliesChanged += OnAssembliesChanged; - } - - public override void OnNodeRemoved (object dataObject) - { - var config = (NUnitAssemblyGroupProjectConfiguration) dataObject; - config.AssembliesChanged -= OnAssembliesChanged; - } - - public void OnAssembliesChanged (object sender, EventArgs args) - { - ITreeBuilder tb = Context.GetTreeBuilder (sender); - if (tb != null) tb.UpdateAll (); - } - } - - class NUnitAssemblyGroupConfigurationNodeCommandHandler: NodeCommandHandler - { - [CommandHandler (NUnitProjectCommands.AddAssembly)] - protected void OnAddAssembly () - { - var config = (NUnitAssemblyGroupProjectConfiguration) CurrentNode.DataItem; - - var dlg = new SelectFileDialog (GettextCatalog.GetString ("Add files")) { - TransientFor = IdeApp.Workbench.RootWindow, - SelectMultiple = true, - }; - if (!dlg.Run ()) - return; - - foreach (string file in dlg.SelectedFiles) - config.Assemblies.Add (new TestAssembly (file)); - - IdeApp.Workspace.SaveAsync(); - } - } -} diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupNodeBuilder.cs deleted file mode 100644 index 8de1f9d4c4..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupNodeBuilder.cs +++ /dev/null @@ -1,116 +0,0 @@ -// -// NUnitAssemblyGroupNodeBuilder.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; - -using MonoDevelop.Projects; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Components.Commands; -using MonoDevelop.UnitTesting.Commands; -using MonoDevelop.Ide.Gui.Components; -using MonoDevelop.Ide; - -namespace MonoDevelop.UnitTesting -{ - public class NUnitAssemblyGroupNodeBuilder: TypeNodeBuilder - { - public override Type CommandHandlerType { - get { return typeof(NUnitAssemblyGroupNodeCommandHandler); } - } - - public override string ContextMenuAddinPath { - get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup"; } - } - - public override Type NodeDataType { - get { return typeof(NUnitAssemblyGroupProject); } - } - - public override string GetNodeName (ITreeNavigator thisNode, object dataObject) - { - return ((NUnitAssemblyGroupProject)dataObject).Name; - } - - public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo) - { - NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject; - nodeInfo.Label = project.Name; - nodeInfo.Icon = Context.GetIcon (Stock.Project); - } - - public override void BuildChildNodes (ITreeBuilder builder, object dataObject) - { - NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject; - - foreach (NUnitAssemblyGroupProjectConfiguration c in project.Configurations) - builder.AddChild (c); - } - - public override bool HasChildNodes (ITreeBuilder builder, object dataObject) - { - NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject; - return project.Configurations.Count > 0; - } - - public override void OnNodeAdded (object dataObject) - { - NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject; - project.ConfigurationAdded += OnConfigurationsChanged; - project.ConfigurationRemoved += OnConfigurationsChanged; - } - - public override void OnNodeRemoved (object dataObject) - { - NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject; - project.ConfigurationAdded -= OnConfigurationsChanged; - project.ConfigurationRemoved -= OnConfigurationsChanged; - } - - public void OnConfigurationsChanged (object sender, ConfigurationEventArgs args) - { - ITreeBuilder tb = Context.GetTreeBuilder (sender); - if (tb != null) tb.UpdateAll (); - } - } - - class NUnitAssemblyGroupNodeCommandHandler: NodeCommandHandler - { - [CommandHandler (NUnitProjectCommands.AddAssembly)] - protected void OnShowTest () - { - } - - public override void DeleteItem () - { - NUnitAssemblyGroupProject project = CurrentNode.DataItem as NUnitAssemblyGroupProject; - project.ParentFolder.Items.Remove (project); - project.Dispose (); - IdeApp.Workspace.SaveAsync (); - } - } -} diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupProject.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupProject.cs deleted file mode 100644 index 290a19f33f..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyGroupProject.cs +++ /dev/null @@ -1,177 +0,0 @@ -// -// NUnitAssemblyGroupProject.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - - -using System; -using System.IO; -using System.Xml; -using MonoDevelop.Projects; -using MonoDevelop.Core; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Ide.TypeSystem; - -namespace MonoDevelop.UnitTesting.NUnit -{ - [DataInclude (typeof(NUnitAssemblyGroupProjectConfiguration))] - public class NUnitAssemblyGroupProject: SolutionItem - { - RootTest rootTest; - - public NUnitAssemblyGroupProject () - { - } - - protected override void OnEndLoad () - { - base.OnEndLoad (); - if (Configurations.Count == 0) - Configurations.Add (CreateConfiguration ("Default")); - } - - protected override void OnInitializeFromTemplate (ProjectCreateInformation projectCreateInfo, XmlElement element) - { - Configurations.Add (CreateConfiguration ("Default")); - } - - public UnitTest RootTest { - get { - if (rootTest == null) { - rootTest = new RootTest (this); - } - return rootTest; - } - } - - protected override SolutionItemConfiguration OnCreateConfiguration (string id, ConfigurationKind kind) - { - return new NUnitAssemblyGroupProjectConfiguration (id); - } - } - - public class NUnitAssemblyGroupProjectConfiguration: SolutionItemConfiguration - { - TestAssemblyCollection assemblies; - - public NUnitAssemblyGroupProjectConfiguration (string id): base (id) - { - assemblies = new TestAssemblyCollection (this); - } - - protected override void OnCopyFrom (ItemConfiguration configuration, bool isRename) - { - base.OnCopyFrom (configuration, isRename); - - NUnitAssemblyGroupProjectConfiguration conf = configuration as NUnitAssemblyGroupProjectConfiguration; - if (conf != null) { - assemblies.Clear (); - foreach (TestAssembly ta in conf.Assemblies) { - TestAssembly copy = new TestAssembly (ta.Path); - assemblies.Add (copy); - } - } - } - - [ItemProperty ("Assemblies")] - [ItemProperty ("Assembly", ValueType=typeof(TestAssembly), Scope="*")] - public TestAssemblyCollection Assemblies { - get { return assemblies; } - } - - internal void OnAssembliesChanged () - { - if (AssembliesChanged != null) - AssembliesChanged (this, EventArgs.Empty); - } - - public event EventHandler AssembliesChanged; - } - - class RootTest: UnitTestGroup - { - NUnitAssemblyGroupProject project; - string resultsPath; - NUnitAssemblyGroupProjectConfiguration lastConfig; - - - public RootTest (NUnitAssemblyGroupProject project): base (project.Name, project) - { - this.project = project; - resultsPath = UnitTestService.GetTestResultsDirectory (project.BaseDirectory); - ResultsStore = new BinaryResultsStore (resultsPath, Path.GetFileName (project.FileName)); - - lastConfig = (NUnitAssemblyGroupProjectConfiguration) project.DefaultConfiguration; - if (lastConfig != null) - lastConfig.AssembliesChanged += new EventHandler (OnAssembliesChanged); - } - - public override void Dispose () - { - if (lastConfig != null) - lastConfig.AssembliesChanged -= new EventHandler (OnAssembliesChanged); - } - - internal string ResultsPath { - get { return resultsPath; } - } - - void OnAssembliesChanged (object sender, EventArgs args) - { - UpdateTests (); - } - - public override bool HasTests { - get { - return true; - } - } - - - protected override void OnActiveConfigurationChanged () - { - if (lastConfig != null) - lastConfig.AssembliesChanged -= new EventHandler (OnAssembliesChanged); - - lastConfig = (NUnitAssemblyGroupProjectConfiguration) project.DefaultConfiguration; - if (lastConfig != null) - lastConfig.AssembliesChanged += new EventHandler (OnAssembliesChanged); - - UpdateTests (); - base.OnActiveConfigurationChanged (); - } - - protected override void OnCreateTests () - { - NUnitAssemblyGroupProjectConfiguration conf = (NUnitAssemblyGroupProjectConfiguration) project.GetConfiguration ((ItemConfigurationSelector) ActiveConfiguration); - if (conf != null) { - foreach (TestAssembly t in conf.Assemblies) - Tests.Add (t); - } - } - } -} - diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs index 775b061f89..4f510e54eb 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs @@ -40,7 +40,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Execution; using NUnit.Core; using NUnit.Core.Filters; -using MonoDevelop.NUnit.External; +using MonoDevelop.UnitTesting.NUnit.External; using MonoDevelop.Ide; using System.Xml.Linq; using System.Linq; @@ -84,7 +84,7 @@ namespace MonoDevelop.UnitTesting.NUnit } base.Dispose (); } - + public override bool HasTests { get { return true; @@ -480,7 +480,7 @@ namespace MonoDevelop.UnitTesting.NUnit cons = xmlOutputConsole; } try { - MonoDevelop.NUnit.External.TcpTestListener tcpListener = null; + MonoDevelop.UnitTesting.NUnit.External.TcpTestListener tcpListener = null; LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null); if (!string.IsNullOrEmpty (cmd.Arguments)) @@ -491,7 +491,7 @@ namespace MonoDevelop.UnitTesting.NUnit if (!string.IsNullOrEmpty(pathName))
cmd.Arguments += " -run=\"" + test.TestId + "\""; if (automaticUpdates) { - tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName); + tcpListener = new MonoDevelop.UnitTesting.NUnit.External.TcpTestListener (localMonitor, suiteName); cmd.Arguments += " -port=" + tcpListener.Port; } diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs index dafda5472a..826e20bdc6 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs @@ -38,6 +38,7 @@ using System; using Microsoft.CodeAnalysis; using System.Threading; using ProjectReference = MonoDevelop.Projects.ProjectReference; +using System.Threading.Tasks; namespace MonoDevelop.UnitTesting.NUnit { @@ -46,6 +47,7 @@ namespace MonoDevelop.UnitTesting.NUnit DotNetProject project; string resultsPath; string storeId; + bool building; public override IList<string> UserAssemblyPaths { get { @@ -56,13 +58,24 @@ namespace MonoDevelop.UnitTesting.NUnit public NUnitProjectTestSuite (DotNetProject project): base (project.Name, project) { storeId = Path.GetFileName (project.FileName); - resultsPath = MonoDevelop.NUnit.RootTest.GetTestResultsDirectory (project.BaseDirectory); + resultsPath = UnitTestService.GetTestResultsDirectory (project.BaseDirectory); ResultsStore = new BinaryResultsStore (resultsPath, storeId); this.project = project; project.NameChanged += OnProjectRenamed; IdeApp.ProjectOperations.EndBuild += OnProjectBuilt; } - + + protected override async Task OnBuild () + { + try { + building = true; + await IdeApp.ProjectOperations.Build (project).Task; + } finally { + building = false; + } + OnProjectBuilt (null, null); + } + public static NUnitProjectTestSuite CreateTest (DotNetProject project) { if (!project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration).BuildEnabledForItem (project)) @@ -112,13 +125,8 @@ namespace MonoDevelop.UnitTesting.NUnit void OnProjectBuilt (object s, BuildEventArgs args) { - if (RefreshRequired) { + if (RefreshRequired) UpdateTests (); - } else { - Gtk.Application.Invoke (delegate { - OnProjectBuiltWithoutTestChange (EventArgs.Empty); - }); - } } public override void GetCustomTestRunner (out string assembly, out string type) @@ -170,15 +178,6 @@ namespace MonoDevelop.UnitTesting.NUnit } } } - - public event EventHandler ProjectBuiltWithoutTestChange; - - protected virtual void OnProjectBuiltWithoutTestChange (EventArgs e) - { - var handler = ProjectBuiltWithoutTestChange; - if (handler != null) - handler (this, e); - } } } diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs index 754a3eb9e9..968d750e07 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs @@ -28,7 +28,7 @@ -using MonoDevelop.NUnit.External; +using MonoDevelop.UnitTesting.NUnit.External; namespace MonoDevelop.UnitTesting.NUnit { diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs index e9bfc34bdc..77d6629e88 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs @@ -27,7 +27,7 @@ // -using MonoDevelop.NUnit.External; +using MonoDevelop.UnitTesting.NUnit.External; namespace MonoDevelop.UnitTesting.NUnit { diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs index 190ca89575..c0b1197d09 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs @@ -39,8 +39,6 @@ namespace MonoDevelop.UnitTesting.NUnit if (entry is DotNetProject) test = NUnitProjectTestSuite.CreateTest ((DotNetProject)entry); - if (entry is NUnitAssemblyGroupProject) - test = ((NUnitAssemblyGroupProject)entry).RootTest; UnitTestGroup grp = test as UnitTestGroup; if (grp != null && !grp.HasTests) { diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs index 6c85c5a090..9795cbcff6 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs @@ -27,7 +27,7 @@ using System; using System.Net; using System.Net.Sockets; -using MonoDevelop.NUnit.External; +using MonoDevelop.UnitTesting.NUnit.External; using System.IO; using System.Text; using System.Threading.Tasks; diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssembly.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssembly.cs deleted file mode 100644 index aa1d792a9e..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssembly.cs +++ /dev/null @@ -1,74 +0,0 @@ -// -// TestAssembly.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - - -using System; -using System.IO; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.UnitTesting.NUnit -{ - public class TestAssembly: NUnitAssemblyTestSuite - { - [ItemProperty ("Path")] - string path; - - public TestAssembly (): base (null) - { - } - - public TestAssembly (string path): base (null) - { - this.path = path; - } - - public override string Name { - get { return System.IO.Path.GetFileNameWithoutExtension (path); } - } - - public string Path { - get { return path; } - set { path = value; } - } - - protected override string AssemblyPath { - get { return path; } - } - - protected override string TestInfoCachePath { - get { - if (Parent != null) - return System.IO.Path.Combine (((RootTest)Parent).ResultsPath, System.IO.Path.GetFileName (path) + ".test-cache"); - else - return null; - } - } - } -} - diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyCollection.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyCollection.cs deleted file mode 100644 index efb786d2ff..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyCollection.cs +++ /dev/null @@ -1,79 +0,0 @@ -// -// TestAssemblyCollection.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - - -using System; -using System.Collections; - -namespace MonoDevelop.UnitTesting.NUnit -{ - public class TestAssemblyCollection: CollectionBase - { - NUnitAssemblyGroupProjectConfiguration owner; - - internal TestAssemblyCollection (NUnitAssemblyGroupProjectConfiguration owner) - { - this.owner = owner; - } - - public new TestAssembly this [int n] { - get { return (TestAssembly) List [n]; } - } - - public void Add (TestAssembly asm) - { - List.Add (asm); - } - - public void Remove (TestAssembly asm) - { - List.Remove (asm); - } - - protected override void OnInsertComplete (int index, object value) - { - owner.OnAssembliesChanged (); - } - - protected override void OnRemoveComplete (int index, object value) - { - owner.OnAssembliesChanged (); - } - - protected override void OnSetComplete (int index, object oldValue, object newValue) - { - owner.OnAssembliesChanged (); - } - - protected override void OnClearComplete () - { - owner.OnAssembliesChanged (); - } - } -} - diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyNodeBuilder.cs deleted file mode 100644 index a482ed2257..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TestAssemblyNodeBuilder.cs +++ /dev/null @@ -1,79 +0,0 @@ -// -// TestAssemblyNodeBuilder.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.IO; -using System.Collections; - -using MonoDevelop.Projects; -using MonoDevelop.Core; -using MonoDevelop.Ide.Gui.Pads; -using MonoDevelop.Components.Commands; -using MonoDevelop.UnitTesting.Commands; -using MonoDevelop.Ide.Commands; -using MonoDevelop.Ide.Gui.Components; - -namespace MonoDevelop.UnitTesting -{ - public class TestAssemblyNodeBuilder: TypeNodeBuilder - { - public override Type CommandHandlerType { - get { return typeof(TestAssemblyNodeCommandHandler); } - } - - public override string ContextMenuAddinPath { - get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly"; } - } - - public override Type NodeDataType { - get { return typeof(TestAssembly); } - } - - public override string GetNodeName (ITreeNavigator thisNode, object dataObject) - { - return Path.GetFileName (((TestAssembly)dataObject).Path); - } - - public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo) - { - TestAssembly asm = dataObject as TestAssembly; - nodeInfo.Label = Path.GetFileName (asm.Path); - nodeInfo.Icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Reference); - } - } - - class TestAssemblyNodeCommandHandler: NodeCommandHandler - { - public override void DeleteItem () - { - TestAssembly asm = CurrentNode.DataItem as TestAssembly; - NUnitAssemblyGroupProjectConfiguration config = (NUnitAssemblyGroupProjectConfiguration) CurrentNode.GetParentDataItem (typeof(NUnitAssemblyGroupProjectConfiguration), false); - config.Assemblies.Remove (asm); - } - } -} diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml new file mode 100644 index 0000000000..c18550380f --- /dev/null +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml @@ -0,0 +1,32 @@ +<ExtensionModel> + + <Runtime> + <Import assembly="nunit.core.dll" /> + <Import assembly="nunit.core.interfaces.dll" /> + <Import assembly="nunit.framework.dll" /> + <Import assembly="nunit.util.dll" /> + </Runtime> + + <!-- Extensions --> + + <Extension path = "/MonoDevelop/Ide/StartupHandlers"> + <Class class = "MonoDevelop.UnitTesting.NUnit.InitCommand"/> + </Extension> + + <Extension path = "/MonoDevelop/UnitTesting/TestProviders"> + <Class id="SystemTestProvider" class="MonoDevelop.NUnit.SystemTestProvider" /> + </Extension> + + <Extension path = "/MonoDevelop/Ide/ProjectTemplates"> + <ProjectTemplate id = "NUnitProject" resource = "NUnitProject.xpt.xml"/> + <ProjectTemplate id = "NUnitProjectVBNet" resource = "NUnitProjectVBNet.xpt.xml"/> + </Extension> + + <Extension path = "/MonoDevelop/Ide/FileTemplates"> + <FileTemplate id = "NUnitTestClass" resource = "NUnitTestClass.xft.xml"/> + </Extension> + + <Extension path="/MonoDevelop/Ide/TemplateImages"> + <Image id="md-nunit-library-project" resource="nunit-library-project.png" /> + </Extension> +</ExtensionModel> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs index 1c819770d9..70f88b129d 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs @@ -39,7 +39,7 @@ using NUnit.Core; using NUnit.Framework; using NUnit.Core.Filters; -namespace MonoDevelop.NUnit.External +namespace MonoDevelop.UnitTesting.NUnit.External { public class NUnitTestRunner: MarshalByRefObject { diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitAssemblyGroup.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitAssemblyGroup.xpt.xml index ab95772034..ab95772034 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitAssemblyGroup.xpt.xml +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitAssemblyGroup.xpt.xml diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitProject.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProject.xpt.xml index 7b364a57c3..7b364a57c3 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitProject.xpt.xml +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProject.xpt.xml diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitProjectVBNet.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProjectVBNet.xpt.xml index 12ec5b3dae..12ec5b3dae 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitProjectVBNet.xpt.xml +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProjectVBNet.xpt.xml diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitTestClass.xft.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml index aaebb07b4e..aaebb07b4e 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/NUnitTestClass.xft.xml +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/images/nunit-library-project.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project.png Binary files differindex c0e3797eaf..c0e3797eaf 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/images/nunit-library-project.png +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project.png diff --git a/main/src/addins/MonoDevelop.UnitTesting/templates/images/nunit-library-project@2x.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project@2x.png Binary files differindex c995eb9128..c995eb9128 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/templates/images/nunit-library-project@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project@2x.png diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project~dark.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark.png Binary files differindex ed1a8d0d5a..ed1a8d0d5a 100644 --- a/main/src/addins/NUnit/templates/images/nunit-library-project~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark.png diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark@2x.png Binary files differindex 62ef7ff47e..62ef7ff47e 100644 --- a/main/src/addins/NUnit/templates/images/nunit-library-project~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark@2x.png diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs index b98156d966..e02014707d 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs @@ -44,7 +44,7 @@ namespace MonoDevelop.UnitTesting } public override string ContextMenuAddinPath { - get { return "/MonoDevelop/NUnit/ContextMenu/TestPad"; } + get { return "/MonoDevelop/UnitTesting/ContextMenu/TestPad"; } } public override Type NodeDataType { diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs index 0d1cf3f785..4e7e783fe7 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs @@ -49,7 +49,7 @@ using System.Threading.Tasks; namespace MonoDevelop.UnitTesting { - public class TestPad : TreeViewPad + class TestPad : TreeViewPad { UnitTestService testService = UnitTestService.Instance; @@ -753,7 +753,7 @@ namespace MonoDevelop.UnitTesting void OnChartButtonPress (object o, Gtk.ButtonPressEventArgs args) { if (args.Event.TriggersContextMenu ()) { - IdeApp.CommandService.ShowContextMenu (Control, args.Event, "/MonoDevelop/NUnit/ContextMenu/TestChart"); + IdeApp.CommandService.ShowContextMenu (Control, args.Event, "/MonoDevelop/UnitTesting/ContextMenu/TestChart"); args.RetVal = true; } } diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs index da396e2136..5116508743 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs @@ -45,7 +45,6 @@ using MonoDevelop.Components; using System.Threading; using MonoDevelop.Ide.Commands; using MonoDevelop.Ide.Fonts; -using MonoDevelop.NUnit.External; namespace MonoDevelop.UnitTesting { @@ -151,7 +150,7 @@ namespace MonoDevelop.UnitTesting failuresTreeView.Selection.Changed += OnRowSelected; failuresTreeView.DoPopupMenu = delegate (EventButton evt) { IdeApp.CommandService.ShowContextMenu (failuresTreeView, evt, - "/MonoDevelop/NUnit/ContextMenu/TestResultsPad"); + "/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad"); }; panel.ShowAll (); diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs index 05d428b698..d0f28f7e81 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs @@ -33,7 +33,7 @@ using MonoDevelop.Ide; namespace MonoDevelop.UnitTesting { - static class TestStatusIcon + public static class TestStatusIcon { public static readonly Xwt.Drawing.Image Running; public static readonly Xwt.Drawing.Image None; diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark.png Binary files differindex c73c3e92fd..c73c3e92fd 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark@2x.png Binary files differindex 392713f95a..392713f95a 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel.png Binary files differindex 390f9d1e34..390f9d1e34 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel@2x.png Binary files differindex 0724d75161..0724d75161 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel.png Binary files differindex 390f9d1e34..390f9d1e34 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel@2x.png Binary files differindex 0724d75161..0724d75161 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark.png Binary files differindex b67ac9d2e7..b67ac9d2e7 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark@2x.png Binary files differindex 0a0c74b70b..0a0c74b70b 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel.png Binary files differindex 5de67db489..5de67db489 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png Binary files differindex e5dde885d9..e5dde885d9 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel.png Binary files differindex 5de67db489..5de67db489 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel@2x.png Binary files differindex e5dde885d9..e5dde885d9 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark.png Binary files differindex bfe3e1c59a..bfe3e1c59a 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark@2x.png Binary files differindex 8c66142ce0..8c66142ce0 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark.png Binary files differindex 683d1ae1d7..683d1ae1d7 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark@2x.png Binary files differindex 2dac729015..2dac729015 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark.png Binary files differindex 7506a641b1..7506a641b1 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark@2x.png Binary files differindex d4fb6f3aae..d4fb6f3aae 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark.png Binary files differindex ea24dc5244..ea24dc5244 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark@2x.png Binary files differindex 19908b7a58..19908b7a58 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark.png Binary files differindex 9567eba24d..9567eba24d 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark@2x.png Binary files differindex 7a72559000..7a72559000 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark.png Binary files differindex 4cf4973b3c..4cf4973b3c 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark@2x.png Binary files differindex 507066be18..507066be18 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark.png Binary files differindex fad4fdf159..fad4fdf159 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark@2x.png Binary files differindex f0fcadf3fc..f0fcadf3fc 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark.png Binary files differindex d8f17aaa61..d8f17aaa61 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark@2x.png Binary files differindex 07673c4707..07673c4707 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark@2x.png +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.UnitTesting/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting/Makefile.am index 3ae131ae68..c9cc87438f 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Makefile.am +++ b/main/src/addins/MonoDevelop.UnitTesting/Makefile.am @@ -1,3 +1 @@ -SUBDIRS = NUnitRunner . - include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index fd5dce62aa..b9a6e3fad9 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</ProjectGuid> <OutputType>Library</OutputType> - <AssemblyName>MonoDevelop.NUnit</AssemblyName> - <RootNamespace>MonoDevelop.NUnit</RootNamespace> + <AssemblyName>MonoDevelop.UnitTesting</AssemblyName> + <RootNamespace>MonoDevelop.UnitTesting</RootNamespace> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -23,7 +23,7 @@ </Execution> <DefineConstants>DEBUG</DefineConstants> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -36,7 +36,7 @@ </Execution> <DebugSymbols>true</DebugSymbols> <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile> + <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -99,11 +99,6 @@ <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="NUnitRunner\NUnitRunner.csproj"> - <Project>{0AF16AF1-0876-413E-9803-08BD33C19E00}</Project> - <Name>NUnitRunner</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> <Name>Mono.Addins</Name> @@ -121,9 +116,6 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml"> - <LogicalName>NUnitAssemblyGroup.xpt.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-running-16.png"> <LogicalName>unit-running-16.png</LogicalName> </EmbeddedResource> @@ -202,15 +194,9 @@ <EmbeddedResource Include="Gui\icons\unit-success-16%402x.png"> <LogicalName>unit-success-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\NUnitTestClass.xft.xml"> - <LogicalName>NUnitTestClass.xft.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="MonoDevelopNUnit.addin.xml"> <LogicalName>MonoDevelopNUnit.addin.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\NUnitProject.xpt.xml"> - <LogicalName>NUnitProject.xpt.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png"> <LogicalName>project-nunit-overlay-32.png</LogicalName> </EmbeddedResource> @@ -274,21 +260,6 @@ <EmbeddedResource Include="Gui\icons\unit-inconclusive-16~dark%402x.png"> <LogicalName>unit-inconclusive-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml"> - <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="templates\images\nunit-library-project.png"> - <LogicalName>nunit-library-project.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="templates\images\nunit-library-project%402x.png"> - <LogicalName>nunit-library-project@2x.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="templates\images\nunit-library-project~dark.png"> - <LogicalName>nunit-library-project~dark.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="templates\images\nunit-library-project~dark%402x.png"> - <LogicalName>nunit-library-project~dark@2x.png</LogicalName> - </EmbeddedResource> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> @@ -320,13 +291,11 @@ <Compile Include="Services\BinaryResultsStore.cs" /> <Compile Include="Services\NUnitSourceCodeLocationFinder.cs" /> <Compile Include="Services\RemoteUnhandledException.cs" /> + <Compile Include="Services\AbstractUnitTestEditorExtension.cs" /> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <ItemGroup> - <Folder Include="templates\images\" /> - </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml index fa83d7dd53..bb042a50d5 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml @@ -1,41 +1,21 @@ <ExtensionModel> - <Runtime> - <Import assembly="MonoDevelop.NUnit.dll" /> - <Import assembly="nunit.core.dll" /> - <Import assembly="nunit.core.interfaces.dll" /> - <Import assembly="nunit.framework.dll" /> - <Import assembly="nunit.util.dll" /> - </Runtime> - <!-- Extension Points --> - <ExtensionPoint path = "/MonoDevelop/NUnit/TestProviders" name = "Test providers"> + <ExtensionPoint path = "/MonoDevelop/UnitTesting/TestProviders" name = "Test providers"> <Description>Test providers. Specified classes must implement ITestProvider.</Description> <ExtensionNode name ="Class" /> </ExtensionPoint> - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestChart"> - <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> - </ExtensionPoint> - - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestPad"> - <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> - </ExtensionPoint> - - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestResultsPad"> + <ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestChart"> <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> </ExtensionPoint> - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup"> + <ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestPad"> <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> </ExtensionPoint> - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly"> - <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> - </ExtensionPoint> - - <ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration"> + <ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad"> <ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/> </ExtensionPoint> @@ -46,29 +26,23 @@ <!-- Extensions --> <Extension path = "/MonoDevelop/Ide/Pads"> - <SolutionPad id = "MonoDevelop.NUnit.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.NUnit.TestPad"> + <SolutionPad id = "MonoDevelop.UnitTesting.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.UnitTesting.TestPad"> <PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" /> <PadOption id = "ShowTestCounters" _label = "Show Test Counters" defaultValue = "False" /> - <NodeBuilder id = "TestNode" class = "MonoDevelop.NUnit.TestNodeBuilder"/> + <NodeBuilder id = "TestNode" class = "MonoDevelop.UnitTesting.TestNodeBuilder"/> </SolutionPad> - <Pad id="MonoDevelop.NUnit.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.NUnit.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/> + <Pad id="MonoDevelop.UnitTesting.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.NUnit.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/> </Extension> <Extension path="/MonoDevelop/Ide/WorkbenchLayouts"> <Layout id="UnitTesting" _name="Unit Testing"> - <LayoutPad id="MonoDevelop.NUnit.TestPad" status="Dockable" /> - <LayoutPad id="MonoDevelop.NUnit.TestResultsPad" status="Dockable" /> + <LayoutPad id="MonoDevelop.UnitTesting.TestPad" status="Dockable" /> + <LayoutPad id="MonoDevelop.UnitTesting.TestResultsPad" status="Dockable" /> </Layout> </Extension> - <Extension path = "/MonoDevelop/Ide/Pads/ProjectPad"> - <NodeBuilder id = "NUnitAssemblyGroupNodeBuilder" class = "MonoDevelop.NUnit.NUnitAssemblyGroupNodeBuilder"/> - <NodeBuilder id = "NUnitAssemblyGroupConfigurationNodeBuilder" class = "MonoDevelop.NUnit.NUnitAssemblyGroupConfigurationNodeBuilder"/> - <NodeBuilder id = "TestAssemblyNodeBuilder" class = "MonoDevelop.NUnit.TestAssemblyNodeBuilder"/> - </Extension> - <Extension path = "/MonoDevelop/Ide/Commands"> - <Category _name = "NUnit" id = "NUnit"> + <Category _name = "Unit Testing" id = "UnitTesting"> <Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunAllTests" _label = "Run Unit Tests" icon = "md-run-unit-tests" @@ -95,7 +69,6 @@ <Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowSuccessfulTests" _label = "Show successful tests" type="check"/> <Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowFailedTests" _label = "Show failed tests" type="check"/> <Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowIgnoredTests" _label = "Show ignored tests" type="check"/> - <Command id = "MonoDevelop.UnitTesting.Commands.NUnitProjectCommands.AddAssembly" _label = "Add assembly..."/> </Category> </Extension> @@ -103,19 +76,7 @@ <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunAllTests" /> </Extension> - <Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup"> - <CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" /> - </Extension> - - <Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration"> - <CommandItem id = "MonoDevelop.UnitTesting.Commands.NUnitProjectCommands.AddAssembly" /> - </Extension> - - <Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly"> - <CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" /> - </Extension> - - <Extension path = "/MonoDevelop/NUnit/ContextMenu/TestPad"> + <Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestPad"> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunTest" /> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.DebugTest" /> <ItemSet id = "RunTestWith" _label = "Run Test With"> @@ -127,7 +88,7 @@ <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestDetails" /> </Extension> - <Extension path = "/MonoDevelop/NUnit/ContextMenu/TestResultsPad"> + <Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad"> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.GoToFailure" /> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestCode" /> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.SelectTestInTree" /> @@ -136,7 +97,7 @@ <CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy" /> </Extension> - <Extension path = "/MonoDevelop/NUnit/ContextMenu/TestChart"> + <Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestChart"> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowResults" /> <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowTime" /> <SeparatorItem id = "s1" /> @@ -148,17 +109,7 @@ <CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.SingleDayResult" /> </Extension> - <Extension path = "/MonoDevelop/Ide/ProjectTemplates"> -<!-- <ProjectTemplate id = "NUnitAssemblyGroup" resource = "NUnitAssemblyGroup.xpt.xml"/>--> - <ProjectTemplate id = "NUnitProject" resource = "NUnitProject.xpt.xml"/> - <ProjectTemplate id = "NUnitProjectVBNet" resource = "NUnitProjectVBNet.xpt.xml"/> - </Extension> - - <Extension path = "/MonoDevelop/Ide/FileTemplates"> - <FileTemplate id = "NUnitTestClass" resource = "NUnitTestClass.xft.xml"/> - </Extension> - - <Extension path = "/MonoDevelop/NUnit/TestProviders"> + <Extension path = "/MonoDevelop/UnitTesting/TestProviders"> <Class id="SystemTestProvider" class="MonoDevelop.NUnit.SystemTestProvider" /> </Extension> @@ -167,14 +118,7 @@ </Extension> <Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions"> - <Class class = "MonoDevelop.NUnit.NUnitProjectServiceExtension" /> - </Extension> - - <Extension path = "/MonoDevelop/ProjectModel/SerializableClasses"> - <DataType class = "MonoDevelop.NUnit.NUnitAssemblyGroupProject" /> - </Extension> - - <Extension path="/MonoDevelop/Ide/TemplateImages"> - <Image id="md-nunit-library-project" resource="nunit-library-project.png" /> + <Class class = "MonoDevelop.UnitTesting.UnitTestProjectServiceExtension" /> </Extension> + </ExtensionModel> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs index a5d10c3dde..a56795b0db 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/AbstractUnitTestEditorExtension.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; using System.Threading; -using MonoDevelop.NUnit; using MonoDevelop.Core; using MonoDevelop.Ide; using Gtk; @@ -35,6 +34,7 @@ using MonoDevelop.Components; using System.Threading.Tasks; using MonoDevelop.Ide.Editor.Extension; using MonoDevelop.Ide.Editor; +using MonoDevelop.Projects; namespace MonoDevelop.UnitTesting { @@ -175,47 +175,47 @@ namespace MonoDevelop.UnitTesting var menu = new ContextMenu (); if (unitTest.IsFixture) { var menuItem = new ContextMenuItem ("_Run All"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, false).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, false).Run; menu.Add (menuItem); if (debugModeSet != null) { menuItem = new ContextMenuItem ("_Debug All"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, true).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, true).Run; menu.Add (menuItem); } menuItem = new ContextMenuItem ("_Select in Test Pad"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, true).Select; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, true).Select; menu.Add (menuItem); } else { if (unitTest.TestCases.Count == 0) { var menuItem = new ContextMenuItem ("_Run"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, false).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, false).Run; menu.Add (menuItem); if (debugModeSet != null) { menuItem = new ContextMenuItem ("_Debug"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, true).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, true).Run; menu.Add (menuItem); } menuItem = new ContextMenuItem ("_Select in Test Pad"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, true).Select; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, true).Select; menu.Add (menuItem); } else { var menuItem = new ContextMenuItem ("_Run All"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, false).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, false).Run; menu.Add (menuItem); if (debugModeSet != null) { menuItem = new ContextMenuItem ("_Debug All"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, true).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, ext.DocumentContext.Project, true).Run; menu.Add (menuItem); } menu.Add (new SeparatorContextMenuItem ()); foreach (var id in unitTest.TestCases) { var submenu = new ContextMenu (); menuItem = new ContextMenuItem ("_Run"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, false).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, ext.DocumentContext.Project, false).Run; submenu.Add (menuItem); if (debugModeSet != null) { menuItem = new ContextMenuItem ("_Debug"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, true).Run; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, ext.DocumentContext.Project, true).Run; submenu.Add (menuItem); } @@ -231,7 +231,7 @@ namespace MonoDevelop.UnitTesting } menuItem = new ContextMenuItem ("_Select in Test Pad"); - menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, true).Select; + menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, ext.DocumentContext.Project, true).Select; submenu.Add (menuItem); var subMenuItem = new ContextMenuItem (label); @@ -251,11 +251,13 @@ namespace MonoDevelop.UnitTesting { readonly string testCase; readonly bool debug; + IBuildTarget project; - public TestRunner (string testCase, bool debug) + public TestRunner (string testCase, IBuildTarget project, bool debug) { this.testCase = testCase; this.debug = debug; + this.project = project; } bool TimeoutHandler () @@ -270,8 +272,7 @@ namespace MonoDevelop.UnitTesting return false; } - List<NUnitProjectTestSuite> testSuites = new List<NUnitProjectTestSuite>(); - internal void Run (object sender, EventArgs e) + internal async void Run (object sender, EventArgs e) { if (IdeApp.ProjectOperations.IsBuilding (IdeApp.ProjectOperations.CurrentSelectedSolution) || IdeApp.ProjectOperations.IsRunning (IdeApp.ProjectOperations.CurrentSelectedSolution)) @@ -283,45 +284,11 @@ namespace MonoDevelop.UnitTesting return; } - var tests = new Stack<UnitTest> (); - foreach (var test in UnitTestService.Instance.RootTests) { - tests.Push (test); - } - while (tests.Count > 0) { - var test = tests.Pop (); - - var solutionFolderTestGroup = test as SolutionFolderTestGroup; - if (solutionFolderTestGroup != null) { - foreach (var test2 in solutionFolderTestGroup.Tests) { - tests.Push (test2); - } - continue; - } - var nUnitProjectTestSuite = test as NUnitProjectTestSuite; - if (nUnitProjectTestSuite != null) - testSuites.Add (nUnitProjectTestSuite); - } - - foreach (var test in testSuites) { - test.TestChanged += HandleTestChanged; - test.ProjectBuiltWithoutTestChange += HandleTestChanged; - } - - IdeApp.ProjectOperations.Build (IdeApp.ProjectOperations.CurrentSelectedSolution); - } - - void HandleTestChanged (object sender, EventArgs e) - { - var foundTest = UnitTestService.Instance.SearchTestById (testCase); - if (foundTest != null) { - foreach (var test in testSuites) { - test.TestChanged -= HandleTestChanged; - test.ProjectBuiltWithoutTestChange -= HandleTestChanged; - } - testSuites.Clear (); + await IdeApp.ProjectOperations.Build (project).Task; - RunTest (foundTest); - } + foundTest = UnitTestService.Instance.SearchTestById (testCase); + if (foundTest != null) + RunTest (foundTest); } internal void Select (object sender, EventArgs e) diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs index 2cbc70db34..f5cda4a92a 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs @@ -28,10 +28,9 @@ using System.Threading.Tasks; using System.Threading; using Mono.Addins; using System.Collections.Generic; -using MonoDevelop.NUnit; using MonoDevelop.Projects; -namespace MonoDevelop.NUnit +namespace MonoDevelop.UnitTesting { public abstract class NUnitSourceCodeLocationFinder { diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs index e9e0edc650..d125b64f43 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs @@ -53,8 +53,6 @@ namespace MonoDevelop.UnitTesting if (c.IsRoot) { folder.ParentSolution.SolutionItemAdded += OnEntryChanged; folder.ParentSolution.SolutionItemRemoved += OnEntryChanged; - IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChanged; - IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChanged; } } @@ -69,18 +67,10 @@ namespace MonoDevelop.UnitTesting if (folder.IsRoot) { folder.ParentSolution.SolutionItemAdded -= OnEntryChanged; folder.ParentSolution.SolutionItemRemoved -= OnEntryChanged; - IdeApp.Workspace.ReferenceAddedToProject -= OnReferenceChanged; - IdeApp.Workspace.ReferenceRemovedFromProject -= OnReferenceChanged; } base.Dispose (); } - void OnReferenceChanged (object s, ProjectReferenceEventArgs args) - { - if (args.Project.ParentSolution == folder.ParentSolution && NUnitProjectTestSuite.IsNUnitReference (args.ProjectReference)) - UpdateTests (); - } - void OnEntryChanged (object sender, SolutionItemEventArgs e) { UpdateTests (); diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs index d3d32fb312..498ae009a5 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs @@ -311,6 +311,24 @@ namespace MonoDevelop.UnitTesting { return true; } + + bool building; + + /// <summary> + /// Builds the project that contains this unit test or group of unit tests. + /// It returns when the project has been built and the tests have been updated. + /// </summary> + public Task Build () + { + return OnBuild (); + } + + protected virtual Task OnBuild () + { + if (parent != null) + return parent.Build (); + return Task.FromResult (true); + } public void RegisterResult (TestContext context, UnitTestResult result) { diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs index 516f71d035..282cdcdca4 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs @@ -62,7 +62,7 @@ namespace MonoDevelop.UnitTesting IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChangedInProject;; IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChangedInProject; - Mono.Addins.AddinManager.AddExtensionNodeHandler ("/MonoDevelop/NUnit/TestProviders", OnExtensionChange); + Mono.Addins.AddinManager.AddExtensionNodeHandler ("/MonoDevelop/UnitTesting/TestProviders", OnExtensionChange); } public static UnitTestService Instance { diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs b/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs index f35069200e..127691c37f 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs @@ -30,7 +30,8 @@ using System; using System.IO; using MonoDevelop.Projects; using MonoDevelop.Projects.Extensions; -using MonoDevelop.NUnit; +using MonoDevelop.UnitTesting; +using MonoDevelop.UnitTesting.NUnit; namespace MonoDeveloper { diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj index d75455ff7d..59fc536120 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj @@ -51,16 +51,19 @@ <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\NUnit\MonoDevelop.NUnit.csproj"> - <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> - <Name>MonoDevelop.UnitTesting</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> <Name>Mono.Addins</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj"> + <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> + <Name>MonoDevelop.UnitTesting</Name> + </ProjectReference> + <ProjectReference Include="..\..\MonoDevelop.UnitTesting.NUnit\MonoDevelop.UnitTesting.NUnit.csproj"> + <Project>{6224D87E-2AC1-4D9F-91ED-714F797297BF}</Project> + <Name>MonoDevelop.UnitTesting.NUnit</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Reference Include="System" /> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj index 4c9147d4dd..e75a355b85 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> diff --git a/main/src/tools/mdmonitor/gtk-gui/generated.cs b/main/src/tools/mdmonitor/gtk-gui/generated.cs index 0ada9fc5f0..097e9cb288 100644 --- a/main/src/tools/mdmonitor/gtk-gui/generated.cs +++ b/main/src/tools/mdmonitor/gtk-gui/generated.cs @@ -17,6 +17,7 @@ namespace Stetic internal class BinContainer { private Gtk.Widget child; + private Gtk.UIManager uimanager; public static BinContainer Attach (Gtk.Bin bin) @@ -58,7 +59,8 @@ namespace Stetic if ((this.uimanager != null)) { Gtk.Widget w; w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { + if (((w != null) + && typeof (Gtk.Window).IsInstanceOfType (w))) { ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); this.uimanager = null; } @@ -76,7 +78,7 @@ namespace Stetic } else { int sz; int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); + global::Gtk.Icon.SizeLookup (size, out sz, out sy); try { return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); } catch (System.Exception) { @@ -91,8 +93,12 @@ namespace Stetic pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); + pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) + - (sz / 4)), ((sz - 1) + - (sz / 4))); + pmap.DrawLine (gc, ((sz - 1) + - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) + - (sz / 4))); return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); } } diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj index 744a687364..87a20361cb 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -204,14 +204,14 @@ <Name>Xwt</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\src\addins\NUnit\MonoDevelop.NUnit.csproj"> - <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> - <Name>MonoDevelop.UnitTesting</Name> - </ProjectReference> <ProjectReference Include="..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj"> <Project>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</Project> <Name>GuiUnit_NET_4_5</Name> </ProjectReference> + <ProjectReference Include="..\..\src\addins\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj"> + <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project> + <Name>MonoDevelop.UnitTesting</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Compile Include="Util.cs" /> |
