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

Fixed SD2-1182. Element and attribute names entered in the add element/attribute dialog are now validated. The add element/attribute dialog no longer displays a list box if there are no element/attribute names returned from the schema or if the xml document has no schema. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2226 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
4ac2c6f933
commit
d079cdbc43
18 changed files with 808 additions and 436 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      src/AddIns/DisplayBindings/XmlEditor/Project/Resources/AddAttributeDialog.xfrm
  2. 60
      src/AddIns/DisplayBindings/XmlEditor/Project/Resources/AddElementDialog.xfrm
  3. 88
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddAttributeDialog.cs
  4. 88
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddElementDialog.cs
  5. 339
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddXmlNodeDialog.cs
  6. 30
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddAttributeDialog.cs
  7. 11
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddXmlNodeDialog.cs
  8. 22
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewContainerControl.cs
  9. 8
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
  10. 325
      src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs
  11. 11
      src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteTestFixture.cs
  12. 30
      src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewContainerTestFixture.cs
  13. 39
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedAddXmlNodeDialog.cs
  14. 32
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeViewContainerControl.cs
  15. 65
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddAttributeDialog.cs
  16. 29
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddXmlNodeDialog.cs
  17. 5
      src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
  18. 2
      src/AddIns/DisplayBindings/XmlEditor/XmlEditor.sln

60
src/AddIns/DisplayBindings/XmlEditor/Project/Resources/AddAttributeDialog.xfrm
Unescape View File

@ -1,60 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.Form>
<Name value="AddAttributeDialog" />
<MinimizeBox value="False" />
<StartPosition value="CenterParent" />
<MinimumSize value="191, 155" />
<ShowInTaskbar value="False" />
<Text value="${res:ICSharpCode.XmlEditor.AddAttributeDialog.Title}" />
<MaximizeBox value="False" />
<ClientSize value="{Width=289, Height=244}" />
<ShowIcon value="False" />
<Controls>
<System.Windows.Forms.Label>
<Name value="label1" />
<Location value="5, 179" />
<Text value="${res:ICSharpCode.XmlEditor.AddAttributeDialog.CustomAttributeLabel}" />
<Anchor value="Bottom, Left" />
<Size value="82, 23" />
<TabIndex value="1" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="attributeTextBox" />
<TabIndex value="2" />
<Size value="183, 21" />
<Location value="100, 179" />
<Anchor value="Bottom, Left, Right" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Button>
<Name value="okButton" />
<DialogResult value="OK" />
<Location value="121, 209" />
<Text value="${res:Global.OKButtonText}" />
<Anchor value="Bottom, Right" />
<UseVisualStyleBackColor value="True" />
<Size value="75, 23" />
<TabIndex value="3" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="cancelButton" />
<DialogResult value="Cancel" />
<Location value="202, 209" />
<Text value="${res:Global.CancelButtonText}" />
<Anchor value="Bottom, Right" />
<UseVisualStyleBackColor value="True" />
<Size value="75, 23" />
<TabIndex value="4" />
</System.Windows.Forms.Button>
<System.Windows.Forms.ListBox>
<Name value="attributesListBox" />
<Size value="289, 173" />
<TabIndex value="0" />
<Sorted value="True" />
<SelectionMode value="MultiExtended" />
<FormattingEnabled value="True" />
<Location value="0, 0" />
<Anchor value="Top, Bottom, Left, Right" />
</System.Windows.Forms.ListBox>
</Controls>
</System.Windows.Forms.Form>
</Components>

60
src/AddIns/DisplayBindings/XmlEditor/Project/Resources/AddElementDialog.xfrm
Unescape View File

@ -1,60 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.Form>
<Name value="AddElementDialog" />
<MinimizeBox value="False" />
<StartPosition value="CenterParent" />
<MinimumSize value="191, 155" />
<ShowInTaskbar value="False" />
<Text value="${res:ICSharpCode.XmlEditor.AddElementDialog.Title}" />
<MaximizeBox value="False" />
<ClientSize value="{Width=289, Height=244}" />
<ShowIcon value="False" />
<Controls>
<System.Windows.Forms.Label>
<Name value="customElementLabel" />
<Location value="5, 179" />
<Text value="${res:ICSharpCode.XmlEditor.AddElementDialog.CustomElementLabel}" />
<Anchor value="Bottom, Left" />
<Size value="82, 23" />
<TabIndex value="1" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="elementTextBox" />
<TabIndex value="2" />
<Size value="183, 21" />
<Location value="100, 179" />
<Anchor value="Bottom, Left, Right" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Button>
<Name value="okButton" />
<DialogResult value="OK" />
<Location value="121, 209" />
<Text value="${res:Global.OKButtonText}" />
<Anchor value="Bottom, Right" />
<UseVisualStyleBackColor value="True" />
<Size value="75, 23" />
<TabIndex value="3" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="cancelButton" />
<DialogResult value="Cancel" />
<Location value="202, 209" />
<Text value="${res:Global.CancelButtonText}" />
<Anchor value="Bottom, Right" />
<UseVisualStyleBackColor value="True" />
<Size value="75, 23" />
<TabIndex value="4" />
</System.Windows.Forms.Button>
<System.Windows.Forms.ListBox>
<Name value="elementsListBox" />
<Size value="289, 173" />
<TabIndex value="0" />
<Sorted value="True" />
<SelectionMode value="MultiExtended" />
<FormattingEnabled value="True" />
<Location value="0, 0" />
<Anchor value="Top, Bottom, Left, Right" />
</System.Windows.Forms.ListBox>
</Controls>
</System.Windows.Forms.Form>
</Components>

88
src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddAttributeDialog.cs
Unescape View File

