Browse Source

Fixed unit tests when .NET FX 3.5 is installed - do not rely on the order in which Reflection returns methods.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2624 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
37c18e0660
  1. 2
      data/templates/file/CSharp/CSharp.UnitTest.xft
  2. 15
      src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
  3. 3
      src/Main/Base/Test/CollectionClassOverridesTestFixture.cs

2
data/templates/file/CSharp/CSharp.UnitTest.xft

@ -50,9 +50,9 @@ @@ -50,9 +50,9 @@
<File name="${FullName}" language="C#"><![CDATA[${StandardHeader.C#}
<% if (ConditionalClass) { %>#if TEST
<% } %>
using System;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using System;
namespace ${StandardNamespace}
{

15
src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs

@ -71,6 +71,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -71,6 +71,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
}
}
[Obsolete]
public class TemplateScript
{
string languageName;
@ -150,7 +151,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -150,7 +151,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
List<FileDescriptionTemplate> files = new List<FileDescriptionTemplate>();
List<TemplateProperty> properties = new List<TemplateProperty>();
List<TemplateScript> scripts = new List<TemplateScript>();
List<TemplateType> customTypes = new List<TemplateType>();
XmlElement fileoptions = null;
@ -244,15 +244,17 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -244,15 +244,17 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
}
}
[Obsolete]
public List<TemplateScript> Scripts {
get {
return scripts;
return new List<TemplateScript>();
}
}
[Obsolete]
public bool HasScripts {
get {
return scripts != null && scripts.Count > 0;
return false;
}
}
@ -314,13 +316,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -314,13 +316,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
this.files.Add(new FileDescriptionTemplate((XmlElement)filenode, Path.GetDirectoryName(filename)));
}
}
// load scripts (if any)
XmlNodeList scriptList = doc.DocumentElement.SelectNodes("Script");
foreach (XmlElement scriptElement in scriptList) {
this.scripts.Add(new TemplateScript(scriptElement));
}
}
static FileTemplate()

3
src/Main/Base/Test/CollectionClassOverridesTestFixture.cs

@ -95,6 +95,9 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -95,6 +95,9 @@ namespace ICSharpCode.SharpDevelop.Tests
expectedMethodNames.Add("RemoveItem");
expectedMethodNames.Add("SetItem");
methodNames.Sort();
expectedMethodNames.Sort();
Assert.AreEqual(expectedMethodNames.ToArray(), methodNames.ToArray());
}

Loading…
Cancel
Save