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

Reduce number of compiler warnings; and re-enable some old unit tests.

pull/59/merge
Daniel Grunwald 12 years ago
parent
befea66cf0
commit
f07ea5af32
30 changed files with 954 additions and 1204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/AddIns/BackendBindings/FSharpBinding/FsOptions.cs
  2. 1
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/ApplicationSettingsPanel.cs
  3. 1
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/CompilerParametersPanel.cs
  4. 1
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PreprocessorVariablesPanel.cs
  5. 1
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SemicolonSeparatedNameValueListBinding.cs
  6. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs
  7. 60
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/DesignTimeProperties.cs
  8. 9
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/MarkupCompatibilityProperties.cs
  9. 2
      src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
  10. 3
      src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchLocation.cs
  11. 1
      src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
  12. 1
      src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplacePanel.cs
  13. 2
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs
  14. 12
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/LineNumberMargin.cs
  15. 3
      src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
  16. 4
      src/Main/Base/Project/Src/Gui/Dialogs/WordCountDialog.cs
  17. 1
      src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
  18. 303
      src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs
  19. 194
      src/Main/Base/Test/StringTagProvider/ProjectTagsTestFixture.cs
  20. 141
      src/Main/Base/Test/WebReferences/ProjectHasExistingWebRefFolderTest.cs
  21. 180
      src/Main/Base/Test/WebReferences/ProjectWebReferenceItemsTests.cs
  22. 123
      src/Main/Base/Test/WebReferences/RenamedWebReferencesFolderTest.cs
  23. 125
      src/Main/Base/Test/WebReferences/VBNetWebReferenceTest.cs
  24. 250
      src/Main/Base/Test/WebReferences/WebReferenceChangesTest.cs
  25. 249
      src/Main/Base/Test/WebReferences/WebReferenceFolderAlreadyExistsTest.cs
  26. 135
      src/Main/Base/Test/WebReferences/WebReferenceProjectItemsCachedTest.cs
  27. 156
      src/Main/Base/Test/WebReferences/WebReferenceUrlTests.cs
  28. 192
      src/Main/Base/Test/WebReferences/WebServicesReferenceExistsTests.cs
  29. 2
      src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
  30. 3
      src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

1
src/AddIns/BackendBindings/FSharpBinding/FsOptions.cs
Unescape View File

