From 651a4d550fec5f7da92abb017505bceddf881a25 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Mon, 19 Sep 2011 21:08:29 +0100 Subject: [PATCH] Do not display empty brackets after the model name when a model has no namespace. --- .../AspNet.Mvc/Project/Src/MvcModelClassViewModel.cs | 6 +++++- .../AspNet.Mvc/Test/Src/MvcModelClassViewModelTests.cs | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcModelClassViewModel.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcModelClassViewModel.cs index 3383bfc097..fbce7c30cc 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcModelClassViewModel.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcModelClassViewModel.cs @@ -19,7 +19,11 @@ namespace ICSharpCode.AspNet.Mvc void GetName() { - name = String.Format("{0} ({1})", mvcClass.Name, mvcClass.Namespace); + if (String.IsNullOrEmpty(mvcClass.Namespace)) { + name = mvcClass.Name; + } else { + name = String.Format("{0} ({1})", mvcClass.Name, mvcClass.Namespace); + } } public string Name { diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcModelClassViewModelTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcModelClassViewModelTests.cs index 882902f640..8e5076cf1b 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcModelClassViewModelTests.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcModelClassViewModelTests.cs @@ -52,5 +52,14 @@ namespace AspNet.Mvc.Tests Assert.AreEqual("ICSharpCode.Tests.MyClass", name); } + + [Test] + public void Name_ClassNameButHasEmptyNamespace_ReturnsClassNameOnly() + { + CreateViewModel(String.Empty, "MyClass"); + string text = viewModel.Name; + + Assert.AreEqual("MyClass", text); + } } }