Merge pull request appsquickly#16 from BrynCooke/master

Fix bug in injectProperties when dealing with subclassing
BrynCooke · May 9, 2013 · 63297c4 · 63297c4
2 parents f07c821 + 8b27b5f
commit 63297c4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Source/Factory/TyphoonComponentFactory.m b/Source/Factory/TyphoonComponentFactory.m
@@ -168,7 +168,7 @@ - (void)injectProperties:(id)instance {
     Class class = [instance class];
     for (TyphoonDefinition* definition in _registry)
     {
-        if(definition.type == class || [definition.type isSubclassOfClass:class])
+        if(definition.type == class || [class isSubclassOfClass:definition.type])
         {
             [self injectPropertyDependenciesOn:instance withDefinition:definition];
         }

diff --git a/Tests/Factory/TyphoonComponentFactoryTests.m b/Tests/Factory/TyphoonComponentFactoryTests.m
@@ -221,4 +221,30 @@ - (void)test_injectProperties
 
 }
 
+- (void)test_injectProperties_subclassing
+{
+    [_componentFactory register:[TyphoonDefinition withClass:[Knight class] properties:^(TyphoonDefinition* definition)
+                                 {
+                                     [definition injectProperty:@selector(quest)];
+                                 }]];
+    [_componentFactory register:[TyphoonDefinition withClass:[CavalryMan class] properties:^(TyphoonDefinition* definition)
+                                 {
+                                     [definition injectProperty:@selector(hitRatio) withValueAsText:@"3.0"];
+                                 }]];
+    [_componentFactory register:[TyphoonDefinition withClass:[CampaignQuest class] key:@"quest"]];
+
+    CavalryMan* cavelryMan = [[CavalryMan alloc] init];
+    [_componentFactory injectProperties:cavelryMan];
+
+    assertThat(cavelryMan.quest, notNilValue());
+    assertThatFloat(cavelryMan.hitRatio, equalToFloat(3.0f));
+
+    Knight* knight = [[Knight alloc] init];
+    [_componentFactory injectProperties:knight];
+
+    assertThat(knight.quest, notNilValue());
+
+}
+
+
 @end