From ddd341b42b63d81cebff462c6d86cb7f05e8e727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 10 Aug 2012 09:43:58 +0200 Subject: [PATCH] [CodeActions] Fixed bug in create backing store. --- .../CodeActions/CreateBackingStoreAction.cs | 2 + .../CodeActions/CreateBackingStoreTests.cs | 77 +++++++++++++++++++ .../ICSharpCode.NRefactory.Tests.csproj | 1 + 3 files changed, 80 insertions(+) create mode 100644 ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs index 9d90ba3380..1c83f09586 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs @@ -46,6 +46,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring // create field var backingStore = new FieldDeclaration (); + if (property.Modifiers.HasFlag (Modifiers.Static)) + backingStore.Modifiers |= Modifiers.Static; backingStore.ReturnType = property.ReturnType.Clone (); var initializer = new VariableInitializer (backingStoreName); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs new file mode 100644 index 0000000000..9a0bb3fc39 --- /dev/null +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs @@ -0,0 +1,77 @@ +// +// CreateBackingStoreTests.cs +// +// Author: +// Mike Krüger +// +// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using NUnit.Framework; +using ICSharpCode.NRefactory.CSharp.Refactoring; +using System.Text; + +namespace ICSharpCode.NRefactory.CSharp.CodeActions +{ + [TestFixture] + public class CreateBackingStoreTests : ContextActionTestBase + { + [Test()] + public void TestSimpleStore () + { + Test (@"class TestClass +{ + string $Test { get; set; } +}", @"class TestClass +{ + string test; + string Test { + get { + return test; + } + set { + test = value; + } + } +}"); + } + + [Test()] + public void TestStaticStore () + { + Test (@"class TestClass +{ + public static string $Test { get; set; } +}", @"class TestClass +{ + static string test; + public static string Test { + get { + return test; + } + set { + test = value; + } + } +}"); + } + } +} + diff --git a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj index 2bd1636f38..1dfae72049 100644 --- a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj +++ b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj @@ -272,6 +272,7 @@ +