@ -7,6 +7,7 @@ using System.Windows.Forms; @@ -7,6 +7,7 @@ using System.Windows.Forms;
namespace FSharpBinding
{
[Obsolete("TODO: rewrite me in WPF")]
public class FsOptions : AbstractXmlFormsProjectOptionPanel
{
public override void LoadPanelContents()

1
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/ApplicationSettingsPanel.cs
Unescape View File

@ -10,6 +10,7 @@ using ICSharpCode.SharpDevelop.Project; @@ -10,6 +10,7 @@ using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.WixBinding
{
[Obsolete("TODO: rewrite me in WPF")]
public class ApplicationSettingsPanel : AbstractXmlFormsProjectOptionPanel
{
public override void LoadPanelContents()

1
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/CompilerParametersPanel.cs
Unescape View File

@ -9,6 +9,7 @@ using StringPair = System.Collections.Generic.KeyValuePair<System.String, System @@ -9,6 +9,7 @@ using StringPair = System.Collections.Generic.KeyValuePair<System.String, System
namespace ICSharpCode.WixBinding
{
[Obsolete("TODO: rewrite me in WPF")]
public class CompilerParametersPanel : AbstractXmlFormsProjectOptionPanel
{
public override void LoadPanelContents()

1
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PreprocessorVariablesPanel.cs
Unescape View File

@ -6,6 +6,7 @@ using ICSharpCode.SharpDevelop.Gui.OptionPanels; @@ -6,6 +6,7 @@ using ICSharpCode.SharpDevelop.Gui.OptionPanels;
namespace ICSharpCode.WixBinding
{
[Obsolete("TODO: rewrite me in WPF")]
public class PreprocessorVariablesPanel : AbstractXmlFormsProjectOptionPanel
{
public override void LoadPanelContents()

1
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SemicolonSeparatedNameValueListBinding.cs
Unescape View File

@ -11,6 +11,7 @@ namespace ICSharpCode.WixBinding @@ -11,6 +11,7 @@ namespace ICSharpCode.WixBinding
/// list of name/value pairs separated by a semicolon.
/// (e.g. "DATADIR=C:\projects\data; SRCDIR=C:\projects\src")
/// </summary>
[Obsolete("XML Forms are obsolete")]
public class SemicolonSeparatedNameValueListBinding : ConfigurationGuiBinding
{
NameValueListEditor editor;

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs
Unescape View File

@ -72,7 +72,7 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -72,7 +72,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
// if (val is Style)
// key = ((Style)val).TargetType;
//}
if (key == null || key == "")
if (key == null || (key as string) == "")
key = val;
((ResourceDictionary)collectionInstance).Add(key, val);
} else {

60
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/DesignTimeProperties.cs
Unescape View File

@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom
{
#region IsHidden
/// <summary>
/// Getter for the <see cref="IsHiddenProperty"/>
/// </summary>
public static bool GetIsHidden(DependencyObject obj)
{
return (bool)obj.GetValue(IsHiddenProperty);
}
/// <summary>
/// Setter for the <see cref="IsHiddenProperty"/>
/// </summary>
public static void SetIsHidden(DependencyObject obj, bool value)
{
obj.SetValue(IsHiddenProperty, value);
}
/// <summary>
/// Design-time IsHidden property
/// </summary>
public static readonly DependencyProperty IsHiddenProperty =
DependencyProperty.RegisterAttached("IsHidden", typeof(bool), typeof(DesignTimeProperties));
@ -30,84 +39,125 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -30,84 +39,125 @@ namespace ICSharpCode.WpfDesign.XamlDom
#region IsLocked
/// <summary>
/// Getter for the <see cref="IsLockedProperty"/>
/// </summary>
public static bool GetIsLocked(DependencyObject obj)
{
return (bool)obj.GetValue(IsLockedProperty);
}
/// <summary>
/// Setter for the <see cref="IsLockedProperty"/>
/// </summary>
public static void SetIsLocked(DependencyObject obj, bool value)
{
obj.SetValue(IsLockedProperty, value);
}
/// <summary>
/// Design-time IsLocked property.
/// </summary>
public static readonly DependencyProperty IsLockedProperty =
DependencyProperty.RegisterAttached("IsLocked", typeof(bool), typeof(DesignTimeProperties));
#endregion
#region DataContext
/// <summary>
/// Getter for the <see cref="DataContextProperty"/>
/// </summary>
public static object GetDataContext(DependencyObject obj)
{
return (object)obj.GetValue(DataContextProperty);
}
/// <summary>
/// Setter for the <see cref="DataContextProperty"/>
/// </summary>
public static void SetDataContext(DependencyObject obj, bool value)
{
obj.SetValue(DataContextProperty, value);
}
/// <summary>
/// Design-time data context
/// </summary>
public static readonly DependencyProperty DataContextProperty =
DependencyProperty.RegisterAttached("DataContext", typeof(object), typeof(DesignTimeProperties));
#endregion
#region DesignSource
/// <summary>
/// Getter for the <see cref="DesignSourceProperty"/>
/// </summary>
public static object GetDesignSource(DependencyObject obj)
{
return (object)obj.GetValue(DesignSourceProperty);
}
/// <summary>
/// Setter for the <see cref="DesignSourceProperty"/>
/// </summary>
public static void SetDesignSource(DependencyObject obj, bool value)
{
obj.SetValue(DesignSourceProperty, value);
}
/// <summary>
/// Design-time design source
/// </summary>
public static readonly DependencyProperty DesignSourceProperty =
DependencyProperty.RegisterAttached("DesignSource", typeof(object), typeof(DesignTimeProperties));
#endregion
#region DesignWidth
/// <summary>
/// Getter for the <see cref="DesignWidthProperty"/>
/// </summary>
public static double GetDesignWidth(DependencyObject obj)
{
return (double)obj.GetValue(DesignWidthProperty);
}
/// <summary>
/// Setter for the <see cref="DesignWidthProperty"/>
/// </summary>
public static void SetDesignWidth(DependencyObject obj, double value)
{
obj.SetValue(DesignWidthProperty, value);
}
/// <summary>
/// Design-time width
/// </summary>
public static readonly DependencyProperty DesignWidthProperty =
DependencyProperty.RegisterAttached("DesignWidth", typeof(double), typeof(DesignTimeProperties));
#endregion
#region DesignHeight
/// <summary>
/// Getter for the <see cref="DesignHeightProperty"/>
/// </summary>
public static double GetDesignHeight(DependencyObject obj)
{
return (double)obj.GetValue(DesignHeightProperty);
}
/// <summary>
/// Setter for the <see cref="DesignHeightProperty"/>
/// </summary>
public static void SetDesignHeight(DependencyObject obj, double value)
{
obj.SetValue(DesignHeightProperty, value);
}
/// <summary>
/// Design-time height
/// </summary>
public static readonly DependencyProperty DesignHeightProperty =
DependencyProperty.RegisterAttached("DesignHeight", typeof(double), typeof(DesignTimeProperties));

9
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/MarkupCompatibilityProperties.cs
Unescape View File

@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom
{
#region Ignorable
/// <summary>
/// Getter for the <see cref="IgnorableProperty"/>
/// </summary>
public static string GetIgnorable(DependencyObject obj)
{
return (string)obj.GetValue(IgnorableProperty);
}
/// <summary>
/// Setter for the <see cref="IgnorableProperty"/>
/// </summary>
public static void SetIgnorable(DependencyObject obj, string value)
{
obj.SetValue(IgnorableProperty, value);
}
/// <summary>
/// Gets/Sets whether a XAML namespace may be ignored by the XAML parser.
/// </summary>
public static readonly DependencyProperty IgnorableProperty =
DependencyProperty.RegisterAttached("Ignorable", typeof(string), typeof(MarkupCompatibilityProperties));

2
src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
Unescape View File

@ -19,6 +19,8 @@ using ICSharpCode.SharpDevelop.Gui; @@ -19,6 +19,8 @@ using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace Plugins.RegExpTk {
// TODO: rewrite without XMLForms
#pragma warning disable 618
public class RegExpTkDialog : BaseSharpDevelopForm
{

3
src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchLocation.cs
Unescape View File

@ -80,7 +80,8 @@ namespace SearchAndReplace @@ -80,7 +80,8 @@ namespace SearchAndReplace
case SearchTarget.Directory:
if (!Directory.Exists(BaseDirectory))
break;
return FileUtility.LazySearchDirectory(BaseDirectory, Filter, SearchSubdirs);
var options = SearchSubdirs ? DirectorySearchOptions.IncludeSubdirectories : DirectorySearchOptions.None;
return SD.FileSystem.GetFiles(DirectoryName.Create(BaseDirectory), Filter, options);
default:
throw new Exception("Invalid value for FileListType");
}

1
src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
Unescape View File

@ -16,6 +16,7 @@ namespace SearchAndReplace @@ -16,6 +16,7 @@ namespace SearchAndReplace
Replace
}
[Obsolete("TODO: rewrite me without XML forms")]
public class SearchAndReplaceDialog : Form
{
public static string SearchPattern = String.Empty;

1
src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplacePanel.cs
Unescape View File

@ -19,6 +19,7 @@ using ICSharpCode.SharpDevelop.Gui.XmlForms; @@ -19,6 +19,7 @@ using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace SearchAndReplace
{
[Obsolete("TODO: rewrite me without XML forms")]
public class SearchAndReplacePanel : BaseSharpDevelopUserControl
{
SearchAndReplaceMode searchAndReplaceMode;

2
src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs
Unescape View File

@ -8,6 +8,8 @@ using ICSharpCode.SharpDevelop.Gui; @@ -8,6 +8,8 @@ using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.Svn.Gui
{
// TODO: rewrite without XMLForms
#pragma warning disable 618
/// <summary>
/// The Output Window options panel.
/// </summary>

12
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/LineNumberMargin.cs
Unescape View File

@ -29,7 +29,16 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -29,7 +29,16 @@ namespace ICSharpCode.AvalonEdit.Editing
TextArea textArea;
/// <summary>
/// The typeface used for rendering the line number margin.
/// This field is calculated in MeasureOverride() based on the FontFamily etc. properties.
/// </summary>
protected Typeface typeface;
/// <summary>
/// The font size used for rendering the line number margin.
/// This field is calculated in MeasureOverride() based on the FontFamily etc. properties.
/// </summary>
protected double emSize;
/// <inheritdoc/>
@ -114,6 +123,9 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -114,6 +123,9 @@ namespace ICSharpCode.AvalonEdit.Editing
return ReceiveWeakEvent(managerType, sender, e);
}
/// <summary>
/// Maximum length of a line number, in characters
/// </summary>
protected int maxLineNumberLength = 1;
void OnDocumentLineCountChanged()

3
src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
Unescape View File

@ -20,6 +20,9 @@ using Microsoft.Build.Framework.XamlTypes; @@ -20,6 +20,9 @@ using Microsoft.Build.Framework.XamlTypes;
namespace ICSharpCode.SharpDevelop.Gui
{
// TODO: rewrite without XMLForms
#pragma warning disable 618
/// <summary>
/// This class is for creating a new "empty" file
/// </summary>

4
src/Main/Base/Project/Src/Gui/Dialogs/WordCountDialog.cs
Unescape View File

@ -16,7 +16,9 @@ using ICSharpCode.SharpDevelop.Workbench; @@ -16,7 +16,9 @@ using ICSharpCode.SharpDevelop.Workbench;
namespace ICSharpCode.SharpDevelop.Gui
{
public class WordCountDialog : BaseSharpDevelopForm
// TODO: rewrite without XMLForms
#pragma warning disable 618
class WordCountDialog : BaseSharpDevelopForm
{
List<Report> items;
Report total;

1
src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
Unescape View File

@ -131,7 +131,6 @@ @@ -131,7 +131,6 @@
<Compile Include="ServiceReferences\ServiceReferencesFolderNodeTests.cs" />
<Compile Include="ServiceReferences\ServiceReferencesProjectItemTests.cs" />
<Compile Include="SharpDevelopAddInTests.cs" />
<Compile Include="StringTagProvider\MockProjectForTagProvider.cs" />
<Compile Include="StringTagProvider\NullProjectStringTagProviderTestFixture.cs" />
<Compile Include="StringTagProvider\ProjectTagsTestFixture.cs" />
<Compile Include="Utils\AssemblyLoader.cs" />

303
src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs
Unescape View File

@ -1,303 +0,0 @@ @@ -1,303 +0,0 @@
#warning
//// 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 System.Collections.ObjectModel;
//using System.Xml.Linq;
//
//using ICSharpCode.Core;
//using ICSharpCode.SharpDevelop.Dom;
//using ICSharpCode.SharpDevelop.Project;
//
//namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider
//{
// /// <summary>
// /// Mock IProject implementation to test the SharpDevelopStringTagProvider.
// /// </summary>
// public class MockProjectForTagProvider : IProject
// {
// string fileName = String.Empty;
// string directory = String.Empty;
// string outputAssemblyFullPath = String.Empty;
// string name = String.Empty;
//
// public MockProjectForTagProvider()
// {
// }
//
// public ReadOnlyCollection<ProjectItem> Items {
// get {
// throw new NotImplementedException();
// }
// }
//
// public ICollection<ItemType> AvailableFileItemTypes {
// get {
// throw new NotImplementedException();
// }
// }
//
// public List<ProjectSection> ProjectSections {
// get {
// throw new NotImplementedException();
// }
// }
//
// public LanguageProperties LanguageProperties {
// get {
// throw new NotImplementedException();
// }
// }
//
// public string FileName {
// get { return fileName; }
// set { fileName = value; }
// }
//
// public string Directory {
// get { return directory; }
// set { directory = value; }
// }
//
// public bool ReadOnly {
// get { return false; }
// }
//
// public string AssemblyName {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string RootNamespace {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string OutputAssemblyFullPath {
// get { return outputAssemblyFullPath; }
// set { outputAssemblyFullPath = value; }
// }
//
// public string Language {
// get {
// throw new NotImplementedException();
// }
// }
//
// public string AppDesignerFolder {
// get {
// throw new NotImplementedException();
// }
// }
//
// public string ActiveConfiguration {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string ActivePlatform {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public event EventHandler ActiveConfigurationChanged { add {} remove {} }
//
// public event EventHandler ActivePlatformChanged { add {} remove {} }
//
// public ICollection<string> ConfigurationNames {
// get {
// throw new NotImplementedException();
// }
// }
//
// public ICollection<string> PlatformNames {
// get {
// throw new NotImplementedException();
// }
// }
//
// public bool IsStartable {
// get {
// throw new NotImplementedException();
// }
// }
//
// public int MinimumSolutionVersion {
// get {
// throw new NotImplementedException();
// }
// }
//
// public object SyncRoot {
// get {
// throw new NotImplementedException();
// }
// }
//
// public ISolutionFolderContainer Parent {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public Solution ParentSolution {
// get {
// throw new NotImplementedException();
// }
// }
//
// public string TypeGuid {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string IdGuid {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string Location {
// get {
// throw new NotImplementedException();
// }
// set {
// throw new NotImplementedException();
// }
// }
//
// public string Name {
// get { return name; }
// set { name = value; }
// }
//
// public IEnumerable<ProjectItem> GetItemsOfType(ItemType type)
// {
// throw new NotImplementedException();
// }
//
// public ItemType GetDefaultItemType(string fileName)
// {
// throw new NotImplementedException();
// }
//
// public ICSharpCode.SharpDevelop.Dom.IAmbience GetAmbience()
// {
// throw new NotImplementedException();
// }
//
// public void Save()
// {
// throw new NotImplementedException();
// }
//
// public bool IsFileInProject(string fileName)
// {
// throw new NotImplementedException();
// }
//
// public FileProjectItem FindFile(string fileName)
// {
// throw new NotImplementedException();
// }
//
// public void Start(bool withDebugging)
// {
// throw new NotImplementedException();
// }
//
// public ParseProjectContent CreateProjectContent()
// {
// throw new NotImplementedException();
// }
//
// public ProjectItem CreateProjectItem(IProjectItemBackendStore item)
// {
// throw new NotImplementedException();
// }
//
// public void ResolveAssemblyReferences()
// {
// throw new NotImplementedException();
// }
//
// public ICollection<IBuildable> GetBuildDependencies(ProjectBuildOptions buildOptions)
// {
// throw new NotImplementedException();
// }
//
// public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
// {
// throw new NotImplementedException();
// }
//
// public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable)
// {
// throw new NotImplementedException();
// }
//
// public void Dispose()
// {
// throw new NotImplementedException();
// }
//
// public Properties CreateMemento()
// {
// throw new NotImplementedException();
// }
//
// public void SetMemento(ICSharpCode.Core.Properties memento)
// {
// throw new NotImplementedException();
// }
//
// public void ProjectCreationComplete()
// {
// throw new NotImplementedException();
// }
//
// public XElement LoadProjectExtensions(string name)
// {
// throw new NotImplementedException();
// }
//
// public void SaveProjectExtensions(string name, XElement element)
// {
// throw new NotImplementedException();
// }
//
// public Properties ProjectSpecificProperties {
// get {
// throw new NotImplementedException();
// }
// }
// }
//}

194
src/Main/Base/Test/StringTagProvider/ProjectTagsTestFixture.cs
Unescape View File

@ -1,113 +1,81 @@ @@ -1,113 +1,81 @@
#warning
//// 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.IO;
//using ICSharpCode.SharpDevelop.Commands;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//
//namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider
//{
// /// <summary>
// /// Tests the SharpDevelopStringTagProvider when there is an active project.
// /// </summary>
// [TestFixture]
// public class ProjectTagsTestFixture
// {
// SharpDevelopStringTagProvider tagProvider;
// MockProjectForTagProvider project;
//
// [SetUp]
// public void Init()
// {
// project = new MockProjectForTagProvider();
// project.FileName = @"C:\Projects\MyProject\MyProject.csproj";
// project.Directory = @"C:\Projects\MyProject";
// project.OutputAssemblyFullPath = @"C:\Projects\MyProject\bin\Debug\MyProject.exe";
// project.Name = "MyProject";
//
// ProjectService.CurrentProject = project;
// tagProvider = new SharpDevelopStringTagProvider();
// }
//
// /// <summary>
// /// Sanity check the mock project implementation.
// /// </summary>
// [Test]
// public void MockProjectFileName()
// {
// Assert.AreEqual(@"C:\Projects\MyProject\MyProject.csproj", project.FileName);
// }
//
// /// <summary>
// /// Sanity check the mock project implementation.
// /// </summary>
// [Test]
// public void MockProjectDirectory()
// {
// Assert.AreEqual(@"C:\Projects\MyProject", project.Directory);
// }
//
// /// <summary>
// /// Sanity check the mock project implementation.
// /// </summary>
// [Test]
// public void MockProjectOutputAssemblyFullPath()
// {
// Assert.AreEqual(@"C:\Projects\MyProject\bin\Debug\MyProject.exe", project.OutputAssemblyFullPath);
// }
//
// /// <summary>
// /// Sanity check the mock project implementation.
// /// </summary>
// [Test]
// public void MockProjectName()
// {
// Assert.AreEqual("MyProject", project.Name);
// }
//
// [Test]
// public void ConvertCurrentProjectName()
// {
// Assert.AreEqual(project.Name, tagProvider.ProvideString("CurrentProjectName"));
// }
//
// [Test]
// public void ConvertTargetPath()
// {
// Assert.AreEqual(project.OutputAssemblyFullPath, tagProvider.ProvideString("TargetPath"));
// }
//
// [Test]
// public void ConvertTargetDir()
// {
// Assert.AreEqual(Path.GetDirectoryName(project.OutputAssemblyFullPath), tagProvider.ProvideString("TargetDir"));
// }
//
// [Test]
// public void ConvertTargetName()
// {
// Assert.AreEqual("MyProject.exe", tagProvider.ProvideString("TargetName"));
// }
//
// [Test]
// public void ConvertTargetExt()
// {
// Assert.AreEqual(".exe", tagProvider.ProvideString("TargetExt"));
// }
//
// [Test]
// public void ConvertProjectDir()
// {
// Assert.AreEqual(project.Directory, tagProvider.ProvideString("ProjectDir"));
// }
//
// [Test]
// public void ConvertProjectFileName()
// {
// Assert.AreEqual(Path.GetFileName(project.FileName), tagProvider.ProvideString("ProjectFileName"));
// }
// }
//}
// 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.IO;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Commands;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using Rhino.Mocks;
namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider
{
/// <summary>
/// Tests the SharpDevelopStringTagProvider when there is an active project.
/// </summary>
[TestFixture]
public class ProjectTagsTestFixture : SDTestFixtureBase
{
SharpDevelopStringTagProvider tagProvider;
IProject project;
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = MockRepository.GenerateStrictMock<IProject>();
project.Stub(p => p.FileName).Return(FileName.Create(@"C:\Projects\MyProject\MyProject.csproj"));
project.Stub(p => p.Directory).Return(DirectoryName.Create(@"C:\Projects\MyProject"));
project.Stub(p => p.OutputAssemblyFullPath).Return(FileName.Create(@"C:\Projects\MyProject\bin\Debug\MyProject.exe"));
project.Stub(p => p.Name).Return("MyProject");
var projectService = MockRepository.GenerateStrictMock<IProjectService>();
projectService.Stub(p => p.CurrentProject).Return(project);
SD.Services.AddService(typeof(IProjectService), projectService);
tagProvider = new SharpDevelopStringTagProvider();
}
[Test]
public void ConvertCurrentProjectName()
{
Assert.AreEqual(project.Name, tagProvider.ProvideString("CurrentProjectName"));
}
[Test]
public void ConvertTargetPath()
{
Assert.AreEqual(project.OutputAssemblyFullPath.ToString(), tagProvider.ProvideString("TargetPath"));
}
[Test]
public void ConvertTargetDir()
{
Assert.AreEqual(Path.GetDirectoryName(project.OutputAssemblyFullPath), tagProvider.ProvideString("TargetDir"));
}
[Test]
public void ConvertTargetName()
{
Assert.AreEqual("MyProject.exe", tagProvider.ProvideString("TargetName"));
}
[Test]
public void ConvertTargetExt()
{
Assert.AreEqual(".exe", tagProvider.ProvideString("TargetExt"));
}
[Test]
public void ConvertProjectDir()
{
Assert.AreEqual(project.Directory.ToString(), tagProvider.ProvideString("ProjectDir"));
}
[Test]
public void ConvertProjectFileName()
{
Assert.AreEqual(Path.GetFileName(project.FileName), tagProvider.ProvideString("ProjectFileName"));
}
}
}

141
src/Main/Base/Test/WebReferences/ProjectHasExistingWebRefFolderTest.cs
Unescape View File

@ -1,71 +1,70 @@ @@ -1,71 +1,70 @@
#warning
//// 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 ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests that a new web reference does not generate a WebReferencesProjectItem
// /// if the project already contains a web reference folder.
// /// </summary>
// [TestFixture]
// public class ProjectHasExistingWebRefFolderTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// ProjectItem webReferencesProjectItem;
// MSBuildBasedProject project;
//
// string name = "localhost";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("C#");
// WebReferencesProjectItem item = new WebReferencesProjectItem(project);
// item.Include = "Web References\\";
// ProjectService.AddProjectItem(project, item);
//
// protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = updateFromUrl;
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/test.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
// webReferencesProjectItem = WebReferenceTestHelper.GetProjectItem(webReference.Items, "Web References\\", ItemType.WebReferences);
// }
//
// [Test]
// public void ProjectItemContainsWebReferencesFolder()
// {
// Assert.IsTrue(SD.WebReference.ProjectContainsWebReferencesFolder(project));
// }
//
// [Test]
// public void WebReferencesProjectItemDoesNotExist()
// {
// Assert.IsNull(webReferencesProjectItem);
// }
// }
//}
// 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 ICSharpCode.SharpDevelop;
using SD = ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests that a new web reference does not generate a WebReferencesProjectItem
/// if the project already contains a web reference folder.
/// </summary>
[TestFixture]
public class ProjectHasExistingWebRefFolderTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
ProjectItem webReferencesProjectItem;
MSBuildBasedProject project;
string name = "localhost";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("C#");
WebReferencesProjectItem item = new WebReferencesProjectItem(project);
item.Include = "Web References\\";
ProjectService.AddProjectItem(project, item);
protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = updateFromUrl;
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/test.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
webReferencesProjectItem = WebReferenceTestHelper.GetProjectItem(webReference.Items, "Web References\\", ItemType.WebReferences);
}
[Test]
public void ProjectItemContainsWebReferencesFolder()
{
Assert.IsTrue(Gui.WebReference.ProjectContainsWebReferencesFolder(project));
}
[Test]
public void WebReferencesProjectItemDoesNotExist()
{
Assert.IsNull(webReferencesProjectItem);
}
}
}

180
src/Main/Base/Test/WebReferences/ProjectWebReferenceItemsTests.cs
Unescape View File

@ -1,90 +1,90 @@ @@ -1,90 +1,90 @@
#warning
//// 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 ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.Collections.Generic;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests the WebReference.GetProjectItems method returns the
// /// correct project items from a project.
// /// </summary>
// [TestFixture]
// public class ProjectWebReferenceItemsTests
// {
// List<ProjectItem> projectItems;
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
//
// // Web references item.
// WebReferencesProjectItem webReferencesItem = new WebReferencesProjectItem(project);
// webReferencesItem.Include = "Web References\\";
// ProjectService.AddProjectItem(project, webReferencesItem);
//
// // Web reference url.
// WebReferenceUrl webReferenceUrl = new WebReferenceUrl(project);
// webReferenceUrl.Include = "http://localhost/test.asmx";
// webReferenceUrl.UpdateFromURL = "http://localhost/test.asmx";
// webReferenceUrl.RelPath = "Web References\\localhost";
// ProjectService.AddProjectItem(project, webReferenceUrl);
//
// FileProjectItem discoFileItem = new FileProjectItem(project, ItemType.None);
// discoFileItem.Include = "Web References\\localhost\\test.disco";
// ProjectService.AddProjectItem(project, discoFileItem);
//
// FileProjectItem wsdlFileItem = new FileProjectItem(project, ItemType.None);
// wsdlFileItem.Include = "Web References\\localhost\\test.wsdl";
// ProjectService.AddProjectItem(project, wsdlFileItem);
//
// // Proxy
// FileProjectItem proxyItem = new FileProjectItem(project, ItemType.Compile);
// proxyItem.Include = "Web References\\localhost\\Reference.cs";
// proxyItem.DependentUpon = "Reference.map";
// ProjectService.AddProjectItem(project, proxyItem);
//
// // Reference map.
// FileProjectItem mapItem = new FileProjectItem(project, ItemType.None);
// mapItem.Include = "Web References\\localhost\\Reference.map";
// ProjectService.AddProjectItem(project, mapItem);
//
// // System.Web.Services reference.
// ReferenceProjectItem webServicesReferenceItem = new ReferenceProjectItem(project, "System.Web.Services");
// ProjectService.AddProjectItem(project, webServicesReferenceItem);
//
// projectItems = WebReference.GetFileItems(project, "localhost");
// }
//
// [Test]
// public void ReferenceMapFileItemFound()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\Reference.map", ItemType.None));
// }
//
// [Test]
// public void ProxyFileItemFound()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\Reference.cs", ItemType.Compile));
// }
//
// [Test]
// public void WsdlFileItemFound()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\test.wsdl", ItemType.None));
// }
//
// [Test]
// public void DiscoFileItemFound()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\test.disco", ItemType.None));
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.Collections.Generic;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests the WebReference.GetProjectItems method returns the
/// correct project items from a project.
/// </summary>
[TestFixture]
public class ProjectWebReferenceItemsTests : SDTestFixtureBase
{
List<ProjectItem> projectItems;
public override void FixtureSetUp()
{
base.FixtureSetUp();
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
// Web references item.
WebReferencesProjectItem webReferencesItem = new WebReferencesProjectItem(project);
webReferencesItem.Include = "Web References\\";
ProjectService.AddProjectItem(project, webReferencesItem);
// Web reference url.
WebReferenceUrl webReferenceUrl = new WebReferenceUrl(project);
webReferenceUrl.Include = "http://localhost/test.asmx";
webReferenceUrl.UpdateFromURL = "http://localhost/test.asmx";
webReferenceUrl.RelPath = "Web References\\localhost";
ProjectService.AddProjectItem(project, webReferenceUrl);
FileProjectItem discoFileItem = new FileProjectItem(project, ItemType.None);
discoFileItem.Include = "Web References\\localhost\\test.disco";
ProjectService.AddProjectItem(project, discoFileItem);
FileProjectItem wsdlFileItem = new FileProjectItem(project, ItemType.None);
wsdlFileItem.Include = "Web References\\localhost\\test.wsdl";
ProjectService.AddProjectItem(project, wsdlFileItem);
// Proxy
FileProjectItem proxyItem = new FileProjectItem(project, ItemType.Compile);
proxyItem.Include = "Web References\\localhost\\Reference.cs";
proxyItem.DependentUpon = "Reference.map";
ProjectService.AddProjectItem(project, proxyItem);
// Reference map.
FileProjectItem mapItem = new FileProjectItem(project, ItemType.None);
mapItem.Include = "Web References\\localhost\\Reference.map";
ProjectService.AddProjectItem(project, mapItem);
// System.Web.Services reference.
ReferenceProjectItem webServicesReferenceItem = new ReferenceProjectItem(project, "System.Web.Services");
ProjectService.AddProjectItem(project, webServicesReferenceItem);
projectItems = WebReference.GetFileItems(project, "localhost");
}
[Test]
public void ReferenceMapFileItemFound()
{
Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\Reference.map", ItemType.None));
}
[Test]
public void ProxyFileItemFound()
{
Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\Reference.cs", ItemType.Compile));
}
[Test]
public void WsdlFileItemFound()
{
Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\test.wsdl", ItemType.None));
}
[Test]
public void DiscoFileItemFound()
{
Assert.IsNotNull(WebReferenceTestHelper.GetProjectItem(projectItems, "Web References\\localhost\\test.disco", ItemType.None));
}
}
}

123
src/Main/Base/Test/WebReferences/RenamedWebReferencesFolderTest.cs
Unescape View File

@ -1,62 +1,61 @@ @@ -1,62 +1,61 @@
#warning
//// 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 ICSharpCode.Core;
//using ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Non-standard web references folder name.
// /// </summary>
// [TestFixture]
// public class RenamedWebReferencesFolderTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// MSBuildBasedProject project;
// WebReferenceUrl webReferenceUrl;
//
// string name = "localhost";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetupFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "C:\\Projects\\Web.csproj";
// WebReferencesProjectItem item = new WebReferencesProjectItem(project);
// item.Include = "Foo\\";
// ProjectService.AddProjectItem(project, item);
//
// protocol = new DiscoveryClientProtocol();
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
// webReferenceUrl = (WebReferenceUrl)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.WebReferenceUrl);
// }
//
// [Test]
// public void WebReferenceRelativePath()
// {
// Assert.AreEqual("Foo\\localhost", webReferenceUrl.RelPath);
// }
//
// [Test]
// public void WebReferencesFolder()
// {
// Assert.AreEqual("C:\\Projects\\Foo", webReference.WebReferencesDirectory);
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using SD = ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Non-standard web references folder name.
/// </summary>
[TestFixture]
public class RenamedWebReferencesFolderTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
MSBuildBasedProject project;
WebReferenceUrl webReferenceUrl;
string name = "localhost";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("C:\\Projects\\Web.csproj");
WebReferencesProjectItem item = new WebReferencesProjectItem(project);
item.Include = "Foo\\";
ProjectService.AddProjectItem(project, item);
protocol = new DiscoveryClientProtocol();
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
webReferenceUrl = (WebReferenceUrl)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.WebReferenceUrl);
}
[Test]
public void WebReferenceRelativePath()
{
Assert.AreEqual("Foo\\localhost", webReferenceUrl.RelPath);
}
[Test]
public void WebReferencesFolder()
{
Assert.AreEqual("C:\\Projects\\Foo", webReference.WebReferencesDirectory);
}
}
}

125
src/Main/Base/Test/WebReferences/VBNetWebReferenceTest.cs
Unescape View File

@ -1,63 +1,62 @@ @@ -1,63 +1,62 @@
#warning
//// 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 ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests that the generated filename ends with .vb if the project is
// /// a vb project.
// /// </summary>
// [TestFixture]
// public class VBNetWebReferenceTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// FileProjectItem proxyFileProjectItem;
// MSBuildBasedProject project;
//
// string name = "localhost";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("VBNet");
//
// protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = updateFromUrl;
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/test.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
//
// proxyFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost\\Reference.vb", ItemType.Compile);
// }
//
// [Test]
// public void VBProxyFileExists()
// {
// Assert.IsNotNull(proxyFileProjectItem);
// }
// }
//}
// 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 ICSharpCode.SharpDevelop;
using SD = ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests that the generated filename ends with .vb if the project is
/// a vb project.
/// </summary>
[TestFixture]
public class VBNetWebReferenceTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
FileProjectItem proxyFileProjectItem;
MSBuildBasedProject project;
string name = "localhost";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("VBNet");
protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = updateFromUrl;
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/test.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
proxyFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost\\Reference.vb", ItemType.Compile);
}
[Test]
public void VBProxyFileExists()
{
Assert.IsNotNull(proxyFileProjectItem);
}
}
}

250
src/Main/Base/Test/WebReferences/WebReferenceChangesTest.cs
Unescape View File

@ -1,125 +1,125 @@ @@ -1,125 +1,125 @@
#warning
//// 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 SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests the WebReferenceChanges class.
// /// </summary>
// [TestFixture]
// public class WebReferenceChangesTest
// {
// SD.WebReferenceChanges changes;
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// // Set up the project.
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
//
// // Web references item.
// WebReferencesProjectItem webReferencesItem = new WebReferencesProjectItem(project);
// webReferencesItem.Include = "Web References\\";
// ProjectService.AddProjectItem(project, webReferencesItem);
//
// // Web reference url.
// WebReferenceUrl webReferenceUrl = new WebReferenceUrl(project);
// webReferenceUrl.Include = "http://localhost/test.asmx";
// webReferenceUrl.UpdateFromURL = "http://localhost/test.asmx";
// webReferenceUrl.RelPath = "Web References\\localhost";
// ProjectService.AddProjectItem(project, webReferenceUrl);
//
// FileProjectItem discoFileItem = new FileProjectItem(project, ItemType.None);
// discoFileItem.Include = "Web References\\localhost\\test.disco";
// ProjectService.AddProjectItem(project, discoFileItem);
//
// FileProjectItem wsdlFileItem = new FileProjectItem(project, ItemType.None);
// wsdlFileItem.Include = "Web References\\localhost\\test.wsdl";
// ProjectService.AddProjectItem(project, wsdlFileItem);
//
// // Proxy
// FileProjectItem proxyItem = new FileProjectItem(project, ItemType.Compile);
// proxyItem.Include = "Web References\\localhost\\Reference.cs";
// proxyItem.DependentUpon = "Reference.map";
// ProjectService.AddProjectItem(project, proxyItem);
//
// // Reference map.
// FileProjectItem mapItem = new FileProjectItem(project, ItemType.None);
// mapItem.Include = "Web References\\localhost\\Reference.map";
// ProjectService.AddProjectItem(project, mapItem);
//
// // System.Web.Services reference.
// ReferenceProjectItem webServicesReferenceItem = new ReferenceProjectItem(project, "System.Web.Services");
// ProjectService.AddProjectItem(project, webServicesReferenceItem);
//
// // Set up the web reference.
// DiscoveryClientProtocol protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = "http://localhost/new.asmx";
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/new.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// SD.WebReference webReference = new SD.WebReference(project, "http://localhost/new.asmx", "localhost", "ProxyNamespace", protocol);
// changes = webReference.GetChanges(project);
// }
//
// [Test]
// public void HasChanged()
// {
// Assert.IsTrue(changes.Changed);
// }
//
// [Test]
// public void HasNewWsdlFile()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.NewItems, "Web References\\localhost\\new.wsdl", ItemType.None));
// }
//
// [Test]
// public void HasNewDiscoFile()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.NewItems, "Web References\\localhost\\new.disco", ItemType.None));
// }
//
// [Test]
// public void OldWsdlFileRemoved()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.ItemsRemoved, "Web References\\localhost\\test.wsdl", ItemType.None));
// }
//
// [Test]
// public void OldDiscoFileRemoved()
// {
// Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.ItemsRemoved, "Web References\\localhost\\test.disco", ItemType.None));
// }
//
// [Test]
// public void WebReferenceUrlNotConsideredNewItem()
// {
// Assert.IsNull(WebReferenceTestHelper.GetProjectItem(changes.NewItems, ItemType.WebReferenceUrl));
// }
//
// [Test]
// public void WebReferenceUrlNotConsideredRemoved()
// {
// Assert.IsNull(WebReferenceTestHelper.GetProjectItem(changes.ItemsRemoved, ItemType.WebReferenceUrl));
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests the WebReferenceChanges class.
/// </summary>
[TestFixture]
public class WebReferenceChangesTest : SDTestFixtureBase
{
WebReferenceChanges changes;
public override void FixtureSetUp()
{
base.FixtureSetUp();
// Set up the project.
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
// Web references item.
WebReferencesProjectItem webReferencesItem = new WebReferencesProjectItem(project);
webReferencesItem.Include = "Web References\\";
ProjectService.AddProjectItem(project, webReferencesItem);
// Web reference url.
WebReferenceUrl webReferenceUrl = new WebReferenceUrl(project);
webReferenceUrl.Include = "http://localhost/test.asmx";
webReferenceUrl.UpdateFromURL = "http://localhost/test.asmx";
webReferenceUrl.RelPath = "Web References\\localhost";
ProjectService.AddProjectItem(project, webReferenceUrl);
FileProjectItem discoFileItem = new FileProjectItem(project, ItemType.None);
discoFileItem.Include = "Web References\\localhost\\test.disco";
ProjectService.AddProjectItem(project, discoFileItem);
FileProjectItem wsdlFileItem = new FileProjectItem(project, ItemType.None);
wsdlFileItem.Include = "Web References\\localhost\\test.wsdl";
ProjectService.AddProjectItem(project, wsdlFileItem);
// Proxy
FileProjectItem proxyItem = new FileProjectItem(project, ItemType.Compile);
proxyItem.Include = "Web References\\localhost\\Reference.cs";
proxyItem.DependentUpon = "Reference.map";
ProjectService.AddProjectItem(project, proxyItem);
// Reference map.
FileProjectItem mapItem = new FileProjectItem(project, ItemType.None);
mapItem.Include = "Web References\\localhost\\Reference.map";
ProjectService.AddProjectItem(project, mapItem);
// System.Web.Services reference.
ReferenceProjectItem webServicesReferenceItem = new ReferenceProjectItem(project, "System.Web.Services");
ProjectService.AddProjectItem(project, webServicesReferenceItem);
// Set up the web reference.
DiscoveryClientProtocol protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = "http://localhost/new.asmx";
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/new.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
var webReference = new Gui.WebReference(project, "http://localhost/new.asmx", "localhost", "ProxyNamespace", protocol);
changes = webReference.GetChanges(project);
}
[Test]
public void HasChanged()
{
Assert.IsTrue(changes.Changed);
}
[Test]
public void HasNewWsdlFile()
{
Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.NewItems, "Web References\\localhost\\new.wsdl", ItemType.None));
}
[Test]
public void HasNewDiscoFile()
{
Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.NewItems, "Web References\\localhost\\new.disco", ItemType.None));
}
[Test]
public void OldWsdlFileRemoved()
{
Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.ItemsRemoved, "Web References\\localhost\\test.wsdl", ItemType.None));
}
[Test]
public void OldDiscoFileRemoved()
{
Assert.IsNotNull(WebReferenceTestHelper.GetFileProjectItem(changes.ItemsRemoved, "Web References\\localhost\\test.disco", ItemType.None));
}
[Test]
public void WebReferenceUrlNotConsideredNewItem()
{
Assert.IsNull(WebReferenceTestHelper.GetProjectItem(changes.NewItems, ItemType.WebReferenceUrl));
}
[Test]
public void WebReferenceUrlNotConsideredRemoved()
{
Assert.IsNull(WebReferenceTestHelper.GetProjectItem(changes.ItemsRemoved, ItemType.WebReferenceUrl));
}
}
}

