pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix build.

pull/1/head
Daniel Grunwald 16 years ago
parent
9dbd100c32
commit
20cce69fa9
4 changed files with 38 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs
  2. 2
      src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs
  3. 60
      src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs
  4. 3
      src/Main/Core/Test/ICSharpCode.Core.Tests.csproj

2
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs
Unescape View File

@ -33,7 +33,7 @@ namespace PythonBinding.Tests.Utils
/// <summary> /// <summary>
/// Gets the codon with the specified name. /// Gets the codon with the specified name.
/// </summary> /// </summary>
public static Codon GetCodon(List<Codon> codons, string name) public static Codon GetCodon(IEnumerable<Codon> codons, string name)
{ {
foreach (Codon codon in codons) { foreach (Codon codon in codons) {
if (codon.Id == name) { if (codon.Id == name) {

2
src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs
Unescape View File

@ -33,7 +33,7 @@ namespace RubyBinding.Tests.Utils
/// <summary> /// <summary>
/// Gets the codon with the specified name. /// Gets the codon with the specified name.
/// </summary> /// </summary>
public static Codon GetCodon(List<Codon> codons, string name) public static Codon GetCodon(IEnumerable<Codon> codons, string name)
{ {
foreach (Codon codon in codons) { foreach (Codon codon in codons) {
if (codon.Id == name) { if (codon.Id == name) {

60
src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs
Unescape View File

@ -6,7 +6,9 @@
// </file> // </file>
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using NUnit.Framework; using NUnit.Framework;
namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
@ -133,11 +135,13 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText)); AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(1, addIn.Paths.Count); Assert.AreEqual(1, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]); Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Name); List<Codon> codons = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Id); Assert.AreEqual(1, codons.Count);
Assert.AreEqual("a", addIn.Paths["/Path1"].Codons[0].Properties["attr"]); Assert.AreEqual("Simple", codons[0].Name);
Assert.AreEqual("b", addIn.Paths["/Path1"].Codons[0].Properties["attr2"]); Assert.AreEqual("Simple", codons[0].Id);
Assert.AreEqual("a", codons[0].Properties["attr"]);
Assert.AreEqual("b", codons[0].Properties["attr2"]);
} }
[Test] [Test]
@ -154,14 +158,16 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText)); AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(2, addIn.Paths.Count); Assert.AreEqual(2, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]); Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count); List<Codon> codons1 = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual("Sub", addIn.Paths["/Path1"].Codons[0].Name); Assert.AreEqual(1, codons1.Count);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].Id); Assert.AreEqual("Sub", codons1[0].Name);
Assert.AreEqual("Path2", codons1[0].Id);
Assert.IsNotNull(addIn.Paths["/Path1/Path2"]); Assert.IsNotNull(addIn.Paths["/Path1/Path2"]);
Assert.AreEqual(1, addIn.Paths["/Path1/Path2"].Codons.Count); List<Codon> codons2 = addIn.Paths["/Path1/Path2"].Codons.ToList();
Assert.AreEqual("Codon2", addIn.Paths["/Path1/Path2"].Codons[0].Name); Assert.AreEqual(1, codons2.Count);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].Id); Assert.AreEqual("Codon2", codons2[0].Name);
Assert.AreEqual("Sub2", codons2[0].Id);
} }
[Test] [Test]
@ -180,16 +186,18 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText)); AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(2, addIn.Paths.Count); Assert.AreEqual(2, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]); Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count); List<Codon> codons1 = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual("Sub", addIn.Paths["/Path1"].Codons[0].Name); Assert.AreEqual(1, codons1.Count);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].Id); Assert.AreEqual("Sub", codons1[0].Name);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons[0].Conditions.Length); Assert.AreEqual("Path2", codons1[0].Id);
Assert.AreEqual(1, codons1[0].Conditions.Length);
Assert.IsNotNull(addIn.Paths["/Path1/Path2"]); Assert.IsNotNull(addIn.Paths["/Path1/Path2"]);
Assert.AreEqual(1, addIn.Paths["/Path1/Path2"].Codons.Count); List<Codon> codons2 = addIn.Paths["/Path1/Path2"].Codons.ToList();
Assert.AreEqual("Codon2", addIn.Paths["/Path1/Path2"].Codons[0].Name); Assert.AreEqual(1, codons2.Count);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].Id); Assert.AreEqual("Codon2", codons2[0].Name);
Assert.AreEqual(0, addIn.Paths["/Path1/Path2"].Codons[0].Conditions.Length); Assert.AreEqual("Sub2", codons2[0].Id);
Assert.AreEqual(0, codons2[0].Conditions.Length);
} }
[Test] [Test]
@ -207,8 +215,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, addIn.Paths.Count, "Paths != 1"); Assert.AreEqual(1, addIn.Paths.Count, "Paths != 1");
ExtensionPath path = addIn.Paths["/Path1"]; ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path); Assert.IsNotNull(path);
Assert.AreEqual(1, path.Codons.Count); Codon codon = path.Codons.Single();
Codon codon = path.Codons[0];
Assert.AreEqual("Simple", codon.Name); Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id); Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]); Assert.AreEqual("a", codon["attr"]);
@ -244,8 +251,8 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
ExtensionPath path = addIn.Paths["/Path1"]; ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path); Assert.IsNotNull(path);
Assert.AreEqual(3, path.Codons.Count); Assert.AreEqual(3, path.Codons.Count());
Codon codon = path.Codons[0]; Codon codon = path.Codons.ElementAt(0);
Assert.AreEqual("Simple", codon.Name); Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id); Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]); Assert.AreEqual("a", codon["attr"]);
@ -265,7 +272,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual("1", condition["string"]); Assert.AreEqual("1", condition["string"]);
Assert.AreEqual("2", condition["equal"]); Assert.AreEqual("2", condition["equal"]);
codon = path.Codons[1]; codon = path.Codons.ElementAt(1);
Assert.AreEqual(1, codon.Conditions.Length); Assert.AreEqual(1, codon.Conditions.Length);
condition = codon.Conditions[0] as Condition; condition = codon.Conditions[0] as Condition;
Assert.IsNotNull(condition); Assert.IsNotNull(condition);
@ -273,7 +280,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual("a", condition["string"]); Assert.AreEqual("a", condition["string"]);
Assert.AreEqual("b", condition["equal"]); Assert.AreEqual("b", condition["equal"]);
codon = path.Codons[2]; codon = path.Codons.ElementAt(2);
Assert.AreEqual(0, codon.Conditions.Length); Assert.AreEqual(0, codon.Conditions.Length);
} }
@ -301,8 +308,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, addIn.Paths.Count); Assert.AreEqual(1, addIn.Paths.Count);
ExtensionPath path = addIn.Paths["/Path1"]; ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path); Assert.IsNotNull(path);
Assert.AreEqual(1, path.Codons.Count); Codon codon = path.Codons.Single();
Codon codon = path.Codons[0];
Assert.AreEqual("Simple", codon.Name); Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id); Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]); Assert.AreEqual("a", codon["attr"]);

3
src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
Unescape View File

@ -39,6 +39,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />

Write Preview
Loading…
Cancel
Save