Browse Source

Fixed build by using actual ToolStripMenuItem sizes in menustrip test.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3979 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 17 years ago
parent
commit
b3b1305b58
  1. 26
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs

26
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs

@ -22,6 +22,10 @@ namespace PythonBinding.Tests.Designer
public class GenerateMenuStripItemsFormTestFixture public class GenerateMenuStripItemsFormTestFixture
{ {
string generatedPythonCode; string generatedPythonCode;
Size fileMenuItemSize;
Size openMenuItemSize;
Size exitMenuItemSize;
Size editMenuItemSize;
[TestFixtureSetUp] [TestFixtureSetUp]
public void SetUpFixture() public void SetUpFixture()
@ -45,15 +49,12 @@ namespace PythonBinding.Tests.Designer
// Add menu strip items. // Add menu strip items.
ToolStripMenuItem fileMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "fileToolStripMenuItem"); ToolStripMenuItem fileMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "fileToolStripMenuItem");
fileMenuItem.Size = new Size(37, 20);
fileMenuItem.Text = "&File"; fileMenuItem.Text = "&File";
ToolStripMenuItem openMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "openToolStripMenuItem"); ToolStripMenuItem openMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "openToolStripMenuItem");
openMenuItem.Size = new Size(37, 20);
openMenuItem.Text = "&Open"; openMenuItem.Text = "&Open";
ToolStripMenuItem exitMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "exitToolStripMenuItem"); ToolStripMenuItem exitMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "exitToolStripMenuItem");
exitMenuItem.Size = new Size(37, 20);
exitMenuItem.Text = "E&xit"; exitMenuItem.Text = "E&xit";
fileMenuItem.DropDownItems.Add(openMenuItem); fileMenuItem.DropDownItems.Add(openMenuItem);
fileMenuItem.DropDownItems.Add(exitMenuItem); fileMenuItem.DropDownItems.Add(exitMenuItem);
@ -64,11 +65,15 @@ namespace PythonBinding.Tests.Designer
menuStrip.Items.Add(fileMenuItem); menuStrip.Items.Add(fileMenuItem);
ToolStripMenuItem editMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "editToolStripMenuItem"); ToolStripMenuItem editMenuItem = (ToolStripMenuItem)host.CreateComponent(typeof(ToolStripMenuItem), "editToolStripMenuItem");
editMenuItem.Size = new Size(39, 20);
editMenuItem.Text = "&Edit"; editMenuItem.Text = "&Edit";
menuStrip.Items.Add(editMenuItem); menuStrip.Items.Add(editMenuItem);
form.Controls.Add(menuStrip); form.Controls.Add(menuStrip);
fileMenuItemSize = fileMenuItem.Size;
openMenuItemSize = openMenuItem.Size;
exitMenuItemSize = exitMenuItem.Size;
editMenuItemSize = editMenuItem.Size;
PythonForm pythonForm = new PythonForm(" "); PythonForm pythonForm = new PythonForm(" ");
generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form); generatedPythonCode = pythonForm.GenerateInitializeComponentMethod(form);
@ -101,7 +106,7 @@ namespace PythonBinding.Tests.Designer
" # fileToolStripMenuItem\r\n" + " # fileToolStripMenuItem\r\n" +
" # \r\n" + " # \r\n" +
" self._fileToolStripMenuItem.Name = \"fileToolStripMenuItem\"\r\n" + " self._fileToolStripMenuItem.Name = \"fileToolStripMenuItem\"\r\n" +
" self._fileToolStripMenuItem.Size = System.Drawing.Size(37, 20)\r\n" + " self._fileToolStripMenuItem.Size = " + SizeToString(fileMenuItemSize) + "\r\n" +
" self._fileToolStripMenuItem.Text = \"&File\"\r\n" + " self._fileToolStripMenuItem.Text = \"&File\"\r\n" +
" self._fileToolStripMenuItem.DropDownItems.AddRange(System.Array[System.Windows.Forms.ToolStripItem](\r\n" + " self._fileToolStripMenuItem.DropDownItems.AddRange(System.Array[System.Windows.Forms.ToolStripItem](\r\n" +
" [self._openToolStripMenuItem,\r\n" + " [self._openToolStripMenuItem,\r\n" +
@ -110,19 +115,19 @@ namespace PythonBinding.Tests.Designer
" # openToolStripMenuItem\r\n" + " # openToolStripMenuItem\r\n" +
" # \r\n" + " # \r\n" +
" self._openToolStripMenuItem.Name = \"openToolStripMenuItem\"\r\n" + " self._openToolStripMenuItem.Name = \"openToolStripMenuItem\"\r\n" +
" self._openToolStripMenuItem.Size = System.Drawing.Size(37, 20)\r\n" + " self._openToolStripMenuItem.Size = " + SizeToString(openMenuItemSize) + "\r\n" +
" self._openToolStripMenuItem.Text = \"&Open\"\r\n" + " self._openToolStripMenuItem.Text = \"&Open\"\r\n" +
" # \r\n" + " # \r\n" +
" # exitToolStripMenuItem\r\n" + " # exitToolStripMenuItem\r\n" +
" # \r\n" + " # \r\n" +
" self._exitToolStripMenuItem.Name = \"exitToolStripMenuItem\"\r\n" + " self._exitToolStripMenuItem.Name = \"exitToolStripMenuItem\"\r\n" +
" self._exitToolStripMenuItem.Size = System.Drawing.Size(37, 20)\r\n" + " self._exitToolStripMenuItem.Size = " + SizeToString(exitMenuItemSize) + "\r\n" +
" self._exitToolStripMenuItem.Text = \"E&xit\"\r\n" + " self._exitToolStripMenuItem.Text = \"E&xit\"\r\n" +
" # \r\n" + " # \r\n" +
" # editToolStripMenuItem\r\n" + " # editToolStripMenuItem\r\n" +
" # \r\n" + " # \r\n" +
" self._editToolStripMenuItem.Name = \"editToolStripMenuItem\"\r\n" + " self._editToolStripMenuItem.Name = \"editToolStripMenuItem\"\r\n" +
" self._editToolStripMenuItem.Size = System.Drawing.Size(39, 20)\r\n" + " self._editToolStripMenuItem.Size = " + SizeToString(editMenuItemSize) + "\r\n" +
" self._editToolStripMenuItem.Text = \"&Edit\"\r\n" + " self._editToolStripMenuItem.Text = \"&Edit\"\r\n" +
" # \r\n" + " # \r\n" +
" # MainForm\r\n" + " # MainForm\r\n" +
@ -137,5 +142,10 @@ namespace PythonBinding.Tests.Designer
Assert.AreEqual(expectedCode, generatedPythonCode); Assert.AreEqual(expectedCode, generatedPythonCode);
} }
string SizeToString(Size size)
{
return PythonPropertyValueAssignment.ToString(size);
}
} }
} }

Loading…
Cancel
Save