Fixing too many instances + pre/post conditions validation order

Author: Nyan11

src/ExecutableRequirements-Tests/ExReqMockRequirements.class.st

@@ -79,8 +79,7 @@ ExReqMockRequirements >> testReq5 [
 		  title: 'A requirement can have a title';
 		  addVerification: [ :verify |
 			  verify
-				  addStepOnAST:
-					  ((ExReqMockRequirements methodNamed: #testReq5) ast)
+				  addStepOnAST: (ExReqMockRequirements methodNamed: #testReq5) ast
 				  withPostcondition: [ :obj :arguments :requirement |
 					  requirement title = 'A requirement can have a title' and: [
 							  obj title = 'A requirement can have a title' ] ] ];

src/ExecutableRequirements-Tests/ExReqRepositoryReportTest.class.st

@@ -37,7 +37,9 @@ ExReqRepositoryReportTest >> setUp [
 ExReqRepositoryReportTest >> tearDown [
 
 	super tearDown.
-	self report removeTracingPoints
+	self report removeTracingPoints.
+	self report closeReport.
+	repository := nil
 ]
 
 { #category : 'tests' }

src/ExecutableRequirements/ExReqAbstractReport.class.st

@@ -11,6 +11,11 @@ Class {
 	#tag : 'Model-Report'
 }
 
+{ #category : 'as yet unclassified' }
+ExReqAbstractReport >> closeReport [
+	self subReports do: #closeReport.
+]
+
 { #category : 'initialization' }
 ExReqAbstractReport >> initialize [
 

src/ExecutableRequirements/ExReqRepositoryReport.class.st

@@ -73,6 +73,14 @@ ExReqRepositoryReport >> associatedPackages [
 	^ self repository associatedPackages.
 ]
 
+{ #category : 'as yet unclassified' }
+ExReqRepositoryReport >> closeReport [
+
+	super closeReport.
+	repository := nil.
+	requirementReports := {  }
+]
+
 { #category : 'as yet unclassified' }
 ExReqRepositoryReport >> createTracingPoints [
 

src/ExecutableRequirements/ExReqRequirementReport.class.st

@@ -10,6 +10,14 @@ Class {
 	#tag : 'Model-Report'
 }
 
+{ #category : 'as yet unclassified' }
+ExReqRequirementReport >> closeReport [
+
+	super closeReport.
+	requirement := nil.
+	verificationReports := {  }
+]
+
 { #category : 'testing' }
 ExReqRequirementReport >> isRequirementReport [
 

src/ExecutableRequirements/ExReqStepReport.class.st

@@ -16,6 +16,22 @@ Class {
 	#tag : 'Model-Report'
 }
 
+{ #category : 'as yet unclassified' }
+ExReqStepReport >> announceValidity [
+
+	self repositoryReport annouceStepReportIsValid: self
+]
+
+{ #category : 'as yet unclassified' }
+ExReqStepReport >> closeReport [
+
+	super closeReport.
+	step := nil.
+	requirement := nil.
+	previousStepReport := nil.
+	nextStepReport := nil
+]
+
 { #category : 'accessing' }
 ExReqStepReport >> hasNextStepReport [
 
@@ -94,13 +110,13 @@ ExReqStepReport >> numberOfSteps: anObject [
 { #category : 'as yet unclassified' }
 ExReqStepReport >> postconditionIsValid [
 
-	^ postconditionValidity
+	^ postconditionValidity or: [ self hasPostcondition not ]
 ]
 
 { #category : 'as yet unclassified' }
 ExReqStepReport >> preconditionIsValid [
 
-	^ preconditionValidity
+	^ preconditionValidity or: [ self hasPrecondition not ]
 ]
 
 { #category : 'accessing' }
@@ -166,44 +182,39 @@ ExReqStepReport >> verifyStepPostconditionWithContext: aContext [
 	3 - Postcondition not nil -> evaluation
 	"
 
-	self postconditionIsValid ifTrue: [ ^ self ].
+	postconditionValidity ifTrue: [ ^ self ].
 	self preconditionIsValid ifFalse: [ ^ self ].
 	self step postcondition ifNil: [
 		postconditionValidity := true.
+		self announceValidity.
 		^ self ].
-	preconditionValidity := postconditionValidity := self step
-		                                                 postcondition
-		                                                 valueWithEnoughArguments:
-			                                                 {
-				                                                 aContext receiver.
-				                                                 aContext
-					                                                 arguments.
-				                                                 self requirement }.
-	self isValid ifTrue: [
-		self repositoryReport annouceStepReportIsValid: self ]
+	postconditionValidity := self hasPostcondition
+		                         ifTrue: [
+			                         self step postcondition
+				                         valueWithEnoughArguments: {
+						                         aContext receiver.
+						                         aContext arguments.
+						                         self requirement } ]
+		                         ifFalse: [ true ].
+
+	self isValid ifTrue: [ self announceValidity ]
 ]
 
 { #category : 'as yet unclassified' }
 ExReqStepReport >> verifyStepPreconditionWithContext: aContext [
-	"
-	0 - Precondition ok -> ok
-	1 - Previous step valid
-	2 - Precondition =  nil -> true
-	3 - Precondition not nil -> evaluation
-	"
-	self preconditionIsValid ifTrue: [ ^ self ].
+
+	preconditionValidity ifTrue: [ ^ self ].
 	self isPreviousStepValid ifFalse: [
 		preconditionValidity := false.
 		postconditionValidity := false.
 		^ self ].
-
-	self step precondition ifNil: [
-		preconditionValidity := true.
-		^ self ].
-
-	preconditionValidity := self step precondition
-		                        valueWithEnoughArguments: {
-				                        aContext receiver.
-				                        aContext arguments.
-				                        self requirement }
+	preconditionValidity := self hasPrecondition
+		                        ifTrue: [
+			                        self step precondition
+				                        valueWithEnoughArguments: {
+						                        aContext receiver.
+						                        aContext arguments.
+						                        self requirement } ]
+		                        ifFalse: [ true ].
+	self isValid ifTrue: [ self announceValidity ].
 ]

src/ExecutableRequirements/ExReqTracingPoint.class.st

@@ -19,6 +19,13 @@ ExReqTracingPoint class >> all [
 	^ TracingPoints ifNil: [ TracingPoints := Set new ]
 ]
 
+{ #category : 'removing' }
+ExReqTracingPoint class >> remove: aDebugPoint [
+
+	self all remove: aDebugPoint ifAbsent: [  ].
+	DebugPoint all remove: aDebugPoint ifAbsent: [  ].
+]
+
 { #category : 'accessing' }
 ExReqTracingPoint >> bePostcondition [
 
@@ -110,11 +117,11 @@ ExReqTracingPoint >> remove [
 
 	| method |
 	super remove.
-	method := self target node methodNode compiledMethod.
+	"method := self target node methodNode compiledMethod.
 	method methodClass
 		compile: method sourceCode
 		classified: method protocolName
-		notifying: nil
+		notifying: nil"
 ]
 
 { #category : 'accessing' }

src/ExecutableRequirements/ExReqVerificationReport.class.st

@@ -11,6 +11,15 @@ Class {
 	#tag : 'Model-Report'
 }
 
+{ #category : 'as yet unclassified' }
+ExReqVerificationReport >> closeReport [
+
+	super closeReport.
+	requirement := nil.
+	verification := nil.
+	stepReports := {  }
+]
+
 { #category : 'testing' }
 ExReqVerificationReport >> isValid [