From 8a60c95a36242ee6cbae36232599bed38e902ec9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 17:04:29 +1000
Subject: [PATCH] Fixes default weighting for Umbraco.Web handlers and adds
 unit test

---
 .../ApplicationEventsResolver.cs              | 14 +++++---
 .../ApplicationEventsResolverTests.cs         | 32 +++++++++++++++++++
 .../Resolvers/LazyManyObjectResolverTests.cs  |  6 ++--
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index eda1b94e37..20c49de588 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -89,16 +89,20 @@ namespace Umbraco.Core.ObjectResolution
 	        }
 	    }
 
-	    protected override int GetObjectWeight(object o)
-	    {
+        protected override int GetObjectWeight(object o) => GetObjectWeightInternal(o, DefaultPluginWeight);
+
+        internal static int GetObjectWeightInternal(object o, int defaultPluginWeight)
+        {
             var type = o.GetType();
             var attr = type.GetCustomAttribute<WeightAttribute>(true);
             if (attr != null) return attr.Weight;
             var name = type.Assembly.FullName;
 
             // we should really attribute all our Core handlers, so this is temp
-            var core = name.InvariantStartsWith("Umbraco.") || name.InvariantStartsWith("Concorde.");
-            return core ? -DefaultPluginWeight : DefaultPluginWeight;
+            var core = name.InvariantStartsWith("umbraco,") // This handles the umbraco.dll (Umbraco.Web) project
+                || name.InvariantStartsWith("Umbraco.")     // This handles all other Umbraco.* assemblies - in the case of v7, this is ONLY Umbraco.Core
+                || name.InvariantStartsWith("Concorde.");   // Special case for Cloud assemblies
+            return core ? -defaultPluginWeight : defaultPluginWeight;
         }
 
         /// <summary>
@@ -202,4 +206,4 @@ namespace Umbraco.Core.ObjectResolution
 	        _orderedAndFiltered = null;
 	    }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs b/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs
new file mode 100644
index 0000000000..3fba16fde3
--- /dev/null
+++ b/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using umbraco.BusinessLogic;
+using Umbraco.Core;
+using Umbraco.Core.Models.Identity;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Tests.Resolvers
+{
+    [TestFixture]
+    public class ApplicationEventsResolverTests
+    {
+        [Test]
+        public void Core_Event_Handler_Weight_Test()
+        {
+            //from the 'umbraco' (Umbraco.Web) assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new GridPropertyEditor(), 100));
+            //from the 'Umbraco.Core' assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new IdentityModelMappings(), 100));
+            //from the 'Umbraco.Test' assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new MyTestEventHandler(), 100));
+
+            //from the 'umbraco.BusinessLogic' assembly - which we are not checking for and not setting as the negative of the default
+            Assert.AreEqual(100, ApplicationEventsResolver.GetObjectWeightInternal(new ApplicationRegistrar(), 100));
+        }
+
+        private class MyTestEventHandler : ApplicationEventHandler
+        {
+
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
index 33bb1ab34c..841c302e52 100644
--- a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
@@ -10,7 +10,9 @@ using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Tests.Resolvers
 {
-	[TestFixture]
+
+
+    [TestFixture]
 	public class LazyManyObjectResolverTests
 	{
 
@@ -191,4 +193,4 @@ namespace Umbraco.Tests.Resolvers
 		
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index d45c556d37..4a67223b3a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -197,6 +197,7 @@
     <Compile Include="Packaging\PackageExtractionTests.cs" />
     <Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
     <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
+    <Compile Include="Resolvers\ApplicationEventsResolverTests.cs" />
     <Compile Include="Services\AuditServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />