diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2015-01-12 14:33:56 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2015-01-12 17:24:15 +0300 |
| commit | 6b97130580393429761e0c7da57aea79e9b0f09b (patch) | |
| tree | ab1207015abbd00afbec303f16119976cd570d5c /main/src/addins/Xml/Tests | |
| parent | 878108c4b3fca0872337d28ad3216be2bd63c583 (diff) | |
[MonoDevelop.Xml] Removed NR5 usages.
Diffstat (limited to 'main/src/addins/Xml/Tests')
4 files changed, 12 insertions, 17 deletions
diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj index 7ab5066acc..0b551fa523 100644 --- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj +++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj @@ -51,10 +51,6 @@ <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> - <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project> - <Name>ICSharpCode.NRefactory</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> diff --git a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs index ad84140b7a..eb1b0f02a9 100644 --- a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs +++ b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs @@ -28,10 +28,10 @@ using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; using MonoDevelop.Xml.Dom; using MonoDevelop.Xml.Parser; using NUnit.Framework; +using MonoDevelop.Ide.TypeSystem; namespace MonoDevelop.Xml.Tests.Parser @@ -232,8 +232,8 @@ namespace MonoDevelop.Xml.Tests.Parser Assert.AreEqual ("foo", el.Attributes.ElementAt (2).Name.Name); Assert.AreEqual (3, el.Attributes.Count ());
parser.AssertErrorCount (1); - Assert.AreEqual (1, parser.Errors [0].Region.BeginLine); - Assert.AreEqual (26, parser.Errors [0].Region.BeginColumn);
+ Assert.AreEqual (1, parser.Errors [0].Region.Begin.Line); + Assert.AreEqual (26, parser.Errors [0].Region.Begin.Column);
} [Test] diff --git a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs index 74afe274ff..5d86b92cb4 100644 --- a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs +++ b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs @@ -30,12 +30,12 @@ using System; using System.Collections.Generic;
using System.Linq;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem; using MonoDevelop.Xml.Completion; using MonoDevelop.Xml.Dom; using MonoDevelop.Xml.Parser; using NUnit.Framework; +using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Tests.Parser { @@ -65,13 +65,13 @@ namespace MonoDevelop.Xml.Tests.Parser var p = new TestXmlParser (new XmlRootState (), true); //parse and capture line/col info - var list = new List<TextLocation> (); + var list = new List<DocumentLocation> (); p.Parse (txt, Array.ConvertAll (asserts, a => (Action)(() => list.Add (p.Location)))); var doc = (XDocument) p.Nodes.Last (); for (int i = 0; i < asserts.Length; i++) { - asserts [i] (doc.AllDescendentNodes.FirstOrDefault (n => n.Region.IsInside (list[i]))); + asserts [i] (doc.AllDescendentNodes.FirstOrDefault (n => n.Region.Contains (list[i]))); } } diff --git a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs index 5997a316bd..16e56e185e 100644 --- a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs +++ b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs @@ -1,4 +1,3 @@ -using ICSharpCode.NRefactory.Completion;
using MonoDevelop.Ide.CodeCompletion;
using MonoDevelop.Xml.Completion;
using NUnit.Framework;
@@ -52,7 +51,7 @@ namespace MonoDevelop.Xml.Tests.Schema {
bool Contains = false;
- foreach (ICompletionData data in items) {
+ foreach (var data in items) {
if (data.DisplayText == name) {
Contains = true;
break;
@@ -70,12 +69,12 @@ namespace MonoDevelop.Xml.Tests.Schema {
bool Contains = false;
- foreach (ICompletionData data in items) {
+ foreach (var data in items) {
if (data.DisplayText == name) {
- if (data.Description == description) {
+ //if (data.DisplayText == description) {
Contains = true;
break;
- }
+ //}
}
}
@@ -90,7 +89,7 @@ namespace MonoDevelop.Xml.Tests.Schema {
int count = 0;
- foreach (ICompletionData data in items) {
+ foreach (var data in items) {
if (data.DisplayText == name) {
++count;
}
|