@ -1,88 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.XmlEditor
{
public class AddAttributeDialog : BaseSharpDevelopForm, IAddAttributeDialog
{
ListBox attributesListBox;
Button okButton;
TextBox attributeTextBox;
public AddAttributeDialog(string[] attributeNames)
{
SetupFromXmlStream(GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.AddAttributeDialog.xfrm"));
okButton = (Button)ControlDictionary["okButton"];
okButton.Enabled = false;
AcceptButton = okButton;
CancelButton = (Button)ControlDictionary["cancelButton"];
attributeTextBox = (TextBox)ControlDictionary["attributeTextBox"];
attributeTextBox.TextChanged += AttributeTextBoxTextChanged;
attributesListBox = (ListBox)ControlDictionary["attributesListBox"];
attributesListBox.SelectedIndexChanged += AttributesListBoxSelectedIndexChanged;
foreach (string name in attributeNames) {
attributesListBox.Items.Add(name);
}
}
/// <summary>
/// Gets the attribute names selected.
/// </summary>
public string[] AttributeNames {
get {
List<string> attributeNames = new List<string>();
if (IsAttributeSelected) {
foreach (string attributeName in attributesListBox.SelectedItems) {
attributeNames.Add(attributeName);
}
}
string customAttributeName = attributeTextBox.Text.Trim();
if (customAttributeName.Length > 0) {
attributeNames.Add(customAttributeName);
}
return attributeNames.ToArray();
}
}
void AttributesListBoxSelectedIndexChanged(object source, EventArgs e)
{
okButton.Enabled = IsOkButtonEnabled;
}
void AttributeTextBoxTextChanged(object source, EventArgs e)
{
okButton.Enabled = IsOkButtonEnabled;
}
bool IsAttributeSelected {
get {
return attributesListBox.SelectedIndex >= 0;
}
}
bool IsOkButtonEnabled {
get {
return IsAttributeSelected || IsAttributeNameEntered;
}
}
bool IsAttributeNameEntered {
get {
return attributeTextBox.Text.Trim().Length > 0;
}
}
}
}

88
src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddElementDialog.cs
Unescape View File

@ -1,88 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.XmlEditor
{
public class AddElementDialog : BaseSharpDevelopForm, IAddElementDialog
{
ListBox elementsListBox;
Button okButton;
TextBox elementTextBox;
public AddElementDialog(string[] elementNames)
{
SetupFromXmlStream(GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.AddElementDialog.xfrm"));
okButton = (Button)ControlDictionary["okButton"];
okButton.Enabled = false;
AcceptButton = okButton;
CancelButton = (Button)ControlDictionary["cancelButton"];
elementTextBox = (TextBox)ControlDictionary["elementTextBox"];
elementTextBox.TextChanged += ElementTextBoxTextChanged;
elementsListBox = (ListBox)ControlDictionary["elementsListBox"];
elementsListBox.SelectedIndexChanged += ElementsListBoxSelectedIndexChanged;
foreach (string name in elementNames) {
elementsListBox.Items.Add(name);
}
}
/// <summary>
/// Gets the element names selected.
/// </summary>
public string[] ElementNames {
get {
List<string> elementNames = new List<string>();
if (IsElementSelected) {
foreach (string elementName in elementsListBox.SelectedItems) {
elementNames.Add(elementName);
}
}
string customElementName = elementTextBox.Text.Trim();
if (customElementName.Length > 0) {
elementNames.Add(customElementName);
}
return elementNames.ToArray();
}
}
void ElementsListBoxSelectedIndexChanged(object source, EventArgs e)
{
okButton.Enabled = IsOkButtonEnabled;
}
void ElementTextBoxTextChanged(object source, EventArgs e)
{
okButton.Enabled = IsOkButtonEnabled;
}
bool IsElementSelected {
get {
return elementsListBox.SelectedIndex >= 0;
}
}
bool IsOkButtonEnabled {
get {
return IsElementSelected || IsElementNameEntered;
}
}
bool IsElementNameEntered {
get {
return elementTextBox.Text.Trim().Length > 0;
}
}
}
}

339
src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddXmlNodeDialog.cs
Unescape View File

@ -0,0 +1,339 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using System.Xml;
using ICSharpCode.Core;
namespace ICSharpCode.XmlEditor
{
/// <summary>
/// Base class for the AddElementDialog and AddAttributeDialog. This
/// dialog presents a list of names and an extra text box for entering
/// a custom name. It is used to add a new node to the XML tree. It
/// contains all the core logic for the AddElementDialog and
/// AddAttributeDialog classes.
/// </summary>
public class AddXmlNodeDialog : System.Windows.Forms.Form, IAddXmlNodeDialog
{
public AddXmlNodeDialog() : this(new string[0])
{
}
/// <summary>
/// Creates the dialog and adds the specified names to the
/// list box.
/// </summary>
public AddXmlNodeDialog(string[] names)
{
InitializeComponent();
InitStrings();
if (names.Length > 0) {
AddNames(names);
} else {
RemoveNamesListBox();
}
RightToLeftConverter.ConvertRecursive(this);
}
/// <summary>
/// Gets the selected names in the list box together with the
/// custom name entered in the text box.
/// </summary>
public string[] GetNames()
{
// Add items selected in list box.
List<string> names = new List<string>();
foreach (string name in namesListBox.SelectedItems) {
names.Add(name);
}
// Add the custom name if entered.
string customName = customNameTextBox.Text.Trim();
if (customName.Length > 0) {
names.Add(customName);
}
return names.ToArray();
}
/// <summary>
/// Gets the text from the error provider.
/// </summary>
public string GetError()
{
return errorProvider.GetError(customNameTextBox);
}
/// <summary>
/// Gets or sets the custom name label's text.
/// </summary>
public string CustomNameLabelText {
get {
return customNameTextBoxLabel.Text;
}
set {
customNameTextBoxLabel.Text = value;
}
}
/// <summary>
/// Disposes resources used by the form.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing) {
if (components != null) {
components.Dispose();
}
}
base.Dispose(disposing);
}
protected void NamesListBoxSelectedIndexChanged(object sender, EventArgs e)
{
UpdateOkButtonState();
}
protected void CustomNameTextBoxTextChanged(object sender, EventArgs e)
{
UpdateOkButtonState();
}
#region Windows Forms Designer generated code
void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.namesListBox = new System.Windows.Forms.ListBox();
this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
this.bottomPanel = new System.Windows.Forms.Panel();
this.customNameTextBoxLabel = new System.Windows.Forms.Label();
this.customNameTextBox = new System.Windows.Forms.TextBox();
this.cancelButton = new System.Windows.Forms.Button();
this.okButton = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
this.bottomPanel.SuspendLayout();
this.SuspendLayout();
//
// namesListBox
//
this.namesListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.namesListBox.FormattingEnabled = true;
this.namesListBox.Location = new System.Drawing.Point(0, 0);
this.namesListBox.Name = "namesListBox";
this.namesListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
this.namesListBox.Size = new System.Drawing.Size(289, 173);
this.namesListBox.Sorted = true;
this.namesListBox.TabIndex = 1;
this.namesListBox.SelectedIndexChanged += new System.EventHandler(this.NamesListBoxSelectedIndexChanged);
//
// errorProvider
//
this.errorProvider.ContainerControl = this;
//
// bottomPanel
//
this.bottomPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.bottomPanel.Controls.Add(this.customNameTextBoxLabel);
this.bottomPanel.Controls.Add(this.customNameTextBox);
this.bottomPanel.Controls.Add(this.cancelButton);
this.bottomPanel.Controls.Add(this.okButton);
this.bottomPanel.Location = new System.Drawing.Point(0, 173);
this.bottomPanel.Name = "bottomPanel";
this.bottomPanel.Size = new System.Drawing.Size(289, 73);
this.bottomPanel.TabIndex = 2;
//
// customNameTextBoxLabel
//
this.customNameTextBoxLabel.Location = new System.Drawing.Point(3, 10);
this.customNameTextBoxLabel.Name = "customNameTextBoxLabel";
this.customNameTextBoxLabel.Size = new System.Drawing.Size(82, 23);
this.customNameTextBoxLabel.TabIndex = 3;
this.customNameTextBoxLabel.Text = "Custom:";
//
// customNameTextBox
//
this.customNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.customNameTextBox.Location = new System.Drawing.Point(107, 10);
this.customNameTextBox.Name = "customNameTextBox";
this.customNameTextBox.Size = new System.Drawing.Size(167, 20);
this.customNameTextBox.TabIndex = 4;
this.customNameTextBox.TextChanged += new System.EventHandler(this.CustomNameTextBoxTextChanged);
//
// cancelButton
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(199, 40);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 6;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.okButton.Enabled = false;
this.okButton.Location = new System.Drawing.Point(118, 40);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 5;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
//
// AddXmlNodeDialog
//
this.AcceptButton = this.okButton;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(289, 244);
this.Controls.Add(this.bottomPanel);
this.Controls.Add(this.namesListBox);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(289, 143);
this.Name = "AddXmlNodeDialog";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
this.bottomPanel.ResumeLayout(false);
this.bottomPanel.PerformLayout();
this.ResumeLayout(false);
}
private System.Windows.Forms.Panel bottomPanel;
private System.ComponentModel.IContainer components;
private System.Windows.Forms.ErrorProvider errorProvider;
private System.Windows.Forms.Button cancelButton;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.TextBox customNameTextBox;
private System.Windows.Forms.Label customNameTextBoxLabel;
private System.Windows.Forms.ListBox namesListBox;
#endregion
/// <summary>
/// Adds the names to the list box.
/// </summary>
void AddNames(string[] names)
{
foreach (string name in names) {
namesListBox.Items.Add(name);
}
}
/// <summary>
/// Enables or disables the ok button depending on whether any list
/// item is selected or a custom name has been entered.
/// </summary>
void UpdateOkButtonState()
{
okButton.Enabled = IsOkButtonEnabled;
}
/// <summary>
/// Returns whether any items are selected in the list box.
/// </summary>
bool IsItemSelected {
get {
return namesListBox.SelectedIndex >= 0;
}
}
bool IsOkButtonEnabled {
get {
return IsItemSelected || ValidateCustomName();
}
}
/// <summary>
/// Returns whether there is a valid string in the custom
/// name text box. The string must be a name that can be used to
/// create an xml element or attribute.
/// </summary>
bool ValidateCustomName()
{
string name = customNameTextBox.Text.Trim();
if (name.Length > 0) {
try {
VerifyName(name);
errorProvider.Clear();
return true;
} catch (XmlException ex) {
errorProvider.SetError(customNameTextBox, ex.Message);
}
}
return false;
}
/// <summary>
/// Checks that the name would make a valid element name or
/// attribute name. Trying to use XmlConvert and its Verify methods
/// so the validation is not done ourselves. XmlDocument has a
/// CheckName method but this is not public.
/// </summary>
void VerifyName(string name)
{
// Check the qualification is valid.
string[] parts = name.Split(new char[] {':'}, 2);
if (parts.Length == 1) {
// No colons.
XmlConvert.VerifyName(name);
return;
}
string firstPart = parts[0].Trim();
string secondPart = parts[1].Trim();
if (firstPart.Length > 0 && secondPart.Length > 0) {
XmlConvert.VerifyNCName(firstPart);
XmlConvert.VerifyNCName(secondPart);
} else {
// Throw an error using VerifyNCName since the
// qualified name parts have no strings.
XmlConvert.VerifyNCName(name);
}
}
/// <summary>
/// Sets the control's text using string resources.
/// </summary>
void InitStrings()
{
okButton.Text = StringParser.Parse("${res:Global.OKButtonText}");
cancelButton.Text = StringParser.Parse("${res:Global.CancelButtonText}");
}
/// <summary>
/// Removes the names list box from the dialog, re-positions the
/// remaining controls and resizes the dialog to fit.
/// </summary>
void RemoveNamesListBox()
{
using (namesListBox) {
Controls.Remove(namesListBox);
// Reset the dialog's minimum size first so setting the
// ClientSize to something smaller works as expected.
MinimumSize = Size.Empty;
ClientSize = bottomPanel.Size;
MinimumSize = Size;
// Make sure bottom panel fills the dialog when it is resized.
bottomPanel.Dock = DockStyle.Fill;
}
}
}
}