249
src/Main/Base/Test/WebReferences/WebReferenceFolderAlreadyExistsTest.cs
Unescape View File

@ -1,125 +1,124 @@ @@ -1,125 +1,124 @@
#warning
//// 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 ICSharpCode.Core;
//using ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Checks that the web reference folder name is changed if
// /// one exists with the same name.
// /// </summary>
// [TestFixture]
// public class WebReferenceFolderAlreadyExistsTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// MSBuildBasedProject project;
// WebReferenceUrl webReferenceUrl;
// FileProjectItem discoFileProjectItem;
// FileProjectItem referenceMapFileProjectItem;
// FileProjectItem wsdlFileProjectItem;
// FileProjectItem proxyFileProjectItem;
//
// string oldName = "localhost";
// string name = "localhost1";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetupFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "C:\\Projects\\Web.csproj";
// WebReferencesProjectItem item = new WebReferencesProjectItem(project);
// item.Include = "Web References\\";
// ProjectService.AddProjectItem(project, item);
//
// protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = updateFromUrl;
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/test.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, oldName, proxyNamespace, protocol);
//
// // Force generation of items.
// List<ProjectItem> items = webReference.Items;
//
// // Change the web reference name.
// webReference.Name = name;
// webReferenceUrl = (WebReferenceUrl)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.WebReferenceUrl);
//
// discoFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\test.disco", ItemType.None);
// referenceMapFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\Reference.map", ItemType.None);
// wsdlFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\test.wsdl", ItemType.None);
// proxyFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\Reference.cs", ItemType.Compile);
// }
//
// [Test]
// public void WebReferenceRelativePath()
// {
// Assert.AreEqual("Web References\\localhost1", webReferenceUrl.RelPath);
// }
//
// [Test]
// public void WebReferenceName()
// {
// Assert.AreEqual(name, webReference.Name);
// }
//
// [Test]
// public void WebReferenceDirectory()
// {
// Assert.AreEqual(Path.Combine(project.Directory, "Web References\\localhost1"), webReference.Directory);
// }
//
// [Test]
// public void ProxyFileName()
// {
// Assert.AreEqual("C:\\Projects\\Web References\\localhost1\\Reference.cs", webReference.WebProxyFileName);
// }
//
// [Test]
// public void DiscoFileItemExists()
// {
// Assert.IsNotNull(discoFileProjectItem);
// }
//
// [Test]
// public void WsdlFileItemExists()
// {
// Assert.IsNotNull(wsdlFileProjectItem);
// }
//
// [Test]
// public void ReferenceMapFileItemExists()
// {
// Assert.IsNotNull(referenceMapFileProjectItem);
// }
//
// [Test]
// public void ProxyFileItemExists()
// {
// Assert.IsNotNull(proxyFileProjectItem);
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using SD = ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Checks that the web reference folder name is changed if
/// one exists with the same name.
/// </summary>
[TestFixture]
public class WebReferenceFolderAlreadyExistsTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
MSBuildBasedProject project;
WebReferenceUrl webReferenceUrl;
FileProjectItem discoFileProjectItem;
FileProjectItem referenceMapFileProjectItem;
FileProjectItem wsdlFileProjectItem;
FileProjectItem proxyFileProjectItem;
string oldName = "localhost";
string name = "localhost1";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("C:\\Projects\\Web.csproj");
WebReferencesProjectItem item = new WebReferencesProjectItem(project);
item.Include = "Web References\\";
ProjectService.AddProjectItem(project, item);
protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = updateFromUrl;
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/test.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, oldName, proxyNamespace, protocol);
// Force generation of items.
List<ProjectItem> items = webReference.Items;
// Change the web reference name.
webReference.Name = name;
webReferenceUrl = (WebReferenceUrl)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.WebReferenceUrl);
discoFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\test.disco", ItemType.None);
referenceMapFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\Reference.map", ItemType.None);
wsdlFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\test.wsdl", ItemType.None);
proxyFileProjectItem = WebReferenceTestHelper.GetFileProjectItem(webReference.Items, "Web References\\localhost1\\Reference.cs", ItemType.Compile);
}
[Test]
public void WebReferenceRelativePath()
{
Assert.AreEqual("Web References\\localhost1", webReferenceUrl.RelPath);
}
[Test]
public void WebReferenceName()
{
Assert.AreEqual(name, webReference.Name);
}
[Test]
public void WebReferenceDirectory()
{
Assert.AreEqual(Path.Combine(project.Directory, "Web References\\localhost1"), webReference.Directory);
}
[Test]
public void ProxyFileName()
{
Assert.AreEqual("C:\\Projects\\Web References\\localhost1\\Reference.cs", webReference.WebProxyFileName);
}
[Test]
public void DiscoFileItemExists()
{
Assert.IsNotNull(discoFileProjectItem);
}
[Test]
public void WsdlFileItemExists()
{
Assert.IsNotNull(wsdlFileProjectItem);
}
[Test]
public void ReferenceMapFileItemExists()
{
Assert.IsNotNull(referenceMapFileProjectItem);
}
[Test]
public void ProxyFileItemExists()
{
Assert.IsNotNull(proxyFileProjectItem);
}
}
}

