Browse Source

Fixed compilation errors and test failures in WixBinding.Tests after the DropDownEditor was moved to the SharpDevelop widgets project.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2025 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
commit
633ace62b1
  1. 0
      src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/WixDropDownEditor.cs
  2. 2
      src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
  3. 3
      src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs
  4. 5
      src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs
  5. 1
      src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs
  6. 8
      src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
  7. 8
      src/AddIns/BackendBindings/WixBinding/WixBinding.sln

0
src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/DropDownEditor.cs → src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/WixDropDownEditor.cs

2
src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@ -141,7 +141,7 @@
<Compile Include="Src\PropertyGrid\GuidEditor.cs" /> <Compile Include="Src\PropertyGrid\GuidEditor.cs" />
<Compile Include="Src\PropertyGrid\GuidEditorListBox.cs" /> <Compile Include="Src\PropertyGrid\GuidEditorListBox.cs" />
<Compile Include="Src\PropertyGrid\RelativeFileNameEditor.cs" /> <Compile Include="Src\PropertyGrid\RelativeFileNameEditor.cs" />
<Compile Include="Src\PropertyGrid\DropDownEditor.cs" /> <Compile Include="Src\PropertyGrid\WixDropDownEditor.cs" />
<Compile Include="Src\WixPackageFilesDiff.cs" /> <Compile Include="Src\WixPackageFilesDiff.cs" />
<Compile Include="Src\WixPackageFilesDiffResult.cs" /> <Compile Include="Src\WixPackageFilesDiffResult.cs" />
<Compile Include="Src\DirectoryReader.cs" /> <Compile Include="Src\DirectoryReader.cs" />

3
src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs

@ -5,6 +5,7 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
using ICSharpCode.WixBinding; using ICSharpCode.WixBinding;
using NUnit.Framework; using NUnit.Framework;
using System; using System;
@ -42,7 +43,7 @@ namespace WixBinding.Tests.PropertyGrid
[Test] [Test]
public void EditorAttributeTypeName() public void EditorAttributeTypeName()
{ {
Assert.AreEqual(typeof(DropDownEditor).AssemblyQualifiedName, editorAttribute.EditorTypeName); Assert.AreEqual(typeof(WixDropDownEditor).AssemblyQualifiedName, editorAttribute.EditorTypeName);
} }
} }
} }

5
src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs

@ -6,6 +6,7 @@
// </file> // </file>
using ICSharpCode.WixBinding; using ICSharpCode.WixBinding;
using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
using NUnit.Framework; using NUnit.Framework;
using System; using System;
using System.Drawing.Design; using System.Drawing.Design;
@ -18,7 +19,7 @@ namespace WixBinding.Tests.PropertyGrid
[TestFixture] [TestFixture]
public class DropDownTypeEditorTestFixture public class DropDownTypeEditorTestFixture
{ {
DropDownEditor editor; WixDropDownEditor editor;
object newValue; object newValue;
string expectedNewValue; string expectedNewValue;
MockServiceProvider mockServiceProvider; MockServiceProvider mockServiceProvider;
@ -28,7 +29,7 @@ namespace WixBinding.Tests.PropertyGrid
[TestFixtureSetUp] [TestFixtureSetUp]
public void SetUpFixture() public void SetUpFixture()
{ {
editor = new DropDownEditor(); editor = new WixDropDownEditor();
// Edit the value. // Edit the value.
mockServiceProvider = new MockServiceProvider(); mockServiceProvider = new MockServiceProvider();

1
src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs

@ -5,6 +5,7 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
using ICSharpCode.WixBinding; using ICSharpCode.WixBinding;
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;

8
src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj

@ -289,6 +289,14 @@
<Folder Include="PropertyGrid" /> <Folder Include="PropertyGrid" />
<Folder Include="DirectoryImport" /> <Folder Include="DirectoryImport" />
<Folder Include="Diff" /> <Folder Include="Diff" />
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
</ProjectReference>
<Content Include="..\..\..\..\..\bin\ICSharpCode.SharpDevelop.Widgets.dll">
<Link>ICSharpCode.SharpDevelop.Widgets.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project> </Project>

8
src/AddIns/BackendBindings/WixBinding/WixBinding.sln

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1697 # SharpDevelop 2.1.0.1856
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Do
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -74,5 +76,9 @@ Global
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU
{8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

Loading…
Cancel
Save