Merge pull request #18 from dionisiydk/dev

Object sender spec fix

Mocketry-Domain-Tests.package/MockAcceptanceTests.class/instance/testValidationThatObjectIsResultOfDeepMessageSendWhichWasAlsoReturnedFromSender.st

@@ -0,0 +1,11 @@
+tests
+testValidationThatObjectIsResultOfDeepMessageSendWhichWasAlsoReturnedFromSender
+
+	| result rect |
+	rect := 0@0 corner: mock.
+	rect stub.
+
+	result := rect right.
+
+	result should beReturnedFrom: [mock x].
+	result should beReturnedFrom: [rect right].

Mocketry-Domain-Tests.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: 'Mocketry-Domain-Tests'!
+SystemOrganization addCategory: #'Mocketry-Domain-Tests'!

Mocketry-Specs-Tests.package/SpecOfExpectedObjectSenderTests.class/instance/testMatchesMultipleSenders.st

@@ -0,0 +1,13 @@
+tests
+testMatchesMultipleSenders
+
+	| spec expectedSenderMessage anotherSenderMessage |
+	spec := SpecOfExpectedObjectSender for: #object returnedFrom: (
+		SpecOfExpectedMessage from: (MockOccurredMessage receiver: #receiver selector: #selector)).
+
+	expectedSenderMessage := MockOccurredMessage receiver: #receiver selector: #selector.
+	expectedSenderMessage result: #object asOccurredMessageResult.
+	anotherSenderMessage := MockOccurredMessage receiver: #receiver selector: #anotherSelector.	
+	anotherSenderMessage result: #object asOccurredMessageResult.
+
+	spec should be matches: {anotherSenderMessage. expectedSenderMessage}

Mocketry-Specs-Tests.package/SpecOfExpectedObjectSenderTests.class/instance/testSucceedValidationOfMultipleSenders.st

@@ -0,0 +1,15 @@
+tests
+testSucceedValidationOfMultipleSenders
+
+	| spec result expectedSenderMessage anotherSenderMessage |
+	spec := SpecOfExpectedObjectSender for: #object returnedFrom: (
+		SpecOfExpectedMessage from: (MockOccurredMessage receiver: #receiver selector: #selector)).
+
+	expectedSenderMessage := MockOccurredMessage receiver: #receiver selector: #selector.
+	expectedSenderMessage result: #object asOccurredMessageResult.
+	anotherSenderMessage := MockOccurredMessage receiver: #receiver selector: #anotherSelector.	
+	anotherSenderMessage result: #object asOccurredMessageResult.
+
+	result := spec validate: { anotherSenderMessage. expectedSenderMessage }.
+
+	result should be: SpecOfValidationResult success

Mocketry-Specs-Tests.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: 'Mocketry-Specs-Tests'!
+SystemOrganization addCategory: #'Mocketry-Specs-Tests'!

Mocketry-Specs.package/SpecOfExpectedObjectSender.class/instance/basicMatches..st

@@ -1,9 +1,7 @@
 testing
 basicMatches: occurredMessages
 
-	| actualSender |
-	actualSender := occurredMessages 
-		detect: [:each | each hasReturnedValueLike: object]
-		ifNone: [^false].
+	| actualSenders |
+	actualSenders := occurredMessages select: [:each | each hasReturnedValueLike: object].
 
-	^requiredSender basicMatches: { actualSender }
+	^requiredSender basicMatches: actualSenders

Mocketry-Specs.package/SpecOfExpectedObjectSender.class/instance/validate..st

@@ -1,11 +1,10 @@
 validation
 validate: occurredMessages
-	| actualSender success |
-	actualSender := occurredMessages
-		detect: [ :each | each hasReturnedValueLike: object ]
-		ifNone: [ ^ self validateRequiredSenderFor: occurredMessages ].
-
-	success := requiredSender matches: {actualSender}.
+	| actualSenders success |
+	actualSenders := occurredMessages	select: [ :each | each hasReturnedValueLike: object ].
+	actualSenders ifEmpty: [ ^ self validateRequiredSenderFor: occurredMessages ].
+
+	success := requiredSender matches: actualSenders.
 	success ifTrue: [ ^ SpecOfValidationResult success ].
 
-	^ SpecOfWrongObjectSender spec: self for: occurredMessages wrongSender: actualSender
+	^ SpecOfWrongObjectSender spec: self for: occurredMessages wrongSender: actualSenders last