135
src/Main/Base/Test/WebReferences/WebReferenceProjectItemsCachedTest.cs
Unescape View File

@ -1,68 +1,67 @@ @@ -1,68 +1,67 @@
#warning
//// 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 ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests the generated items are not changed if the items have been
// /// added to the project. Previously a WebReferencesProjectItem would be
// /// missing after the items have been added to the project.
// /// </summary>
// [TestFixture]
// public class WebReferenceProjectItemsCachedTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// WebReferencesProjectItem webReferencesProjectItem;
// MSBuildBasedProject project;
//
// string name = "localhost";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "C:\\projects\\test\\foo.csproj";
//
// protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = updateFromUrl;
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/test.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
//
// foreach (ProjectItem item in webReference.Items) {
// ProjectService.AddProjectItem(project, item);
// }
// webReferencesProjectItem = webReference.WebReferencesProjectItem;
// }
//
// [Test]
// public void WebReferencesProjectItemExists()
// {
// Assert.IsNotNull(webReferencesProjectItem);
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests the generated items are not changed if the items have been
/// added to the project. Previously a WebReferencesProjectItem would be
/// missing after the items have been added to the project.
/// </summary>
[TestFixture]
public class WebReferenceProjectItemsCachedTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
WebReferencesProjectItem webReferencesProjectItem;
MSBuildBasedProject project;
string name = "localhost";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("C:\\projects\\test\\foo.csproj");
protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = updateFromUrl;
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/test.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
foreach (ProjectItem item in webReference.Items) {
ProjectService.AddProjectItem(project, item);
}
webReferencesProjectItem = webReference.WebReferencesProjectItem;
}
[Test]
public void WebReferencesProjectItemExists()
{
Assert.IsNotNull(webReferencesProjectItem);
}
}
}

