From 7b72aa9d78ce4b720c7973e476e32867d8513f72 Mon Sep 17 00:00:00 2001 From: mrward Date: Wed, 22 Sep 2010 20:24:09 +0100 Subject: [PATCH] Change ASP.NET web page and web service project so the OutputPath is set to bin when a new project is created. --- data/templates/project/CSharp/WebService.xpt | 9 +- .../project/CSharp/WebpageProject.xpt | 10 +- .../ResolveBuiltInRoundMethodTestFixture.cs | 117 --------------- ...onsoleFromSystemImportEverythingFixture.cs | 57 -------- .../ResolveConsoleWriteLineTestFixture.cs | 61 -------- ...hodFromSysImportExitAsMyExitTestFixture.cs | 47 ------ ...temWindowsFormsImportedAsFooTestFixture.cs | 52 ------- ...WindowsWithImportSystemAsFooTestFixture.cs | 45 ------ .../Resolver/ResolveFromImportTestFixture.cs | 55 ------- ...tedMathModuleCompletionItemsTestFixture.cs | 55 ------- .../ResolveLocalClassInstanceTestFixture.cs | 101 ------------- ...veMethodFromUnknownImportAllTestFixture.cs | 37 ----- ...ethodWhenFromImportIsUnknownTestFixture.cs | 36 ----- ...lveMethodWhenImportIsUnknownTestFixture.cs | 36 ----- .../ResolveSysModuleExitMethodTestFixture.cs | 136 ------------------ ...olveSysModuleImportedAsMySysTestFixture.cs | 42 ------ ...esolveSysModuleUnknownMethodTestFixture.cs | 36 ----- .../ResolveSystemConsoleTestFixture.cs | 111 -------------- .../ResolveSystemImportTestFixture.cs | 59 -------- ...olveSystemImportedAsMySystemTestFixture.cs | 68 --------- .../ResolveSystemNamespaceTestFixture.cs | 67 --------- ...emNamespaceWithMissingImportTestFixture.cs | 44 ------ ...WindowsFormsWithImportSystemTestFixture.cs | 45 ------ ...ystemWindowsWithImportSystemTestFixture.cs | 45 ------ ...ystemWithImportSystemWindowsTestFixture.cs | 39 ----- ...veTanMethodFromMathImportAllTestFixture.cs | 63 -------- ...ethodFromMathImportCosAndTanTestFixture.cs | 60 -------- .../Test/Resolver/ResolveTestFixtureBase.cs | 41 ------ ...temWindowsFormsImportTextBoxTestFixture.cs | 52 ------- ...dowsFormsImportedAsMyTextBoxTestFixture.cs | 52 ------- .../ResolveUnknownNamespaceTestFixture.cs | 43 ------ 31 files changed, 16 insertions(+), 1705 deletions(-) delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs diff --git a/data/templates/project/CSharp/WebService.xpt b/data/templates/project/CSharp/WebService.xpt index 5e1e57e2c8..46785eafbc 100644 --- a/data/templates/project/CSharp/WebService.xpt +++ b/data/templates/project/CSharp/WebService.xpt @@ -31,9 +31,16 @@ Library Properties - bin\ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + + + bin\ + + + + bin\ + Library - bin\ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - + + + bin\ + + + + bin\ + exitMethods = GetRoundMethods(); - Assert.AreEqual(2, exitMethods.Count); - } - - List GetRoundMethods() - { - return GetRoundMethods(-1); - } - - List GetRoundMethods(int parameterCount) - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("round", parameterCount, methods.ToArray()); - } - - [Test] - public void BothRoundMethodsArePublic() - { - foreach (IMethod method in GetRoundMethods()) { - Assert.IsTrue(method.IsPublic); - } - } - - [Test] - public void BothRoundMethodsHaveClassWithNameOfSys() - { - foreach (IMethod method in GetRoundMethods()) { - Assert.AreEqual("__builtin__", method.DeclaringType.Name); - } - } - - [Test] - public void OneRoundMethodHasTwoParameters() - { - int parameterCount = 2; - Assert.AreEqual(1, GetRoundMethods(parameterCount).Count); - } - - [Test] - public void RoundMethodParameterNameIsNumber() - { - IParameter parameter = GetFirstRoundMethodParameter(); - Assert.AreEqual("number", parameter.Name); - } - - IParameter GetFirstRoundMethodParameter() - { - int parameterCount = 1; - List methods = GetRoundMethods(parameterCount); - IMethod method = methods[0]; - return method.Parameters[0]; - } - - [Test] - public void RoundMethodParameterReturnTypeIsDouble() - { - IParameter parameter = GetFirstRoundMethodParameter(); - Assert.AreEqual("Double", parameter.ReturnType.Name); - } - - [Test] - public void RoundMethodParameterConvertedToStringUsingAmbienceReturnsDoubleNumberString() - { - IAmbience ambience = new CSharpAmbience(); - string text = ambience.Convert(GetFirstRoundMethodParameter()); - Assert.AreEqual("double number", text); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs deleted file mode 100644 index 0d3d17de7a..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFromSystemImportEverythingFixture : ResolveTestFixtureBase - { - MockClass consoleClass; - - protected override ExpressionResult GetExpressionResult() - { - consoleClass = new MockClass(projectContent, "System.Console"); - projectContent.ClassToReturnFromGetClass = consoleClass; - projectContent.ClassNameForGetClass = "System.Console"; - - List namespaceItems = new List(); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("Console", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System import *\r\n" + - "Console\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultResolvedClassIsConsoleClass() - { - Assert.AreEqual(consoleClass, TypeResolveResult.ResolvedClass); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - - [Test] - public void ProjectContentNamespaceExistsReturnsTrueForSystem() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs deleted file mode 100644 index d679641047..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the expression "Console.WriteLine" is correctly - /// resolved. - /// - [TestFixture] - public class ResolveConsoleWriteLineTestFixture : ResolveTestFixtureBase - { - MockClass systemConsoleClass; - - protected override ExpressionResult GetExpressionResult() - { - systemConsoleClass = new MockClass(projectContent, "System.Console"); - projectContent.ClassToReturnFromGetClass = systemConsoleClass; - projectContent.ClassNameForGetClass = "Console"; - return new ExpressionResult("Console.WriteLine", new DomRegion(2, 2), null, null); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "Console.WriteLine\r\n"; - } - - [Test] - public void ResolveResultExists() - { - Assert.IsNotNull(resolveResult); - } - - /// - /// Gets the class name used in IProjectContent.GetClass call. - /// - [Test] - public void GetClassName() - { - Assert.AreEqual("Console", projectContent.GetClassName); - } - - [Test] - public void MethodNameResolveIsWriteLine() - { - MethodGroupResolveResult methodResolveResult = (MethodGroupResolveResult)resolveResult; - Assert.AreEqual("WriteLine", methodResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs deleted file mode 100644 index ef2e0dfc68..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveExitMethodFromSysImportExitAsMyExitTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("myexit", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from sys import exit as myexit\r\n" + - "myexit\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsExit() - { - Assert.AreEqual("exit", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs deleted file mode 100644 index 71c48342dc..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportedAsFooTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("Foo.TextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import System.Windows.Forms as Foo\r\n" + - "Foo.TextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs deleted file mode 100644 index 3e5a03b3f5..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFooWindowsWithImportSystemAsFooTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("Foo.Windows"); - } - - protected override string GetPythonScript() - { - return - "import System as Foo\r\n" + - "Foo.Windows\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemWindowsNamespace() - { - Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs deleted file mode 100644 index 87d3f74d04..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the PythonResolver resolves "from System" to - /// a namespace. - /// - [TestFixture] - public class ResolveFromImportTestFixture - { - PythonResolver resolver; - MockProjectContent mockProjectContent; - PythonImportModuleResolveResult resolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - - mockProjectContent = new MockProjectContent(); - DefaultCompilationUnit cu = new DefaultCompilationUnit(mockProjectContent); - cu.ErrorsDuringCompile = true; - cu.FileName = @"C:\Projects\Test\test.py"; - ParseInformation parseInfo = new ParseInformation(cu); - - string python = "from System"; - PythonExpressionFinder finder = new PythonExpressionFinder(); - ExpressionResult expressionResult = finder.FindExpression(python, python.Length); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as PythonImportModuleResolveResult; - } - - [Test] - public void NamespaceResolveResultFound() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void NamespaceName() - { - Assert.AreEqual("System", resolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs deleted file mode 100644 index a042e84bb1..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; - -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFromMathImportedMathModuleCompletionItemsTestFixture : ResolveTestFixtureBase - { - List GetCompletionResults() - { - return resolveResult.GetCompletionData(projectContent); - } - - protected override ExpressionResult GetExpressionResult() - { - string code = GetPythonScript(); - PythonExpressionFinder finder = new PythonExpressionFinder(); - return finder.FindExpression(code, code.Length); - } - - protected override string GetPythonScript() - { - return "from math import"; - } - - [Test] - public void CompletionResultsContainCosMethodFromMathModule() - { - IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("cos", GetCompletionResults()); - Assert.IsNotNull(method); - } - - [Test] - public void ExpressionResultContextShowItemReturnsTrueForIMethod() - { - MockProjectContent projectContent = new MockProjectContent(); - DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); - DefaultClass c = new DefaultClass(unit, "MyClass"); - DefaultMethod method = new DefaultMethod(c, "Test"); - - Assert.IsTrue(expressionResult.Context.ShowEntry(method)); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs deleted file mode 100644 index c52bdfdbf3..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Given code: - /// - /// a = Class1() - /// - /// Check that the type of "a" can be obtained by the resolver. - /// - [TestFixture] - [Ignore("Disabled local variable resolution for SD 3.0")] - public class ResolveLocalClassInstanceTestFixture - { - PythonResolver resolver; - ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; - LocalResolveResult resolveResult; - MockClass testClass; - ICompilationUnit compilationUnit; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - - mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); - testClass = new MockClass(mockProjectContent, "Test.Test1"); - mockProjectContent.ClassesInProjectContent.Add(testClass); - mockProjectContent.ClassToReturnFromGetClass = testClass; - mockProjectContent.ClassNameForGetClass = "Test.Test1"; - - compilationUnit = new DefaultCompilationUnit(mockProjectContent); - compilationUnit.FileName = @"C:\Projects\Test\test.py"; - ParseInformation parseInfo = new ParseInformation(compilationUnit); - - string python = "a = Test1()\r\n" + - "a"; - ExpressionResult expressionResult = new ExpressionResult("a", new DomRegion(2, 1), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as LocalResolveResult; - } - - [Test] - public void GetTypeOfInstance() - { - string code = "a = Class1()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - /// - /// Tests that the NameExpression in the resolver is reset so the second assignment - /// does not override the first. - /// - [Test] - public void DifferentTypeCreatedLast() - { - string code = "a = Class1()\r\n" + - "b = Class2()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void StringAssignmentShouldNotResolve() - { - string code = "a = \"test\""; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void NullCodeShouldNotResolve() - { - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", null)); - } - - [Test] - public void ResolveResultIsLocalResolveResult() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void ResolveResultVariableName() - { - Assert.AreEqual(resolveResult.VariableName, "a"); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs deleted file mode 100644 index bc813f7e14..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodFromUnknownImportAllTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import *\r\n" + - "methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs deleted file mode 100644 index dab0f51a9b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodWhenFromImportIsUnknownTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import methodcall\r\n" + - "methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs deleted file mode 100644 index f1a5f8f5c8..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodWhenImportIsUnknownTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("unknown.methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import methodcall\r\n" + - "unknown.methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs deleted file mode 100644 index 3eb00a2f00..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleExitMethodTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("sys.exit", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys\r\n" + - "sys.exit\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsExit() - { - Assert.AreEqual("exit", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasTwoExitMethods() - { - List exitMethods = GetExitMethods(); - Assert.AreEqual(2, exitMethods.Count); - } - - List GetExitMethods() - { - return GetExitMethods(-1); - } - - List GetExitMethods(int parameterCount) - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", parameterCount, methods.ToArray()); - } - - [Test] - public void BothExitMethodsArePublic() - { - foreach (IMethod method in GetExitMethods()) { - Assert.IsTrue(method.IsPublic); - } - } - - [Test] - public void BothExitMethodsHaveClassWithNameOfSys() - { - foreach (IMethod method in GetExitMethods()) { - Assert.AreEqual("sys", method.DeclaringType.Name); - } - } - - [Test] - public void OneExitMethodHasOneParameter() - { - int parameterCount = 1; - Assert.AreEqual(1, GetExitMethods(parameterCount).Count); - } - - [Test] - public void ExitMethodParameterNameIsCode() - { - IParameter parameter = GetFirstExitMethodParameter(); - Assert.AreEqual("code", parameter.Name); - } - - IParameter GetFirstExitMethodParameter() - { - int parameterCount = 1; - List methods = GetExitMethods(parameterCount); - IMethod method = methods[0]; - return method.Parameters[0]; - } - - [Test] - public void ExitMethodParameterReturnTypeIsObject() - { - IParameter parameter = GetFirstExitMethodParameter(); - Assert.AreEqual("Object", parameter.ReturnType.Name); - } - - [Test] - public void ExitMethodParameterConvertedToStringUsingAmbienceReturnsObjectCodeString() - { - IAmbience ambience = new CSharpAmbience(); - string text = ambience.Convert(GetFirstExitMethodParameter()); - Assert.AreEqual("object code", text); - } - - [Test] - public void ExitMethodReturnTypeConvertedToStringUsingAmbienceReturnsVoid() - { - IAmbience ambience = new CSharpAmbience(); - List methods = GetExitMethods(); - IReturnType returnType = methods[0].ReturnType; - string text = ambience.Convert(returnType); - Assert.AreEqual("void", text); - } - - [Test] - public void MethodGroupContainingTypeHasTwoExitMethods() - { - IReturnType returnType = MethodResolveResult.ContainingType; - List methods = PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", returnType.GetMethods()); - Assert.AreEqual(2, methods.Count); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs deleted file mode 100644 index 39a380325b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleImportedAsMySysTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("mysys", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys as mysys\r\n" + - "mysys\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultContainsExitMethod() - { - List items = GetCompletionItems(); - IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("exit", items); - Assert.IsNotNull(method); - } - - List GetCompletionItems() - { - return resolveResult.GetCompletionData(projectContent); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs deleted file mode 100644 index bbbf0fb67c..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleUnknownMethodTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("sys.unknown", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys\r\n" + - "sys.unknown\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs deleted file mode 100644 index c91386fe69..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver correctly resolves the expression: - /// "System.Console" - /// - [TestFixture] - public class ResolveSystemConsoleTestFixture - { - PythonResolver resolver; - ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; - ResolveResult resolveResult; - MockClass testClass; - ICompilationUnit compilationUnit; - MockClass systemConsoleClass; - ResolveResult invalidMostRecentCompilationUnitResolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); - - systemConsoleClass = new MockClass(mockProjectContent, "System.Console"); - mockProjectContent.ClassToReturnFromGetClass = systemConsoleClass; - - compilationUnit = CreateCompilationUnit(mockProjectContent); - ParseInformation parseInfo = new ParseInformation(compilationUnit); - - string python = GetPythonScript(); - ExpressionResult expressionResult = new ExpressionResult("System.Console", new DomRegion(3, 2), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python); - - // Check that the best compilation unit is used and the resolve - // still works. - invalidMostRecentCompilationUnitResolveResult = resolver.Resolve(expressionResult, parseInfo, python); - } - - [Test] - public void ResolveResultExists() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void IsTypeResolveResult() - { - Assert.IsInstanceOf(typeof(TypeResolveResult), resolveResult); - } - - [Test] - public void ResolvedClass() - { - TypeResolveResult typeResolveResult = resolveResult as TypeResolveResult; - Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); - } - - [Test] - public void IsGetClassCalled() - { - Assert.IsTrue(mockProjectContent.GetClassCalled); - } - - [Test] - public void GetClassName() - { - Assert.AreEqual("System.Console", mockProjectContent.GetClassName); - } - - [Test] - public void ResolvedClassWithInvalidMostRecentCompilationUnit() - { - TypeResolveResult typeResolveResult = invalidMostRecentCompilationUnitResolveResult as TypeResolveResult; - Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); - } - - /// - /// Returns the Python script that will be used for testing. - /// - protected virtual string GetPythonScript() - { - return "import System\r\n" + - "class Test:\r\n" + - "\tdef __init__(self):\r\n" + - "\t\tSystem.Console\r\n"; - } - - /// - /// Creates a compilation unit with one class called Test. - /// - protected virtual ICompilationUnit CreateCompilationUnit(IProjectContent projectContent) - { - ICompilationUnit compilationUnit = new DefaultCompilationUnit(projectContent); - testClass = new MockClass(projectContent, "Test"); - compilationUnit.Classes.Add(testClass); - return compilationUnit; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs deleted file mode 100644 index a08d5a5e4e..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the PythonResolver resolves "import System" to - /// a namespace. - /// - [TestFixture] - public class ResolveSystemImportTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - string code = GetPythonScript(); - PythonExpressionFinder finder = new PythonExpressionFinder(); - return finder.FindExpression(code, code.Length); - } - - protected override string GetPythonScript() - { - return "import System"; - } - - [Test] - public void NamespaceResolveResultFound() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void NamespaceName() - { - PythonImportModuleResolveResult importResolveResult = (PythonImportModuleResolveResult)resolveResult; - Assert.AreEqual("System", importResolveResult.Name); - } - - [Test] - public void ExpressionResultContextShowItemReturnsTrueForNamespaceEntry() - { - NamespaceEntry entry = new NamespaceEntry("abc"); - Assert.IsTrue(expressionResult.Context.ShowEntry(entry)); - } - - [Test] - public void ExpressionResultContextShowItemReturnsFalseForNull() - { - Assert.IsFalse(expressionResult.Context.ShowEntry(null)); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs deleted file mode 100644 index 4505c14895..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemImportedAsMySystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - List namespaceItems = new List(); - DefaultClass consoleClass = new DefaultClass(compilationUnit, "System.Console"); - namespaceItems.Add(consoleClass); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("MySystem", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import System as MySystem\r\n" + - "MySystem.\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultContainsConsoleClass() - { - List items = GetCompletionItems(); - IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); - Assert.IsNotNull(consoleClass); - } - - List GetCompletionItems() - { - return resolveResult.GetCompletionData(projectContent); - } - - [Test] - public void NamespaceResolveResultNameIsSystem() - { - NamespaceResolveResult namespaceResolveResult = resolveResult as NamespaceResolveResult; - Assert.AreEqual("System", namespaceResolveResult.Name); - } - - [Test] - public void MockProjectContentSystemNamespaceContentsIncludesConsoleClass() - { - List items = projectContent.GetNamespaceContents("System"); - IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); - Assert.IsNotNull(consoleClass); - } - - [Test] - public void MockProjectContentNamespaceExistsReturnsTrueForSystem() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs deleted file mode 100644 index 6b7c763035..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver correctly resolves the expression: - /// "System" - /// - [TestFixture] - public class ResolveSystemNamespaceTestFixture - { - PythonResolver resolver; - MockProjectContent mockProjectContent; - NamespaceResolveResult resolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - mockProjectContent = new MockProjectContent(); - mockProjectContent.AddExistingNamespaceContents("System", new List()); - - string python = - "import System\r\n" + - "class Test:\r\n" + - " def __init__(self):\r\n" + - " System.\r\n"; - - PythonParser parser = new PythonParser(); - string fileName = @"C:\Projects\Test\test.py"; - DefaultCompilationUnit cu = parser.Parse(mockProjectContent, fileName, python) as DefaultCompilationUnit; - cu.ErrorsDuringCompile = true; - ParseInformation parseInfo = new ParseInformation(cu); - - ExpressionResult expressionResult = new ExpressionResult("System", new DomRegion(4, 2), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as NamespaceResolveResult; - } - - [Test] - public void NamespaceExistsCalled() - { - Assert.IsTrue(mockProjectContent.NamespaceExistsCalled); - } - - [Test] - public void NamespaceSearchedFor() - { - Assert.AreEqual("System", mockProjectContent.NamespacePassedToNamespaceExistsMethod); - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System", resolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs deleted file mode 100644 index 91852d9b7b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemNamespaceWithMissingImportTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass systemConsoleClass = new MockClass(projectContent, "System.Console"); - List namespaceItems = new List(); - namespaceItems.Add(systemConsoleClass); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("System", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return "System\r\n"; - } - - [Test] - public void ResolveResultIsNullSinceSystemNamespaceIsNotImported() - { - Assert.IsNull(resolveResult); - } - - [Test] - public void ProjectContentNamespaceExistsReturnsTrueForSystemNamespace() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs deleted file mode 100644 index cea9f30969..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWindowsFormsWithImportSystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("System.Windows.Forms"); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "System.Windows.Forms\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System.Windows.Forms", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs deleted file mode 100644 index 993ea91ce2..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWindowsWithImportSystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("System.Windows"); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "System.Windows\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemWindowsNamespace() - { - Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs deleted file mode 100644 index 5287db4f5f..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWithImportSystemWindowsTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("System"); - } - - protected override string GetPythonScript() - { - return - "import System.Windows\r\n" + - "System\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs deleted file mode 100644 index 8c7c9ed2c6..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTanMethodFromMathImportAllTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("tan", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from sys import *\r\n" + - "from math import *\r\n" + - "from socket import *\r\n" + - "\r\n" + - "tan\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsTan() - { - Assert.AreEqual("tan", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasOneTanMethods() - { - List tanMethods = GetTanMethods(); - Assert.AreEqual(1, tanMethods.Count); - } - - List GetTanMethods() - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs deleted file mode 100644 index 94c4332fdf..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTanMethodFromMathImportCosAndTanTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("tan", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from math import cos, tan\r\n" + - "tan\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsTan() - { - Assert.AreEqual("tan", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasOneTanMethods() - { - List tanMethods = GetTanMethods(); - Assert.AreEqual(1, tanMethods.Count); - } - - List GetTanMethods() - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs deleted file mode 100644 index 04f9734b39..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - public abstract class ResolveTestFixtureBase - { - protected ICompilationUnit compilationUnit; - protected MockProjectContent projectContent; - protected PythonResolver resolver; - protected ResolveResult resolveResult; - protected ParseInformation parseInfo; - protected ExpressionResult expressionResult; - - [SetUp] - public void InitBase() - { - projectContent = new MockProjectContent(); - PythonParser parser = new PythonParser(); - string fileName = @"C:\projects\test\test.py"; - compilationUnit = parser.Parse(projectContent, fileName, GetPythonScript()); - parseInfo = new ParseInformation(compilationUnit); - - resolver = new PythonResolver(); - - expressionResult = GetExpressionResult(); - resolveResult = resolver.Resolve(expressionResult, parseInfo, GetPythonScript()); - } - - protected abstract ExpressionResult GetExpressionResult(); - - protected abstract string GetPythonScript(); - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs deleted file mode 100644 index 70c110a197..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("TextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System.Windows.Forms import TextBox\r\n" + - "TextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs deleted file mode 100644 index 61385237f1..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("MyTextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System.Windows.Forms import TextBox as MyTextBox\r\n" + - "MyTextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs deleted file mode 100644 index 2a5f7f3f49..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver does not return a namespace resolve result for - /// an unknown namespace. - /// - [TestFixture] - public class ResolveUnknownNamespaceTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - projectContent.AddExistingNamespaceContents("System", new List()); - - return new ExpressionResult("Unknown", new DomRegion(3, 2), null, null); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "class Test:\r\n" + - " def __init__(self):\r\n" + - " Unknown\r\n"; - } - - [Test] - public void ResolveResultDoesNotExist() - { - Assert.IsNull(resolveResult); - } - } -}