Unit Test added to illustrate issue appsquickly#516

dani-gavrilov · Jul 8, 2016 · 3618cec · 3618cec
1 parent 4d4d69b
commit 3618cec
Show file tree

Hide file tree

Showing 7 changed files with 283 additions and 181 deletions.
diff --git a/.idea/Typhoon.iml b/.idea/Typhoon.iml
diff --git a/Tests/Factory/Assembly/TestAssemblies/CircularDependenciesAssembly.m b/Tests/Factory/Assembly/TestAssemblies/CircularDependenciesAssembly.m
@@ -161,4 +161,35 @@ - (id)incorrectPrototypeA
     }];
 }
 
+//-------------------------------------------------------------------------------------------
+#pragma mark -
+//-------------------------------------------------------------------------------------------
+
+- (id)propertyInjectionA
+{
+    return [TyphoonDefinition withClass:[PrototypePropertyInjected class] configuration:^(TyphoonDefinition *definition) {
+        [definition injectProperty:@selector(propertyB) with:[self propertyInjectionB]];
+        [definition injectProperty:@selector(propertyC) with:[self propertyInjectionC]];
+        definition.autoInjectionVisibility = TyphoonAutoInjectVisibilityNone;
+    }];
+}
+
+- (id)propertyInjectionB
+{
+    return [TyphoonDefinition withClass:[PrototypePropertyInjected class] configuration:^(TyphoonDefinition *definition) {
+        [definition injectProperty:@selector(propertyA) with:[self propertyInjectionA]];
+        [definition performAfterInjections:@selector(checkThatPropertyAHasPropertyBandC)];
+        definition.autoInjectionVisibility = TyphoonAutoInjectVisibilityNone;
+    }];
+}
+
+- (id)propertyInjectionC
+{
+    return [TyphoonDefinition withClass:[PrototypePropertyInjected class] configuration:^(TyphoonDefinition *definition) {
+        [definition injectProperty:@selector(propertyA) with:[self propertyInjectionA]];
+        [definition performAfterInjections:@selector(checkThatPropertyAHasPropertyBandC)];
+        definition.autoInjectionVisibility = TyphoonAutoInjectVisibilityNone;
+    }];
+}
+
 @end
diff --git a/Tests/Factory/Internal/TyphoonBlockComponentFactoryTests.m b/Tests/Factory/Internal/TyphoonBlockComponentFactoryTests.m
@@ -346,6 +346,14 @@ - (void)test_initializer_injected_component_is_correctly_resolved_in_circular_de
     XCTAssertNotEqual(propertyInjected.prototypeInitInjected, initializerInjected);
 }
 
+//-------------------------------------------------------------------------------------------
+#pragma mark - Circular dependencies with "afterInjections" hook
+
+- (void)test_after_injections_called_after_parents_injections
+{
+    XCTAssertNoThrow([_circularDependenciesFactory componentForKey:@"propertyInjectionA"]);
+}
+
 //-------------------------------------------------------------------------------------------
 #pragma mark - Currently Resolving Overwriting Problem
 

diff --git a/Tests/Model/CircularDependencies/PrototypePropertyInjected.h b/Tests/Model/CircularDependencies/PrototypePropertyInjected.h
@@ -17,4 +17,10 @@
 
 @property(nonatomic, strong) PrototypeInitInjected *prototypeInitInjected;
 
+@property (nonatomic, strong) PrototypePropertyInjected *propertyA;
+@property (nonatomic, strong) PrototypePropertyInjected *propertyB;
+@property (nonatomic, strong) PrototypePropertyInjected *propertyC;
+
+- (void)checkThatPropertyAHasPropertyBandC;
+
 @end
diff --git a/Tests/Model/CircularDependencies/PrototypePropertyInjected.m b/Tests/Model/CircularDependencies/PrototypePropertyInjected.m
@@ -6,8 +6,23 @@
 //
 //
 
+#import <XCTest/XCTest.h>
 #import "PrototypePropertyInjected.h"
 
 @implementation PrototypePropertyInjected
 
+
+- (void)checkThatPropertyAHasPropertyBandC
+{
+    if (!self.propertyA) {
+        [NSException raise:@"self.propertyA" format:@"self.propertyA is nil"];
+    }
+    if (!self.propertyA.propertyB) {
+        [NSException raise:@"self.propertyA.propertyB" format:@"self.propertyA.propertyB is nil"];
+    }
+    if (!self.propertyA.propertyC) {
+        [NSException raise:@"self.propertyA.propertyC" format:@"self.propertyA.propertyC is nil"];
+    }
+}
+
 @end
diff --git a/Tests/iOS/Storyboard/StoryboardWithReference/StoryboardWithReference.storyboard b/Tests/iOS/Storyboard/StoryboardWithReference/StoryboardWithReference.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="lYN-QZ-pxc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="lYN-QZ-pxc">
     <dependencies>
         <deployment version="2352" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

diff --git a/Typhoon.xcodeproj/project.xcworkspace/xcshareddata/Typhoon.xcscmblueprint b/Typhoon.xcodeproj/project.xcworkspace/xcshareddata/Typhoon.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9ABF21FB50867E6B13DCE6529AF3CCB1C77A9BA7",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "9ABF21FB50867E6B13DCE6529AF3CCB1C77A9BA7" : 0,
+    "45817BB3B2565CD583A7A6CD4B8797D002759C1C" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "96625EC7-C046-4FF3-9517-9651BEF51528",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "9ABF21FB50867E6B13DCE6529AF3CCB1C77A9BA7" : "Typhoon\/",
+    "45817BB3B2565CD583A7A6CD4B8797D002759C1C" : "Typhoon\/Source\/Vendor\/OCLogTemplate\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Typhoon",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Typhoon.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/typhoon-framework\/OCLogTemplate.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "45817BB3B2565CD583A7A6CD4B8797D002759C1C"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:typhoon-framework\/Typhoon.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9ABF21FB50867E6B13DCE6529AF3CCB1C77A9BA7"
+    }
+  ]
+}