156
src/Main/Base/Test/WebReferences/WebReferenceUrlTests.cs
Unescape View File

@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
#warning
//// 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 ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// [TestFixture]
// public class WebReferenceUrlTests
// {
// [Test]
// public void FileName()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
// WebReferenceUrl url = new WebReferenceUrl(project);
// url.RelPath = "Web References\\localhost";
// url.Include = "http://localhost/test.asmx";
//
// Assert.AreEqual(Path.Combine(project.Directory, url.RelPath), url.FileName);
// }
//
// [Test]
// public void RelPathEndsWithSlash()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
// WebReferenceUrl url = new WebReferenceUrl(project);
// url.RelPath = "Web References\\localhost\\";
// url.Include = "http://localhost/test.asmx";
//
// Assert.AreEqual(Path.Combine(project.Directory, url.RelPath.Trim('\\')), url.FileName);
// }
//
// [Test]
// public void ChangeFileName()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
// WebReferenceUrl url = new WebReferenceUrl(project);
// url.RelPath = "Web References\\localhost";
// url.Include = "http://localhost/test.asmx";
//
// // Change filename - simulate a folder rename.
// url.FileName = "c:\\projects\\test\\Web References\\mywebservice";
//
// Assert.AreEqual("http://localhost/test.asmx", url.Include);
// Assert.AreEqual("Web References\\mywebservice", url.RelPath);
// }
//
// [Test]
// public void NoNamespaceSpecified()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
// project.RootNamespace = "TestRootNamespace";
// WebReferenceUrl url = new WebReferenceUrl(project);
//
// Assert.AreEqual("TestRootNamespace", url.Namespace);
// }
//
// [Test]
// public void NamespaceSpecified()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "c:\\projects\\test\\foo.csproj";
// project.RootNamespace = "TestRootNamespace";
// WebReferenceUrl url = new WebReferenceUrl(project);
// url.Namespace = "WebReferenceNamespace";
//
// Assert.AreEqual("WebReferenceNamespace", url.Namespace);
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
[TestFixture]
public class WebReferenceUrlTests : SDTestFixtureBase
{
[Test]
public void FileNameTest()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
WebReferenceUrl url = new WebReferenceUrl(project);
url.RelPath = "Web References\\localhost";
url.Include = "http://localhost/test.asmx";
Assert.AreEqual(project.Directory.CombineFile(url.RelPath), url.FileName);
}
[Test]
public void RelPathEndsWithSlash()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
WebReferenceUrl url = new WebReferenceUrl(project);
url.RelPath = "Web References\\localhost\\";
url.Include = "http://localhost/test.asmx";
Assert.AreEqual(project.Directory.CombineFile(url.RelPath.Trim('\\')), url.FileName);
}
[Test]
public void ChangeFileName()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
WebReferenceUrl url = new WebReferenceUrl(project);
url.RelPath = "Web References\\localhost";
url.Include = "http://localhost/test.asmx";
// Change filename - simulate a folder rename.
url.FileName = FileName.Create("c:\\projects\\test\\Web References\\mywebservice");
Assert.AreEqual("http://localhost/test.asmx", url.Include);
Assert.AreEqual("Web References\\mywebservice", url.RelPath);
}
[Test]
public void NoNamespaceSpecified()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
project.RootNamespace = "TestRootNamespace";
WebReferenceUrl url = new WebReferenceUrl(project);
Assert.AreEqual("TestRootNamespace", url.Namespace);
}
[Test]
public void NamespaceSpecified()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("c:\\projects\\test\\foo.csproj");
project.RootNamespace = "TestRootNamespace";
WebReferenceUrl url = new WebReferenceUrl(project);
url.Namespace = "WebReferenceNamespace";
Assert.AreEqual("WebReferenceNamespace", url.Namespace);
}
}
}