30
src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddAttributeDialog.cs
Unescape View File

@ -1,30 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Windows.Forms;
namespace ICSharpCode.XmlEditor
{
/// <summary>
/// Interface for the AddAttributeDialog.
/// </summary>
public interface IAddAttributeDialog : IDisposable
{
/// <summary>
/// The attribute names that should be added. These are the
/// attribute names that the user selected in the dialog when
/// it was closed.
/// </summary>
string[] AttributeNames {get;}
/// <summary>
/// Shows the dialog.
/// </summary>
DialogResult ShowDialog();
}
}

11
src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddElementDialog.cs → src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddXmlNodeDialog.cs
Unescape View File

@ -5,22 +5,23 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
namespace ICSharpCode.XmlEditor namespace ICSharpCode.XmlEditor
{ {
/// <summary> /// <summary>
/// Interface for the AddElementDialog. /// Interface for the AddXmlNodeDialog.
/// </summary> /// </summary>
public interface IAddElementDialog : IDisposable public interface IAddXmlNodeDialog : IDisposable
{ {
/// <summary> /// <summary>
/// The element names that should be added. These are the /// The names that should be added. These are the
/// element names that the user selected in the dialog when /// names that the user selected in the dialog when
/// it was closed. /// it was closed.
/// </summary> /// </summary>
string[] ElementNames {get;} string[] GetNames();
/// <summary> /// <summary>
/// Shows the dialog. /// Shows the dialog.

22
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewContainerControl.cs
Unescape View File

@ -296,9 +296,9 @@ namespace ICSharpCode.XmlEditor
/// <returns>The attributes selected by the user.</returns> /// <returns>The attributes selected by the user.</returns>
public string[] SelectNewAttributes(string[] attributes) public string[] SelectNewAttributes(string[] attributes)
{ {
using (IAddAttributeDialog addAttributeDialog = CreateAddAttributeDialog(attributes)) { using (IAddXmlNodeDialog addAttributeDialog = CreateAddAttributeDialog(attributes)) {
if (addAttributeDialog.ShowDialog() == DialogResult.OK) { if (addAttributeDialog.ShowDialog() == DialogResult.OK) {
return addAttributeDialog.AttributeNames; return addAttributeDialog.GetNames();
} }
return new string[0]; return new string[0];
} }
@ -321,9 +321,9 @@ namespace ICSharpCode.XmlEditor
/// <returns>The elements selected by the user.</returns> /// <returns>The elements selected by the user.</returns>
public string[] SelectNewElements(string[] elements) public string[] SelectNewElements(string[] elements)
{ {
using (IAddElementDialog addElementDialog = CreateAddElementDialog(elements)) { using (IAddXmlNodeDialog addElementDialog = CreateAddElementDialog(elements)) {
if (addElementDialog.ShowDialog() == DialogResult.OK) { if (addElementDialog.ShowDialog() == DialogResult.OK) {
return addElementDialog.ElementNames; return addElementDialog.GetNames();
} }
return new string[0]; return new string[0];
} }
@ -649,9 +649,12 @@ namespace ICSharpCode.XmlEditor
/// </summary> /// </summary>
/// <param name="elementNames">The element names to be listed in the /// <param name="elementNames">The element names to be listed in the
/// dialog.</param> /// dialog.</param>
protected virtual IAddElementDialog CreateAddElementDialog(string[] elementNames) protected virtual IAddXmlNodeDialog CreateAddElementDialog(string[] elementNames)
{ {
return new AddElementDialog(elementNames); AddXmlNodeDialog dialog = new AddXmlNodeDialog(elementNames);
dialog.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.Title}");
dialog.CustomNameLabelText = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.CustomElementLabel}");
return dialog;
} }
/// <summary> /// <summary>
@ -659,9 +662,12 @@ namespace ICSharpCode.XmlEditor
/// </summary> /// </summary>
/// <param name="attributeNames">The attribute names to be listed in the /// <param name="attributeNames">The attribute names to be listed in the
/// dialog.</param> /// dialog.</param>
protected virtual IAddAttributeDialog CreateAddAttributeDialog(string[] attributeNames) protected virtual IAddXmlNodeDialog CreateAddAttributeDialog(string[] attributeNames)
{ {
return new AddAttributeDialog(attributeNames); AddXmlNodeDialog dialog = new AddXmlNodeDialog(attributeNames);
dialog.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.Title}");
dialog.CustomNameLabelText = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.CustomAttributeLabel}");
return dialog;
} }
/// <summary> /// <summary>

8
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
Unescape View File

@ -56,8 +56,8 @@
<Compile Include="Configuration\AssemblyInfo.cs" /> <Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\AddChildCommentCommand.cs" /> <Compile Include="Src\AddChildCommentCommand.cs" />
<Compile Include="Src\AddChildTextNodeCommand.cs" /> <Compile Include="Src\AddChildTextNodeCommand.cs" />
<Compile Include="Src\IAddAttributeDialog.cs" /> <Compile Include="Src\AddXmlNodeDialog.cs" />
<Compile Include="Src\IAddElementDialog.cs" /> <Compile Include="Src\IAddXmlNodeDialog.cs" />
<Compile Include="Src\InsertCommentAfterCommand.cs" /> <Compile Include="Src\InsertCommentAfterCommand.cs" />
<Compile Include="Src\InsertCommentBeforeCommand.cs" /> <Compile Include="Src\InsertCommentBeforeCommand.cs" />
<Compile Include="Src\InsertTextNodeAfterCommand.cs" /> <Compile Include="Src\InsertTextNodeAfterCommand.cs" />
@ -138,12 +138,8 @@
<Compile Include="Src\XmlAttributePropertyDescriptor.cs" /> <Compile Include="Src\XmlAttributePropertyDescriptor.cs" />
<Compile Include="Src\XmlAttributeTypeDescriptor.cs" /> <Compile Include="Src\XmlAttributeTypeDescriptor.cs" />
<Compile Include="Src\XmlEncoder.cs" /> <Compile Include="Src\XmlEncoder.cs" />
<EmbeddedResource Include="Resources\AddAttributeDialog.xfrm" />
<Compile Include="Src\AddAttributeDialog.cs" />
<Compile Include="Src\AddAttributeCommand.cs" /> <Compile Include="Src\AddAttributeCommand.cs" />
<Compile Include="Src\RemoveAttributeCommand.cs" /> <Compile Include="Src\RemoveAttributeCommand.cs" />
<EmbeddedResource Include="Resources\AddElementDialog.xfrm" />
<Compile Include="Src\AddElementDialog.cs" />
<Compile Include="Src\AddChildElementCommand.cs" /> <Compile Include="Src\AddChildElementCommand.cs" />
<Compile Include="Src\InsertElementBeforeCommand.cs" /> <Compile Include="Src\InsertElementBeforeCommand.cs" />
<Compile Include="Src\InsertElementAfterCommand.cs" /> <Compile Include="Src\InsertElementAfterCommand.cs" />

325
src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs
Unescape View File

@ -0,0 +1,325 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Drawing;
using System.Threading;
using System.Windows.Forms;
using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.XmlEditor;
using NUnit.Framework;
using XmlEditor.Tests.Utils;
namespace XmlEditor.Tests.Tree
{
/// <summary>
/// Tests the AddXmlNodeDialog which is the base class for the
/// AddElementDialog and the AddAttributeDialog classes. All the
/// core logic for the two add dialogs is located in the AddXmlNodeDialog
/// since their behaviour is the same.
/// </summary>
[TestFixture]
public class AddNewNodeDialogTestFixture
{
DerivedAddXmlNodeDialog dialog;
ListBox namesListBox;
string[] names;
Button okButton;
Button cancelButton;
TextBox customNameTextBox;
Label customNameTextBoxLabel;
Panel bottomPanel;
[TestFixtureSetUp]
public void SetUpFixture()
{
if (!PropertyService.Initialized) {
PropertyService.InitializeService(String.Empty, String.Empty, String.Empty);
}
}
[SetUp]
public void Init()
{
names = new string[] {"Chimpanzee", "Monkey"};
dialog = new DerivedAddXmlNodeDialog(names);
// Get the various dialog controls that are to be used in this
// test fixture.
bottomPanel = (Panel)dialog.Controls["bottomPanel"];
namesListBox = (ListBox)dialog.Controls["namesListBox"];
okButton = (Button)bottomPanel.Controls["okButton"];
cancelButton = (Button)bottomPanel.Controls["cancelButton"];
customNameTextBox = (TextBox)bottomPanel.Controls["customNameTextBox"];
customNameTextBoxLabel = (Label)bottomPanel.Controls["customNameTextBoxLabel"];
}
[TearDown]
public void TearDown()
{
dialog.Dispose();
}
[Test]
public void TwoNamesAddedToListBox()
{
Assert.AreEqual(2, namesListBox.Items.Count);
}
[Test]
public void NamesAddedToListBox()
{
Assert.Contains("Chimpanzee", namesListBox.Items);
Assert.Contains("Monkey", namesListBox.Items);
}
[Test]
public void OkButtonInitiallyDisabled()
{
Assert.IsFalse(okButton.Enabled);
}
[Test]
public void OkButtonIsDialogAcceptButton()
{
Assert.AreSame(okButton, dialog.AcceptButton);
}
[Test]
public void CancelButtonIsDialogCancelButton()
{
Assert.AreSame(cancelButton, dialog.CancelButton);
}
/// <summary>
/// The dialog's Names property should not return any items
/// when nothing is selected in the list box or added to the
/// custom name text box.
/// </summary>
[Test]
public void NoNamesInitiallySelected()
{
Assert.AreEqual(0, dialog.GetNames().Length);
}
[Test]
public void NamesSelectedAfterSelectingOneListBoxItem()
{
namesListBox.SelectedIndex = 0;
string[] expectedNames = new string[] {(string)namesListBox.Items[0]};
string[] names = dialog.GetNames();
Assert.AreEqual(expectedNames, names);
}
[Test]
public void NamesSelectedAfterSelectingTwoListBoxItems()
{
namesListBox.SelectedIndices.Add(0);
namesListBox.SelectedIndices.Add(1);
string[] expectedNames = new string[] {(string)namesListBox.Items[0], (string)namesListBox.Items[1]};
string[] names = dialog.GetNames();
Assert.AreEqual(expectedNames, names);
}
/// <summary>
/// Tests that the returned names from the dialog includes any
/// text in the custom name text box. Also check that the text box's
/// text is trimmed.
/// </summary>
[Test]
public void NamesSelectedAfterEnteringCustomName()
{
string customName = " customname ";
customNameTextBox.Text = customName;
string[] expectedNames = new string[] {customName.Trim()};
string[] names = dialog.GetNames();
Assert.AreEqual(expectedNames, names);
}
[Test]
public void OkButtonEnabledWhenListItemSelected()
{
namesListBox.SelectedIndex = 0;
dialog.CallNamesListBoxSelectedIndexChanged();
Assert.IsTrue(okButton.Enabled);
}
[Test]
public void OkButtonEnabledWhenCustomNameEntered()
{
customNameTextBox.Text = "Custom";
dialog.CallCustomNameTextBoxTextChanged();
Assert.IsTrue(okButton.Enabled);
}
/// <summary>
/// Tests that a custom name string that contains spaces does not
/// cause the OK button to be enabled.
/// </summary>
[Test]
public void OkButtonDisabledWhenEmptyCustomNameStringEntered()
{
customNameTextBox.Text = " ";
dialog.CallCustomNameTextBoxTextChanged();
Assert.IsFalse(okButton.Enabled);
}
[Test]
public void InvalidCustomNameEntered()
{
customNameTextBox.Text = "<element>";
dialog.CallCustomNameTextBoxTextChanged();
string error = dialog.GetError();
string expectedError = null;
try {
XmlConvert.VerifyName(customNameTextBox.Text);
Assert.Fail("XmlConvert.VerifyName should have failed.");
} catch (Exception ex) {
expectedError = ex.Message;
}
Assert.IsFalse(okButton.Enabled);
Assert.AreEqual(expectedError, error);
}
[Test]
public void CustomNameWithTwoColonCharsEntered()
{
customNameTextBox.Text = "xsl:test:this";
dialog.CallCustomNameTextBoxTextChanged();
string error = dialog.GetError();
Assert.IsFalse(okButton.Enabled);
Assert.IsTrue(error.Length > 0);
}
[Test]
public void CustomNameWithOneColonCharEntered()
{
customNameTextBox.Text = "xsl:test";
dialog.CallCustomNameTextBoxTextChanged();
string error = dialog.GetError();
Assert.IsTrue(okButton.Enabled);
Assert.AreEqual(0, error.Length);
}
[Test]
public void CustomNameWithOneColonCharAtStart()
{
customNameTextBox.Text = ":test";
dialog.CallCustomNameTextBoxTextChanged();
string error = dialog.GetError();
Assert.IsFalse(okButton.Enabled);
Assert.IsTrue(error.Length > 0);
}
[Test]
public void ErrorClearedAfterTextChanged()
{
InvalidCustomNameEntered();
customNameTextBox.Text = "element";
dialog.CallCustomNameTextBoxTextChanged();
Assert.IsTrue(okButton.Enabled);
Assert.AreEqual(0, dialog.GetError().Length);
}
[Test]
public void StartPositionIsCenterParent()
{
Assert.AreEqual(FormStartPosition.CenterParent, dialog.StartPosition);
}
[Test]
public void OkButtonDialogResult()
{
Assert.AreEqual(DialogResult.OK, okButton.DialogResult);
}
[Test]
public void CancelButtonDialogResult()
{
Assert.AreEqual(DialogResult.Cancel, cancelButton.DialogResult);
}
[Test]
public void ShowInTaskBar()
{
Assert.IsFalse(dialog.ShowInTaskbar);
}
[Test]
public void MinimizeBox()
{
Assert.IsFalse(dialog.MinimizeBox);
}
[Test]
public void MaximizeBox()
{
Assert.IsFalse(dialog.MaximizeBox);
}
[Test]
public void ShowIcon()
{
Assert.IsFalse(dialog.ShowIcon);
}
[Test]
public void SetCustomNameLabel()
{
dialog.CustomNameLabelText = "test";
Assert.AreEqual("test", dialog.CustomNameLabelText);
Assert.AreEqual("test", customNameTextBoxLabel.Text);
}
[Test]
public void RightToLeftConversion()
{
try {
PropertyService.Set("CoreProperties.UILanguage", RightToLeftConverter.RightToLeftLanguages[0]);
using (AddXmlNodeDialog dialog = new AddXmlNodeDialog()) {
Assert.AreEqual(RightToLeft.Yes, dialog.RightToLeft);
}
} finally {
PropertyService.Set("CoreProperties.UILanguage", Thread.CurrentThread.CurrentUICulture.Name);
}
}
/// <summary>
/// Check that the list box is not on the form when there are no
/// names passed to the constructor of AddXmlNodeDialog.
/// </summary>
[Test]
public void NoListBoxShownWhenNoNames()
{
using (AddXmlNodeDialog dialog = new AddXmlNodeDialog(new string[0])) {
Size expectedClientSize = this.bottomPanel.Size;
Size expectedMinSize = dialog.Size;
Panel bottomPanel = (Panel)dialog.Controls["bottomPanel"];
Assert.IsFalse(dialog.Controls.ContainsKey("namesListBox"));
Assert.AreEqual(DockStyle.Fill, bottomPanel.Dock);
Assert.AreEqual(expectedClientSize, dialog.ClientSize);
Assert.AreEqual(expectedMinSize, dialog.MinimumSize);
}
}
}
}

11
src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteTestFixture.cs
Unescape View File

@ -349,6 +349,17 @@ namespace XmlEditor.Tests.Tree
Assert.IsNull(bodyElement.SelectSingleNode("p")); Assert.IsNull(bodyElement.SelectSingleNode("p"));
} }
[Test]
public void CopyThenPasteToUnsupportedNode()
{
XmlNode node = editor.Document.CreateProcessingInstruction("a", "b");
mockXmlTreeView.SelectedNode = node;
editor.Copy();
mockXmlTreeView.SelectedElement = rootElement;
Assert.IsFalse(editor.IsPasteEnabled);
}
/// <summary> /// <summary>
/// Returns the xhtml strict schema as the default schema. /// Returns the xhtml strict schema as the default schema.
/// </summary> /// </summary>

30
src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewContainerTestFixture.cs
Unescape View File

@ -9,6 +9,7 @@ using System;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.XmlEditor; using ICSharpCode.XmlEditor;
using NUnit.Framework; using NUnit.Framework;
using XmlEditor.Tests.Utils; using XmlEditor.Tests.Utils;
@ -34,6 +35,15 @@ namespace XmlEditor.Tests.Tree
XmlElementTreeNode htmlTreeNode; XmlElementTreeNode htmlTreeNode;
XmlTextTreeNode textTreeNode; XmlTextTreeNode textTreeNode;
[TestFixtureSetUp]
public void SetUpFixture()
{
// Need to initialize the properties service.
if (!PropertyService.Initialized) {
PropertyService.InitializeService(String.Empty, String.Empty, String.Empty);
}
}
[SetUp] [SetUp]
public void Init() public void Init()
{ {
@ -410,6 +420,26 @@ namespace XmlEditor.Tests.Tree
Assert.IsNull(htmlTreeNode.XmlElement.SelectSingleNode("text()")); Assert.IsNull(htmlTreeNode.XmlElement.SelectSingleNode("text()"));
} }
[Test]
public void CreateAddAttributeDialog()
{
AddXmlNodeDialog dialog = (AddXmlNodeDialog)treeViewContainer.CallCreateAddAttributeDialog(new string[0]);
Panel bottomPanel = (Panel)dialog.Controls["bottomPanel"];
Label customNameTextBoxLabel = (Label)bottomPanel.Controls["customNameTextBoxLabel"];
Assert.AreEqual(StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.Title}"), dialog.Text);
Assert.AreEqual(StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.CustomAttributeLabel}"), customNameTextBoxLabel.Text);
}
[Test]
public void CreateAddElementeDialog()
{
AddXmlNodeDialog dialog = (AddXmlNodeDialog)treeViewContainer.CallCreateAddElementDialog(new string[0]);
Panel bottomPanel = (Panel)dialog.Controls["bottomPanel"];
Label customNameTextBoxLabel = (Label)bottomPanel.Controls["customNameTextBoxLabel"];
Assert.AreEqual(StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.Title}"), dialog.Text);
Assert.AreEqual(StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.CustomElementLabel}"), customNameTextBoxLabel.Text);
}
void TreeViewContainerDirtyChanged(object source, EventArgs e) void TreeViewContainerDirtyChanged(object source, EventArgs e)
{ {
dirtyChanged = true; dirtyChanged = true;

39
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedAddXmlNodeDialog.cs
Unescape View File

@ -0,0 +1,39 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using ICSharpCode.XmlEditor;
namespace XmlEditor.Tests.Utils
{
/// <summary>
/// Derived version of the AddXmlNodeDialog which allows us to test
/// various protected methods.
/// </summary>
public class DerivedAddXmlNodeDialog : AddXmlNodeDialog
{
public DerivedAddXmlNodeDialog(string[] names) : base(names)
{
}
/// <summary>
/// Calls the base class's NamesListBoxSelectedIndexChanged method.
/// </summary>
public void CallNamesListBoxSelectedIndexChanged()
{
base.NamesListBoxSelectedIndexChanged(this, new EventArgs());
}
/// <summary>
/// Calls the base class's CustomNameTextBoxTextChanged method.
/// </summary>
public void CallCustomNameTextBoxTextChanged()
{
base.CustomNameTextBoxTextChanged(this, new EventArgs());
}
}
}

32
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeViewContainerControl.cs
Unescape View File

@ -111,23 +111,39 @@ namespace XmlEditor.Tests.Utils
} }
/// <summary> /// <summary>
/// Returns a new MockAddElementDialog for testing. /// Calls the XmlTreeViewContainer's CreateAddAttributeDialog method.
/// </summary> /// </summary>
protected override IAddElementDialog CreateAddElementDialog(string[] elementNames) public IAddXmlNodeDialog CallCreateAddAttributeDialog(string[] names)
{ {
MockAddElementDialog dialog = new MockAddElementDialog(); return base.CreateAddAttributeDialog(names);
dialog.SetElementNamesToReturn(addElementDialogElementNamesReturned.ToArray()); }
/// <summary>
/// Calls the XmlTreeViewContainer's CreateAddElementDialog method.
/// </summary>
public IAddXmlNodeDialog CallCreateAddElementDialog(string[] names)
{
return base.CreateAddElementDialog(names);
}
/// <summary>
/// Returns a new MockAddXmlNodeDialog for testing.
/// </summary>
protected override IAddXmlNodeDialog CreateAddElementDialog(string[] elementNames)
{
MockAddXmlNodeDialog dialog = new MockAddXmlNodeDialog();
dialog.SetNamesToReturn(addElementDialogElementNamesReturned.ToArray());
dialog.SetDialogResult(addElementDialogResult); dialog.SetDialogResult(addElementDialogResult);
return dialog; return dialog;
} }
/// <summary> /// <summary>
/// Returns a new MockAddAttributeDialog for testing. /// Returns a new MockAddXmlNodeDialog for testing.
/// </summary> /// </summary>
protected override IAddAttributeDialog CreateAddAttributeDialog(string[] attributeNames) protected override IAddXmlNodeDialog CreateAddAttributeDialog(string[] attributeNames)
{ {
MockAddAttributeDialog dialog = new MockAddAttributeDialog(); MockAddXmlNodeDialog dialog = new MockAddXmlNodeDialog();
dialog.SetAttributeNamesToReturn(addAttributeDialogAttributeNamesReturned.ToArray()); dialog.SetNamesToReturn(addAttributeDialogAttributeNamesReturned.ToArray());
dialog.SetDialogResult(addAttributeDialogResult); dialog.SetDialogResult(addAttributeDialogResult);
return dialog; return dialog;
} }

65
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddAttributeDialog.cs
Unescape View File

@ -1,65 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.XmlEditor;
namespace XmlEditor.Tests.Utils
{
/// <summary>
/// Mocks the AddAttributeDialog so we can test the
/// XmlTreeViewContainerControl class when it displays
/// the AddAttributeDialog.
/// </summary>
public class MockAddAttributeDialog : IAddAttributeDialog
{
DialogResult dialogResult = DialogResult.OK;
List<string> attributeNames = new List<string>();
/// <summary>
/// Specifies the attribute names to return from the
/// IAddAttributeDialog.AttributeNames property.
/// </summary>
public void SetAttributeNamesToReturn(string[] names)
{
attributeNames.Clear();
foreach (string name in names) {
attributeNames.Add(name);
}
}
/// <summary>
/// Specifies the dialog result to return from the
/// IAddAttributeDialog.ShowDialog method.
/// </summary>
public void SetDialogResult(DialogResult result)
{
dialogResult = result;
}
#region IAddAttributeDialog implementation
public string[] AttributeNames {
get {
return attributeNames.ToArray();
}
}
public DialogResult ShowDialog()
{
return dialogResult;
}
public void Dispose()
{
}
#endregion
}
}

29
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddElementDialog.cs → src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddXmlNodeDialog.cs
Unescape View File

@ -13,42 +13,41 @@ using ICSharpCode.XmlEditor;
namespace XmlEditor.Tests.Utils namespace XmlEditor.Tests.Utils
{ {
/// <summary> /// <summary>
/// Mocks the AddElementDialog so we can test the /// Mocks the AddXmlNodeDialog so we can test the
/// XmlTreeViewContainerControl class when it displays /// XmlTreeViewContainerControl class when it displays
/// the AddElementDialog. /// the AddElementDialog or the AddAttributeDialog.
/// </summary> /// </summary>
public class MockAddElementDialog : IAddElementDialog public class MockAddXmlNodeDialog : IAddXmlNodeDialog
{ {
DialogResult dialogResult = DialogResult.OK; DialogResult dialogResult = DialogResult.OK;
List<string> elementNames = new List<string>(); List<string> names = new List<string>();
/// <summary> /// <summary>
/// Specifies the element names to return from the /// Specifies the names to return from the
/// IAddElementDialog.ElementNames property. /// IAddXmlNodeDialog.GetNames method.
/// </summary> /// </summary>
public void SetElementNamesToReturn(string[] names) public void SetNamesToReturn(string[] names)
{ {
elementNames.Clear(); this.names.Clear();
foreach (string name in names) { foreach (string name in names) {
elementNames.Add(name); this.names.Add(name);
} }
} }
/// <summary> /// <summary>
/// Specifies the dialog result to return from the /// Specifies the dialog result to return from the
/// IAddElementDialog.ShowDialog method. /// IAddXmlNodeDialog.ShowDialog method.
/// </summary> /// </summary>
public void SetDialogResult(DialogResult result) public void SetDialogResult(DialogResult result)
{ {
dialogResult = result; dialogResult = result;
} }
#region IAddElementDialog implementation #region IAddXmlNodeDialog implementation
public string[] ElementNames { public string[] GetNames()
get { {
return elementNames.ToArray(); return names.ToArray();
}
} }
public DialogResult ShowDialog() public DialogResult ShowDialog()

5
src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
Unescape View File

@ -72,6 +72,7 @@
<Compile Include="Schema\NestedChoiceTestFixture.cs" /> <Compile Include="Schema\NestedChoiceTestFixture.cs" />
<Compile Include="Schema\ChildElementAttributesTestFixture.cs" /> <Compile Include="Schema\ChildElementAttributesTestFixture.cs" />
<Compile Include="Tree\AddChildTextNodeTestFixture.cs" /> <Compile Include="Tree\AddChildTextNodeTestFixture.cs" />
<Compile Include="Tree\AddNewNodeDialogTestFixture.cs" />
<Compile Include="Tree\DeleteTreeNodeWithDeleteKeyTestFixture.cs" /> <Compile Include="Tree\DeleteTreeNodeWithDeleteKeyTestFixture.cs" />
<Compile Include="Tree\EditCommentNodesInTreeControlTestFixture.cs" /> <Compile Include="Tree\EditCommentNodesInTreeControlTestFixture.cs" />
<Compile Include="Tree\EditCommentNodesTestFixture.cs" /> <Compile Include="Tree\EditCommentNodesTestFixture.cs" />
@ -89,10 +90,10 @@
<Compile Include="Tree\XmlCommentTreeNodeTests.cs" /> <Compile Include="Tree\XmlCommentTreeNodeTests.cs" />
<Compile Include="Tree\XmlTreeViewClipboardHandlerTestFixture.cs" /> <Compile Include="Tree\XmlTreeViewClipboardHandlerTestFixture.cs" />
<Compile Include="Tree\XmlTreeViewContainerTestFixture.cs" /> <Compile Include="Tree\XmlTreeViewContainerTestFixture.cs" />
<Compile Include="Utils\DerivedAddXmlNodeDialog.cs" />
<Compile Include="Utils\DerivedXmlTreeView.cs" /> <Compile Include="Utils\DerivedXmlTreeView.cs" />
<Compile Include="Utils\DerivedXmlTreeViewContainerControl.cs" /> <Compile Include="Utils\DerivedXmlTreeViewContainerControl.cs" />
<Compile Include="Utils\MockAddAttributeDialog.cs" /> <Compile Include="Utils\MockAddXmlNodeDialog.cs" />
<Compile Include="Utils\MockAddElementDialog.cs" />
<Compile Include="Utils\ResourceManager.cs" /> <Compile Include="Utils\ResourceManager.cs" />
<Compile Include="Schema\XhtmlStrictSchemaTestFixture.cs" /> <Compile Include="Schema\XhtmlStrictSchemaTestFixture.cs" />
<Compile Include="Schema\XsdSchemaTestFixture.cs" /> <Compile Include="Schema\XsdSchemaTestFixture.cs" />

2
src/AddIns/DisplayBindings/XmlEditor/XmlEditor.sln
Unescape View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
# SharpDevelop 2.1.0.2147 # SharpDevelop 2.1.0.2169
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"

Write Preview
Loading…
Cancel
Save