Browse Source

Fixed build.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2587 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
e2ff87117b
  1. 51
      src/AddIns/BackendBindings/VBNetBinding/Test/ExpressionFinderTest.cs
  2. 3
      src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj
  3. 28
      src/Main/Base/Test/VBExpressionFinderTests.cs
  4. 10
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AttributeReturnType.cs
  5. 5
      src/SharpDevelop.Tests.sln

51
src/AddIns/BackendBindings/VBNetBinding/Test/ExpressionFinderTest.cs

@ -1,51 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using NUnit.Framework;
using VBNetBinding.Parser;
namespace VBNetBinding.Tests
{
[TestFixture]
public class ExpressionFinderTest
{
ExpressionFinder ef;
[SetUp]
public void Init()
{
ef = new ExpressionFinder();
}
void Test(string expr, int offset)
{
string fulltext = "Test\n " + expr + ".AnotherField \n TestEnde";
Assert.AreEqual(expr, ef.FindFullExpression(fulltext, 6 + offset).Expression);
}
[Test]
public void FieldReference()
{
Test("abc", 1);
Test("abc.def", 6);
}
[Test]
public void WithFieldReference()
{
Test(".abc", 2);
Test(".abc.def", 7);
}
[Test]
public void MethodCall()
{
Test("abc.Method().Method()", 16);
}
}
}

3
src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj

@ -40,9 +40,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Compile Include="ExpressionFinderTest.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Project\VBNetBinding.csproj"> <ProjectReference Include="..\Project\VBNetBinding.csproj">
<Project>{BF38FB72-B380-4196-AF8C-95749D726C61}</Project> <Project>{BF38FB72-B380-4196-AF8C-95749D726C61}</Project>

28
src/Main/Base/Test/VBExpressionFinderTests.cs

@ -73,5 +73,33 @@ End Class
{ {
FindFull(program1, "arName", "loopVarName", ExpressionContext.Default); FindFull(program1, "arName", "loopVarName", ExpressionContext.Default);
} }
#region Old Tests
void OldTest(string expr, int offset)
{
string fulltext = "Test\n " + expr + ".AnotherField \n TestEnde";
Assert.AreEqual(expr, ef.FindFullExpression(fulltext, 6 + offset).Expression);
}
[Test]
public void FieldReference()
{
OldTest("abc", 1);
OldTest("abc.def", 6);
}
[Test]
public void WithFieldReference()
{
OldTest(".abc", 2);
OldTest(".abc.def", 7);
}
[Test]
public void MethodCall()
{
OldTest("abc.Method().Method()", 16);
}
#endregion
} }
} }

10
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AttributeReturnType.cs

@ -21,12 +21,12 @@ namespace ICSharpCode.SharpDevelop.Dom
this.name = name; this.name = name;
} }
public override string Name {
get { return name; }
}
public override IReturnType BaseType { public override IReturnType BaseType {
get { return null; } get {
return null;
}
} }
} }
} }

5
src/SharpDevelop.Tests.sln

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
# SharpDevelop 2.1.0.2382 # SharpDevelop 2.2.0.2560
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
@ -38,8 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
@ -324,7 +322,6 @@ Global
{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{50A89267-A28B-4DF3-8E62-912E005143B8} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}

Loading…
Cancel
Save