192
src/Main/Base/Test/WebReferences/WebServicesReferenceExistsTests.cs
Unescape View File

@ -1,96 +1,96 @@ @@ -1,96 +1,96 @@
#warning
//// 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 ICSharpCode.SharpDevelop;
//using SD = ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.SharpDevelop.Project;
//using NUnit.Framework;
//using System;
//using System.IO;
//using System.Collections.Generic;
//using System.Web.Services.Description;
//using System.Web.Services.Discovery;
//
//namespace ICSharpCode.SharpDevelop.Tests.WebReferences
//{
// /// <summary>
// /// Tests that the generated project items for a web reference do not include
// /// a reference to System.Web.Services if one already exists in the project.
// /// </summary>
// [TestFixture]
// public class WebServicesReferenceExistsTest
// {
// SD.WebReference webReference;
// DiscoveryClientProtocol protocol;
// ReferenceProjectItem webServicesReferenceProjectItem;
// MSBuildBasedProject project;
//
// string name = "localhost";
// string proxyNamespace = "WebReferenceNamespace";
// string updateFromUrl = "http://localhost/test.asmx";
//
// [TestFixtureSetUp]
// public void SetUpFixture()
// {
// project = WebReferenceTestHelper.CreateTestProject("C#");
// project.FileName = "C:\\projects\\test\\foo.csproj";
//
// ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Web.Services");
// ProjectService.AddProjectItem(project, referenceItem);
//
// protocol = new DiscoveryClientProtocol();
// DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
// discoveryRef.Url = updateFromUrl;
// protocol.References.Add(discoveryRef);
//
// ContractReference contractRef = new ContractReference();
// contractRef.Url = "http://localhost/test.asmx?wsdl";
// contractRef.ClientProtocol = new DiscoveryClientProtocol();
// ServiceDescription desc = new ServiceDescription();
// contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
// protocol.References.Add(contractRef);
//
// WebReferenceTestHelper.InitializeProjectBindings();
//
// webReference = new SD.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
// webServicesReferenceProjectItem = (ReferenceProjectItem)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.Reference);
// }
//
// [Test]
// public void WebServicesReferenceItemDoesNotExist()
// {
// Assert.IsNull(webServicesReferenceProjectItem);
// }
//
// [Test]
// public void WebServicesReferenceDoesNotExist1()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Windows.Forms");
// ProjectService.AddProjectItem(project, referenceItem);
//
// Assert.IsFalse(SD.WebReference.ProjectContainsWebServicesReference(project));
// }
//
// [Test]
// public void WebServicesReferenceExists1()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "system.web.services");
// ProjectService.AddProjectItem(project, referenceItem);
//
// Assert.IsTrue(SD.WebReference.ProjectContainsWebServicesReference(project));
// }
//
// [Test]
// public void WebServicesReferenceExists2()
// {
// MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
// ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
// ProjectService.AddProjectItem(project, referenceItem);
//
// Assert.IsTrue(SD.WebReference.ProjectContainsWebServicesReference(project));
// }
// }
//}
// 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 ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using SD = ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using NUnit.Framework;
using System;
using System.IO;
using System.Collections.Generic;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
namespace ICSharpCode.SharpDevelop.Tests.WebReferences
{
/// <summary>
/// Tests that the generated project items for a web reference do not include
/// a reference to System.Web.Services if one already exists in the project.
/// </summary>
[TestFixture]
public class WebServicesReferenceExistsTest : SDTestFixtureBase
{
Gui.WebReference webReference;
DiscoveryClientProtocol protocol;
ReferenceProjectItem webServicesReferenceProjectItem;
MSBuildBasedProject project;
string name = "localhost";
string proxyNamespace = "WebReferenceNamespace";
string updateFromUrl = "http://localhost/test.asmx";
public override void FixtureSetUp()
{
base.FixtureSetUp();
project = WebReferenceTestHelper.CreateTestProject("C#");
project.FileName = FileName.Create("C:\\projects\\test\\foo.csproj");
ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Web.Services");
ProjectService.AddProjectItem(project, referenceItem);
protocol = new DiscoveryClientProtocol();
DiscoveryDocumentReference discoveryRef = new DiscoveryDocumentReference();
discoveryRef.Url = updateFromUrl;
protocol.References.Add(discoveryRef);
ContractReference contractRef = new ContractReference();
contractRef.Url = "http://localhost/test.asmx?wsdl";
contractRef.ClientProtocol = new DiscoveryClientProtocol();
ServiceDescription desc = new ServiceDescription();
contractRef.ClientProtocol.Documents.Add(contractRef.Url, desc);
protocol.References.Add(contractRef);
WebReferenceTestHelper.InitializeProjectBindings();
webReference = new Gui.WebReference(project, updateFromUrl, name, proxyNamespace, protocol);
webServicesReferenceProjectItem = (ReferenceProjectItem)WebReferenceTestHelper.GetProjectItem(webReference.Items, ItemType.Reference);
}
[Test]
public void WebServicesReferenceItemDoesNotExist()
{
Assert.IsNull(webServicesReferenceProjectItem);
}
[Test]
public void WebServicesReferenceDoesNotExist1()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Windows.Forms");
ProjectService.AddProjectItem(project, referenceItem);
Assert.IsFalse(Gui.WebReference.ProjectContainsWebServicesReference(project));
}
[Test]
public void WebServicesReferenceExists1()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "system.web.services");
ProjectService.AddProjectItem(project, referenceItem);
Assert.IsTrue(Gui.WebReference.ProjectContainsWebServicesReference(project));
}
[Test]
public void WebServicesReferenceExists2()
{
MSBuildBasedProject project = WebReferenceTestHelper.CreateTestProject("C#");
ReferenceProjectItem referenceItem = new ReferenceProjectItem(project, "System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
ProjectService.AddProjectItem(project, referenceItem);
Assert.IsTrue(Gui.WebReference.ProjectContainsWebServicesReference(project));
}
}
}

