fix tests

Author: jaredcnance

Diff for: src/JsonApiDotNetCore/Builders/ContextGraphBuilder.cs

@@ -174,20 +174,27 @@ public IContextGraphBuilder AddDbContext<T>() where T : DbContext
                     var (isJsonApiResource, idType) = GetIdType(entityType);
 
                     if (isJsonApiResource)
-                        _entities.Add(GetEntity(GetResourceName(property), entityType, idType));
+                        _entities.Add(GetEntity(GetResourceName(property, entityType), entityType, idType));
                 }
             }
 
             return this;
         }
 
-        private string GetResourceName(PropertyInfo property)
+        private string GetResourceName(PropertyInfo property, Type resourceType)
         {
-            var resourceAttribute = property.GetCustomAttribute(typeof(ResourceAttribute));
-            if (resourceAttribute == null)
-                return property.Name.Dasherize();
-
-            return ((ResourceAttribute)resourceAttribute).ResourceName;
+            // check the class definition first
+            // [Resource("models"] public class Model : Identifiable { /* ... */ }
+            if (resourceType.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute classResourceAttribute)
+                return classResourceAttribute.ResourceName;
+
+            // check the DbContext member next
+            // [Resource("models")] public DbSet<Model> Models { get; set; }
+            if (property.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute resourceAttribute)
+                return resourceAttribute.ResourceName;
+
+            // fallback to dsherized...this should actually check for a custom IResourceNameFormatter
+            return property.Name.Dasherize();            
         }
 
         private (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)

Diff for: src/JsonApiDotNetCore/Graph/IResourceNameFormatter.cs

@@ -35,8 +35,7 @@ public string FormatResourceName(Type type)
         {
             try
             {
-                var attribute = type.GetCustomAttributes(typeof(ResourceAttribute)).SingleOrDefault() as ResourceAttribute;
-                if (attribute != null)
+                if (type.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute attribute)
                     return attribute.ResourceName;
 
                 return str.Dasherize(type.Name.Pluralize());

Diff for: src/JsonApiDotNetCore/Internal/ContextEntity.cs

@@ -9,7 +9,9 @@ public class ContextEntity
         /// <summary>
         /// The exposed resource name
         /// </summary>
-        public string EntityName { get; set; }
+        public string EntityName {
+            get;
+            set; }
 
         /// <summary>
         /// The data model type