Browse Source

Core tests are in the solution.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@25 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
commit
9a785e68a0
  1. 1
      src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs
  2. 22
      src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs
  3. 56
      src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
  4. 73
      src/SharpDevelop.sln

1
src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs

@ -192,6 +192,7 @@ namespace ICSharpCode.NUnitPad @@ -192,6 +192,7 @@ namespace ICSharpCode.NUnitPad
string outputAssembly = project.OutputAssemblyFullPath;
try {
TestSuiteBuilder builder = new TestSuiteBuilder();
Console.WriteLine("Try : " + outputAssembly);
Test testDomain = builder.Build(outputAssembly);
testTreeView.PrintTests(outputAssembly, testDomain);
} catch (Exception e) {

22
src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs

@ -128,7 +128,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -128,7 +128,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Name);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].ID);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Id);
Assert.AreEqual("a", addIn.Paths["/Path1"].Codons[0].Properties["attr"]);
Assert.AreEqual("b", addIn.Paths["/Path1"].Codons[0].Properties["attr2"]);
}
@ -149,12 +149,12 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -149,12 +149,12 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Sub", addIn.Paths["/Path1"].Codons[0].Name);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].ID);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].Id);
Assert.IsNotNull(addIn.Paths["/Path1/Path2"]);
Assert.AreEqual(1, addIn.Paths["/Path1/Path2"].Codons.Count);
Assert.AreEqual("Codon2", addIn.Paths["/Path1/Path2"].Codons[0].Name);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].ID);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].Id);
}
[Test]
@ -164,7 +164,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -164,7 +164,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
<AddIn>
<Path name = '/Path1'>
<Condition name='Equal' string='a' equal='b'>
<Simple ID ='Simple' attr='a' attr2='b'/>
<Simple id ='Simple' attr='a' attr2='b'/>
</Condition>
</Path>
</AddIn>";
@ -175,7 +175,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -175,7 +175,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, path.Codons.Count);
Codon codon = path.Codons[0];
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon["ID"]);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);
Assert.AreEqual("b", codon["attr2"]);
@ -197,11 +197,11 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -197,11 +197,11 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
<Path name = '/Path1'>
<Condition name='Equal' string='a' equal='b'>
<Condition name='StackedCondition' string='1' equal='2'>
<Simple ID ='Simple' attr='a' attr2='b'/>
<Simple id ='Simple' attr='a' attr2='b'/>
</Condition>
<Simple ID ='Simple2' attr='a' attr2='b'/>
<Simple id ='Simple2' attr='a' attr2='b'/>
</Condition>
<Simple ID ='Simple3' attr='a' attr2='b'/>
<Simple id ='Simple3' attr='a' attr2='b'/>
</Path>
</AddIn>";
AddIn addIn = AddIn.Load(new StringReader(addInText));
@ -212,7 +212,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -212,7 +212,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(3, path.Codons.Count);
Codon codon = path.Codons[0];
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon["ID"]);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);
Assert.AreEqual("b", codon["attr2"]);
@ -258,7 +258,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -258,7 +258,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
<Condition name='Equal' string='a' equal='b'/>
</Or>
</And>
<Simple ID ='Simple' attr='a' attr2='b'/>
<Simple id ='Simple' attr='a' attr2='b'/>
</ComplexCondition>
</Path>
</AddIn>";
@ -269,7 +269,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -269,7 +269,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, path.Codons.Count);
Codon codon = path.Codons[0];
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon["ID"]);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);
Assert.AreEqual("b", codon["attr2"]);

56
src/Main/Core/Test/ICSharpCode.Core.Tests.csproj

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns:Conversion="urn:Conversion" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -8,28 +8,20 @@ @@ -8,28 +8,20 @@
<RootNamespace>ICSharpCode.Core.Tests</RootNamespace>
<AssemblyName>ICSharpCode.Core.Tests</AssemblyName>
<OutputTarget>Library</OutputTarget>
<ApplicationIcon>
</ApplicationIcon>
<WarningLevel>4</WarningLevel>
<NoWarn>
</NoWarn>
<StartupObject>
</StartupObject>
<NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<OutputType>Library</OutputType>
<StartupObject />
<ApplicationIcon />
<Win32Resource />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>
</DefineConstants>
<OutputPath>..\..\..\..\bin\</OutputPath>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
@ -38,36 +30,28 @@ @@ -38,36 +30,28 @@
<Optimize>True</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>
</DefineConstants>
<OutputPath>..\..\..\..\bin\</OutputPath>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
</Reference>
<Reference Include="System.Data">
</Reference>
<Reference Include="System.Drawing">
</Reference>
<Reference Include="System.Windows.Forms">
</Reference>
<Reference Include="System.Xml">
</Reference>
<Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="nunit.framework" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
</Compile>
<Compile Include="AddInTreeTests\AddInTreeLoadingTests.cs">
</Compile>
<Compile Include="AddInTreeTests\ExtPathTests.cs">
</Compile>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="AddInTreeTests\AddInTreeLoadingTests.cs" />
<Compile Include="AddInTreeTests\ExtPathTests.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="AddInTreeTests\">
</Folder>
<Folder Include="AddInTreeTests\" />
<ProjectReference Include="..\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>

73
src/SharpDevelop.sln

@ -1,31 +1,5 @@ @@ -1,31 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -60,6 +34,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE @@ -60,6 +34,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{ad6faa08-d6f5-4dba-af85-f4da9f40c3b5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -133,15 +135,6 @@ Global @@ -133,15 +135,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@ -154,5 +147,15 @@ Global @@ -154,5 +147,15 @@ Global
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{ad6faa08-d6f5-4dba-af85-f4da9f40c3b5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal

Loading…
Cancel
Save