2
src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
Unescape View File

@ -18,7 +18,7 @@ namespace ICSharpCode.Core @@ -18,7 +18,7 @@ namespace ICSharpCode.Core
/// for you, provided you use it like this:
/// 1. Create a new CoreStartup instance
/// 2. (Optional) Set the values of the properties.
/// 3. Call <see cref="StartCoreServices()"/>.
/// 3. Call <see cref="StartCoreServices"/>.
/// 4. Add "preinstalled" AddIns using <see cref="AddAddInsFromDirectory"/>
/// and <see cref="AddAddInFile"/>.
/// 5. (Optional) Call <see cref="ConfigureExternalAddIns"/> to support

3
src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
Unescape View File

@ -337,16 +337,19 @@ namespace ICSharpCode.Core @@ -337,16 +337,19 @@ namespace ICSharpCode.Core
}
}
[Obsolete("Use SD.FileSystem.GetFiles() instead")]
public static List<string> SearchDirectory(string directory, string filemask, bool searchSubdirectories, bool ignoreHidden)
{
return SearchDirectoryInternal(directory, filemask, searchSubdirectories, ignoreHidden).Select(file => file.ToString()).ToList();
}
[Obsolete("Use SD.FileSystem.GetFiles() instead")]
public static List<string> SearchDirectory(string directory, string filemask, bool searchSubdirectories)
{
return SearchDirectory(directory, filemask, searchSubdirectories, true);
}
[Obsolete("Use SD.FileSystem.GetFiles() instead")]
public static List<string> SearchDirectory(string directory, string filemask)
{
return SearchDirectory(directory, filemask, true, true);

Write Preview
Loading…
Cancel
Save