Finalizing merge and a bit of taste-related edits.

lars-erik · lars-erik · commit 94613ec98f15 · 2015-03-13T14:17:29.000+01:00
diff --git a/Umbraco.RelationEditor.Tests/ConfigSerializationTests.cs b/Umbraco.RelationEditor.Tests/ConfigSerializationTests.cs
@@ -15,7 +15,7 @@ namespace Umbraco.RelationEditor.Tests
     [TestFixture]
     public class ConfigSerializationTests
     {
-        private const string XmlToolTip = @"<RelationEditor BreadCrumbMode=""ToolTip"" BreadCrumbSeparator=""/"">
+        private const string XmlToolTip = @"<RelationEditor BreadcrumbMode=""ToolTip"" BreadcrumbSeparator=""/"">
   <ObjectType Alias=""page"" Name=""Document"">
     <EnabledRelation Alias=""pagePostRelation"">
       <EnabledChildType Alias=""post"" />
@@ -27,7 +27,7 @@ public class ConfigSerializationTests
   </ObjectType>
 </RelationEditor>";
 
-        private const string XmlCaption = @"<RelationEditor BreadCrumbMode=""Caption"" BreadCrumbSeparator=""-&gt;"">
+        private const string XmlCaption = @"<RelationEditor BreadcrumbMode=""Caption"" BreadcrumbSeparator=""-&gt;"">
   <ObjectType Alias=""page"" Name=""Document"">
     <EnabledRelation Alias=""pagePostRelation"">
       <EnabledChildType Alias=""post"" />
@@ -40,8 +40,8 @@ public class ConfigSerializationTests
 </RelationEditor>";
 
         private const string JsonToolTip = @"{
-  ""BreadCrumbMode"": ""ToolTip"",
-  ""BreadCrumbSeparator"": ""/"",
+  ""BreadcrumbMode"": ""ToolTip"",
+  ""BreadcrumbSeparator"": ""/"",
   ""ObjectTypes"": [
     {
       ""Name"": ""Document"",
@@ -75,8 +75,8 @@ public class ConfigSerializationTests
 }";
 
         private const string JsonCaption = @"{
-  ""BreadCrumbMode"": ""Caption"",
-  ""BreadCrumbSeparator"": ""->"",
+  ""BreadcrumbMode"": ""Caption"",
+  ""BreadcrumbSeparator"": ""->"",
   ""ObjectTypes"": [
     {
       ""Name"": ""Document"",
@@ -141,23 +141,23 @@ public void SerializeConfigurationAsJson()
         }
 
         [Test]
-        public void DeserializeBreadCrumbToolTipConfiguration()
+        public void DeserializeBreadcrumbToolTipConfiguration()
         {
-            var config = DeserializeFromBreadCrumbToolTipInput();
-            AssertBreadCrumbToolTipDeserialized(config);
+            var config = DeserializeFromBreadcrumbToolTipInput();
+            AssertBreadcrumbToolTipDeserialized(config);
         }
 
         [Test]
-        public void DeserializeBreadCrumbToolTipConfigurationFromJson()
+        public void DeserializeBreadcrumbToolTipConfigurationFromJson()
         {
             var config = JsonConvert.DeserializeObject<RelationEditorConfiguration>(JsonToolTip, new StringEnumConverter());
-            AssertBreadCrumbToolTipDeserialized(config);
+            AssertBreadcrumbToolTipDeserialized(config);
         }
 
         [Test]
-        public void SerializeBreadCrumbCaptionConfiguration()
+        public void SerializeBreadcrumbCaptionConfiguration()
         {
-            var config = CreateBreadCrumbCaptionConfig();
+            var config = CreateBreadcrumbCaptionConfig();
 
             var stringBuilder = new StringBuilder();
             var writer = new StringWriter(stringBuilder);
@@ -174,9 +174,9 @@ public void SerializeBreadCrumbCaptionConfiguration()
         }
 
         [Test]
-        public void SerializeBreadCrumbCaptionConfigurationAsJson()
+        public void SerializeBreadcrumbCaptionConfigurationAsJson()
         {
-            var config = CreateBreadCrumbCaptionConfig();
+            var config = CreateBreadcrumbCaptionConfig();
 
             var output = JsonConvert.SerializeObject(config, Formatting.Indented, new StringEnumConverter());
 
@@ -186,23 +186,23 @@ public void SerializeBreadCrumbCaptionConfigurationAsJson()
         }
 
         [Test]
-        public void DeserializeBreadCrumbCaptionConfiguration()
+        public void DeserializeBreadcrumbCaptionConfiguration()
         {
-            var config = DeserializeFromBreadCrumbCaptionInput();
-            AssertBreadCrumbCaptionDeserialized(config);
+            var config = DeserializeFromBreadcrumbCaptionInput();
+            AssertBreadcrumbCaptionDeserialized(config);
         }
 
         [Test]
-        public void DeserializeBreadCrumbCaptionConfigurationFromJson()
+        public void DeserializeBreadcrumbCaptionConfigurationFromJson()
         {
             var config = JsonConvert.DeserializeObject<RelationEditorConfiguration>(JsonCaption, new StringEnumConverter());
-            AssertBreadCrumbCaptionDeserialized(config);
+            AssertBreadcrumbCaptionDeserialized(config);
         }
 
         [Test]
         public void GetMethods()
         {
-            var config = DeserializeFromBreadCrumbToolTipInput();
+            var config = DeserializeFromBreadcrumbToolTipInput();
             Assert.IsFalse(config.Get(UmbracoObjectTypes.Member, "").Enabled);
             Assert.IsTrue(config.Get(UmbracoObjectTypes.Document, "page").Enabled);
             Assert.IsFalse(config.Get(UmbracoObjectTypes.Document, "page").Get("invalidRelation").Enabled);
@@ -223,27 +223,27 @@ private static void AssertDeserialized(RelationEditorConfiguration config)
             Assert.AreEqual(UmbracoObjectTypes.Document, config.ObjectTypes[1].Name);
         }
 
-        private static void AssertBreadCrumbCaptionDeserialized(RelationEditorConfiguration config)
+        private static void AssertBreadcrumbCaptionDeserialized(RelationEditorConfiguration config)
         {
             AssertDeserialized(config);
 
-            Assert.AreEqual("->", config.BreadCrumbSeparator);
-            Assert.AreEqual(config.BreadCrumbMode,BreadCrumbMode.Caption);
+            Assert.AreEqual("->", config.BreadcrumbSeparator);
+            Assert.AreEqual(BreadcrumbMode.Caption, config.BreadcrumbMode);
         }
 
-        private static void AssertBreadCrumbToolTipDeserialized(RelationEditorConfiguration config)
+        private static void AssertBreadcrumbToolTipDeserialized(RelationEditorConfiguration config)
         {
             AssertDeserialized(config);
 
-            Assert.AreEqual("/", config.BreadCrumbSeparator);
-            Assert.AreEqual(config.BreadCrumbMode, BreadCrumbMode.ToolTip);
+            Assert.AreEqual("/", config.BreadcrumbSeparator);
+            Assert.AreEqual(BreadcrumbMode.ToolTip, config.BreadcrumbMode);
         }
 
         private static RelationEditorConfiguration CreateToolTipConfig()
         {
             var config = new RelationEditorConfiguration
             {
-                BreadCrumbSeparator = "/",
+                BreadcrumbSeparator = "/",
                 ObjectTypes = new List<ObjectTypeConfiguration>
                 {
                     new ObjectTypeConfiguration
@@ -280,23 +280,23 @@ private static RelationEditorConfiguration CreateToolTipConfig()
             return config;
         }
 
-        private static RelationEditorConfiguration CreateBreadCrumbCaptionConfig()
+        private static RelationEditorConfiguration CreateBreadcrumbCaptionConfig()
         {
             var config = CreateToolTipConfig();
-            config.BreadCrumbMode = BreadCrumbMode.Caption;
-            config.BreadCrumbSeparator = "->";
+            config.BreadcrumbMode = BreadcrumbMode.Caption;
+            config.BreadcrumbSeparator = "->";
             return config;
         }
 
-        private static RelationEditorConfiguration DeserializeFromBreadCrumbToolTipInput()
+        private static RelationEditorConfiguration DeserializeFromBreadcrumbToolTipInput()
         {
             var serializer = new XmlSerializer(typeof(RelationEditorConfiguration));
             var reader = new StringReader(XmlToolTip);
             var config = (RelationEditorConfiguration)serializer.Deserialize(reader);
             return config;
         }
 
-        private static RelationEditorConfiguration DeserializeFromBreadCrumbCaptionInput()
+        private static RelationEditorConfiguration DeserializeFromBreadcrumbCaptionInput()
         {
             var serializer = new XmlSerializer(typeof(RelationEditorConfiguration));
             var reader = new StringReader(XmlCaption);
diff --git a/Umbraco.RelationEditor.Web/Web.config b/Umbraco.RelationEditor.Web/Web.config
@@ -35,7 +35,7 @@
       Umbraco web.config configuration documentation can be found here: 
       http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
       -->
-    <add key="umbracoConfigurationStatus" value="7.1.2" />
+    <add key="umbracoConfigurationStatus" value="7.1.3" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoPath" value="~/umbraco" />
@@ -117,6 +117,7 @@
     <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.5">
       <assemblies>
         <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+        <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       </assemblies>
       <buildProviders>
         <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
diff --git a/Umbraco.RelationEditor.Web/config/ClientDependency.config b/Umbraco.RelationEditor.Web/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="231021969" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="240058734" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/Umbraco.RelationEditor.Web/config/RelationEditor.config b/Umbraco.RelationEditor.Web/config/RelationEditor.config
@@ -1,19 +1,23 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
-<RelationEditor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ObjectType Alias="post" Name="Document">
-=======
-﻿<RelationEditor BreadCrumbMode="ToolTip" BreadCrumbSeparator="/">
-  <ObjectType Name="Document" Alias="page">
->>>>>>> pr/n5_vtml
+<RelationEditor xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" BreadcrumbMode="ToolTip" BreadcrumbSeparator="/">
+  <ObjectType Alias="Grandchildpage" Name="Document">
     <EnabledRelation Alias="documentRelation">
-      <EnabledChildType Alias="page" />
+      <EnabledChildType Alias="post" />
     </EnabledRelation>
   </ObjectType>
-  <ObjectType Alias="Grandchildpage" Name="Document">
+  <ObjectType Alias="Folder" Name="Media">
+    <EnabledRelation Alias="mediaDocument">
+      <EnabledChildType Alias="Grandchildpage" />
+    </EnabledRelation>
+    <EnabledRelation Alias="MediaToMedia">
+      <EnabledChildType Alias="Image" />
+    </EnabledRelation>
+  </ObjectType>
+  <ObjectType Alias="page" Name="Document">
     <EnabledRelation Alias="documentRelation">
-      <EnabledChildType Alias="post" />
+      <EnabledChildType Alias="page" />
     </EnabledRelation>
+    <EnabledRelation Alias="docToDocType" />
   </ObjectType>
   <ObjectType Alias="page" Name="Document">
     <EnabledRelation Alias="documentRelation">
@@ -25,13 +29,6 @@
       <EnabledChildType Alias="Image" />
       <EnabledChildType Alias="File" />
     </EnabledRelation>
-  </ObjectType>
-  <ObjectType Alias="Folder" Name="Media">
-    <EnabledRelation Alias="mediaDocument">
-      <EnabledChildType Alias="Grandchildpage" />
-    </EnabledRelation>
-    <EnabledRelation Alias="MediaToMedia">
-      <EnabledChildType Alias="Image" />
-    </EnabledRelation>
+    <EnabledRelation Alias="docToDocType" />
   </ObjectType>
 </RelationEditor>
diff --git a/Umbraco.RelationEditor.Web/config/relationeditor.sample.config b/Umbraco.RelationEditor.Web/config/relationeditor.sample.config
@@ -18,7 +18,7 @@ Supported relation types are
 * MediaType -> MediaType
 
 Document and Media have the option to display the entire path, with a separator
-<RelationEditor BreadCrumbMode="Caption" BreadCrumbSeparator="/">
+<RelationEditor BreadcrumbMode="Caption" BreadcrumbSeparator="/">
 The above resolves to something like
 Home / Site 1 / Page 1
 
@@ -40,7 +40,7 @@ If no enabled child types are enabled, all types will be selectable.
 Note: Names and aliases are case sensitive.
 
 Here's a sample configuration:
-<RelationEditor BreadCrumbMode="ToolTip" BreadCrumbSeparator="/">
+<RelationEditor BreadcrumbMode="ToolTip" BreadcrumbSeparator="/">
   <ObjectType Name="Document" Alias="page">
     <EnabledRelation Alias="documentRelation">
       <EnabledChildType Alias="post"/>
diff --git a/Umbraco.RelationEditor/Configuration.cs b/Umbraco.RelationEditor/Configuration.cs
@@ -5,6 +5,7 @@
 using System.Web;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using umbraco.controls;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -28,21 +29,13 @@ public virtual bool Enabled
     [XmlRoot("RelationEditor")]
     public class RelationEditorConfiguration
     {
-        [XmlIgnore]
-        [JsonIgnore]
-        public BreadCrumbMode BreadCrumbMode;
-
-        [XmlAttribute("BreadCrumbMode")]
-        [JsonProperty("BreadCrumbMode", NullValueHandling = NullValueHandling.Ignore)]
-        public string StrBreadCrumbMode
-        {
-            get { return BreadCrumbMode.ToString(); }
-            set { BreadCrumbMode = Enum.IsDefined(typeof(BreadCrumbMode), value) ? (BreadCrumbMode)Enum.Parse(typeof(BreadCrumbMode), value) : BreadCrumbMode.ToolTip; }
-        }
+        [XmlAttribute]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public BreadcrumbMode BreadcrumbMode;
 
         [XmlAttribute]
-        [JsonProperty("BreadCrumbSeparator", NullValueHandling = NullValueHandling.Ignore)]
-        public string BreadCrumbSeparator { get; set; }
+        [JsonProperty("BreadcrumbSeparator", NullValueHandling = NullValueHandling.Ignore)]
+        public string BreadcrumbSeparator { get; set; }
         
         [XmlElement("ObjectType")]
         public List<ObjectTypeConfiguration> ObjectTypes { get; set; }
@@ -69,7 +62,7 @@ public class ObjectTypeConfiguration : EntityConfiguration
         public UmbracoObjectTypes Name { get; set; }
         
         [XmlElement("EnabledRelation")]
-        [JsonProperty(Order = 5)]
+        [JsonProperty(Order = 3)]
         public List<EnabledRelationConfiguration> EnabledRelations { get; set; }
 
         public EnabledRelationConfiguration Get(string alias)
@@ -115,6 +108,7 @@ public class EnabledChildTypeConfiguration : EntityConfiguration
 
     public class Configuration
     {
+        private static readonly object LockObj = new object();
         private static RelationEditorConfiguration configuration = null;
 
         private static IEnumerable<ObjectTypeConfiguration> ObjectTypes
@@ -130,7 +124,7 @@ public static RelationEditorConfiguration Instance
             get
             {
                 EnsureConfiguration();
-                return configuration.ObjectTypes;
+                return configuration;
             }
         }
 
@@ -182,27 +176,30 @@ private static void EnsureConfiguration()
             lock (LockObj)
             {
                 if (configuration == null)
-            {
-                try
                 {
-                        var serializer = new XmlSerializer(typeof(RelationEditorConfiguration));
-                    using (var reader = new StreamReader(HttpContext.Current.Server.MapPath("~/config/RelationEditor.config")))
-                    { 
-                            configuration = (RelationEditorConfiguration)serializer.Deserialize(reader);
+                    try
+                    {
+                        var serializer = new XmlSerializer(typeof (RelationEditorConfiguration));
+                        using (
+                            var reader =
+                                new StreamReader(HttpContext.Current.Server.MapPath("~/config/RelationEditor.config")))
+                        {
+                            configuration = (RelationEditorConfiguration) serializer.Deserialize(reader);
+                        }
                     }
-                }
                     catch (Exception ex)
-                {
-                    LogHelper.Error<Configuration>("Could not read config/RelationEditor.config", ex);
-                    configuration = new RelationEditorConfiguration();
+                    {
+                        LogHelper.Error<Configuration>("Could not read config/RelationEditor.config", ex);
+                        configuration = new RelationEditorConfiguration();
+                    }
                 }
             }
         }
+    }
 
-    public enum BreadCrumbMode
+    public enum BreadcrumbMode
     {
         ToolTip,
         Caption
     }
 }
-}
diff --git a/Umbraco.RelationEditor/Controllers/RelationsController.cs b/Umbraco.RelationEditor/Controllers/RelationsController.cs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace Umbraco.RelationEditor.Tests`
`15`	`15`	`[TestFixture]`
`16`	`16`	`public class ConfigSerializationTests`
`17`	`17`	`{`
`18`		`- private const string XmlToolTip = @"<RelationEditor BreadCrumbMode=""ToolTip"" BreadCrumbSeparator=""/"">`
	`18`	`+ private const string XmlToolTip = @"<RelationEditor BreadcrumbMode=""ToolTip"" BreadcrumbSeparator=""/"">`
`19`	`19`	`<ObjectType Alias=""page"" Name=""Document"">`
`20`	`20`	`<EnabledRelation Alias=""pagePostRelation"">`
`21`	`21`	`<EnabledChildType Alias=""post"" />`
`@@ -27,7 +27,7 @@ public class ConfigSerializationTests`
`27`	`27`	`</ObjectType>`
`28`	`28`	`</RelationEditor>";`
`29`	`29`
`30`		`- private const string XmlCaption = @"<RelationEditor BreadCrumbMode=""Caption"" BreadCrumbSeparator=""->"">`
	`30`	`+ private const string XmlCaption = @"<RelationEditor BreadcrumbMode=""Caption"" BreadcrumbSeparator=""->"">`
`31`	`31`	`<ObjectType Alias=""page"" Name=""Document"">`
`32`	`32`	`<EnabledRelation Alias=""pagePostRelation"">`
`33`	`33`	`<EnabledChildType Alias=""post"" />`
`@@ -40,8 +40,8 @@ public class ConfigSerializationTests`
`40`	`40`	`</RelationEditor>";`
`41`	`41`
`42`	`42`	`private const string JsonToolTip = @"{`
`43`		`- ""BreadCrumbMode"": ""ToolTip"",`
`44`		`- ""BreadCrumbSeparator"": ""/"",`
	`43`	`+ ""BreadcrumbMode"": ""ToolTip"",`
	`44`	`+ ""BreadcrumbSeparator"": ""/"",`
`45`	`45`	`""ObjectTypes"": [`
`46`	`46`	`{`
`47`	`47`	`""Name"": ""Document"",`
`@@ -75,8 +75,8 @@ public class ConfigSerializationTests`
`75`	`75`	`}";`
`76`	`76`
`77`	`77`	`private const string JsonCaption = @"{`
`78`		`- ""BreadCrumbMode"": ""Caption"",`
`79`		`- ""BreadCrumbSeparator"": ""->"",`
	`78`	`+ ""BreadcrumbMode"": ""Caption"",`
	`79`	`+ ""BreadcrumbSeparator"": ""->"",`
`80`	`80`	`""ObjectTypes"": [`
`81`	`81`	`{`
`82`	`82`	`""Name"": ""Document"",`
`@@ -141,23 +141,23 @@ public void SerializeConfigurationAsJson()`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`[Test]`
`144`		`- public void DeserializeBreadCrumbToolTipConfiguration()`
	`144`	`+ public void DeserializeBreadcrumbToolTipConfiguration()`
`145`	`145`	`{`
`146`		`- var config = DeserializeFromBreadCrumbToolTipInput();`
`147`		`- AssertBreadCrumbToolTipDeserialized(config);`
	`146`	`+ var config = DeserializeFromBreadcrumbToolTipInput();`
	`147`	`+ AssertBreadcrumbToolTipDeserialized(config);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`[Test]`
`151`		`- public void DeserializeBreadCrumbToolTipConfigurationFromJson()`
	`151`	`+ public void DeserializeBreadcrumbToolTipConfigurationFromJson()`
`152`	`152`	`{`
`153`	`153`	`var config = JsonConvert.DeserializeObject<RelationEditorConfiguration>(JsonToolTip, new StringEnumConverter());`
`154`		`- AssertBreadCrumbToolTipDeserialized(config);`
	`154`	`+ AssertBreadcrumbToolTipDeserialized(config);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`[Test]`
`158`		`- public void SerializeBreadCrumbCaptionConfiguration()`
	`158`	`+ public void SerializeBreadcrumbCaptionConfiguration()`
`159`	`159`	`{`
`160`		`- var config = CreateBreadCrumbCaptionConfig();`
	`160`	`+ var config = CreateBreadcrumbCaptionConfig();`
`161`	`161`
`162`	`162`	`var stringBuilder = new StringBuilder();`
`163`	`163`	`var writer = new StringWriter(stringBuilder);`
`@@ -174,9 +174,9 @@ public void SerializeBreadCrumbCaptionConfiguration()`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`[Test]`
`177`		`- public void SerializeBreadCrumbCaptionConfigurationAsJson()`
	`177`	`+ public void SerializeBreadcrumbCaptionConfigurationAsJson()`
`178`	`178`	`{`
`179`		`- var config = CreateBreadCrumbCaptionConfig();`
	`179`	`+ var config = CreateBreadcrumbCaptionConfig();`
`180`	`180`
`181`	`181`	`var output = JsonConvert.SerializeObject(config, Formatting.Indented, new StringEnumConverter());`
`182`	`182`
`@@ -186,23 +186,23 @@ public void SerializeBreadCrumbCaptionConfigurationAsJson()`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`[Test]`
`189`		`- public void DeserializeBreadCrumbCaptionConfiguration()`
	`189`	`+ public void DeserializeBreadcrumbCaptionConfiguration()`
`190`	`190`	`{`
`191`		`- var config = DeserializeFromBreadCrumbCaptionInput();`
`192`		`- AssertBreadCrumbCaptionDeserialized(config);`
	`191`	`+ var config = DeserializeFromBreadcrumbCaptionInput();`
	`192`	`+ AssertBreadcrumbCaptionDeserialized(config);`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`[Test]`
`196`		`- public void DeserializeBreadCrumbCaptionConfigurationFromJson()`
	`196`	`+ public void DeserializeBreadcrumbCaptionConfigurationFromJson()`
`197`	`197`	`{`
`198`	`198`	`var config = JsonConvert.DeserializeObject<RelationEditorConfiguration>(JsonCaption, new StringEnumConverter());`
`199`		`- AssertBreadCrumbCaptionDeserialized(config);`
	`199`	`+ AssertBreadcrumbCaptionDeserialized(config);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`[Test]`
`203`	`203`	`public void GetMethods()`
`204`	`204`	`{`
`205`		`- var config = DeserializeFromBreadCrumbToolTipInput();`
	`205`	`+ var config = DeserializeFromBreadcrumbToolTipInput();`
`206`	`206`	`Assert.IsFalse(config.Get(UmbracoObjectTypes.Member, "").Enabled);`
`207`	`207`	`Assert.IsTrue(config.Get(UmbracoObjectTypes.Document, "page").Enabled);`
`208`	`208`	`Assert.IsFalse(config.Get(UmbracoObjectTypes.Document, "page").Get("invalidRelation").Enabled);`
`@@ -223,27 +223,27 @@ private static void AssertDeserialized(RelationEditorConfiguration config)`
`223`	`223`	`Assert.AreEqual(UmbracoObjectTypes.Document, config.ObjectTypes[1].Name);`
`224`	`224`	`}`
`225`	`225`
`226`		`- private static void AssertBreadCrumbCaptionDeserialized(RelationEditorConfiguration config)`
	`226`	`+ private static void AssertBreadcrumbCaptionDeserialized(RelationEditorConfiguration config)`
`227`	`227`	`{`
`228`	`228`	`AssertDeserialized(config);`
`229`	`229`
`230`		`- Assert.AreEqual("->", config.BreadCrumbSeparator);`
`231`		`- Assert.AreEqual(config.BreadCrumbMode,BreadCrumbMode.Caption);`
	`230`	`+ Assert.AreEqual("->", config.BreadcrumbSeparator);`
	`231`	`+ Assert.AreEqual(BreadcrumbMode.Caption, config.BreadcrumbMode);`
`232`	`232`	`}`
`233`	`233`
`234`		`- private static void AssertBreadCrumbToolTipDeserialized(RelationEditorConfiguration config)`
	`234`	`+ private static void AssertBreadcrumbToolTipDeserialized(RelationEditorConfiguration config)`
`235`	`235`	`{`
`236`	`236`	`AssertDeserialized(config);`
`237`	`237`
`238`		`- Assert.AreEqual("/", config.BreadCrumbSeparator);`
`239`		`- Assert.AreEqual(config.BreadCrumbMode, BreadCrumbMode.ToolTip);`
	`238`	`+ Assert.AreEqual("/", config.BreadcrumbSeparator);`
	`239`	`+ Assert.AreEqual(BreadcrumbMode.ToolTip, config.BreadcrumbMode);`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`private static RelationEditorConfiguration CreateToolTipConfig()`
`243`	`243`	`{`
`244`	`244`	`var config = new RelationEditorConfiguration`
`245`	`245`	`{`
`246`		`- BreadCrumbSeparator = "/",`
	`246`	`+ BreadcrumbSeparator = "/",`
`247`	`247`	`ObjectTypes = new List<ObjectTypeConfiguration>`
`248`	`248`	`{`
`249`	`249`	`new ObjectTypeConfiguration`
`@@ -280,23 +280,23 @@ private static RelationEditorConfiguration CreateToolTipConfig()`
`280`	`280`	`return config;`
`281`	`281`	`}`
`282`	`282`
`283`		`- private static RelationEditorConfiguration CreateBreadCrumbCaptionConfig()`
	`283`	`+ private static RelationEditorConfiguration CreateBreadcrumbCaptionConfig()`
`284`	`284`	`{`
`285`	`285`	`var config = CreateToolTipConfig();`
`286`		`- config.BreadCrumbMode = BreadCrumbMode.Caption;`
`287`		`- config.BreadCrumbSeparator = "->";`
	`286`	`+ config.BreadcrumbMode = BreadcrumbMode.Caption;`
	`287`	`+ config.BreadcrumbSeparator = "->";`
`288`	`288`	`return config;`
`289`	`289`	`}`
`290`	`290`
`291`		`- private static RelationEditorConfiguration DeserializeFromBreadCrumbToolTipInput()`
	`291`	`+ private static RelationEditorConfiguration DeserializeFromBreadcrumbToolTipInput()`
`292`	`292`	`{`
`293`	`293`	`var serializer = new XmlSerializer(typeof(RelationEditorConfiguration));`
`294`	`294`	`var reader = new StringReader(XmlToolTip);`
`295`	`295`	`var config = (RelationEditorConfiguration)serializer.Deserialize(reader);`
`296`	`296`	`return config;`
`297`	`297`	`}`
`298`	`298`
`299`		`- private static RelationEditorConfiguration DeserializeFromBreadCrumbCaptionInput()`
	`299`	`+ private static RelationEditorConfiguration DeserializeFromBreadcrumbCaptionInput()`
`300`	`300`	`{`
`301`	`301`	`var serializer = new XmlSerializer(typeof(RelationEditorConfiguration));`
`302`	`302`	`var reader = new StringReader(XmlCaption);`