diff --git a/src/Approvaltests-Tests/SimpleTest.class.st b/src/Approvaltests-Tests/SimpleTest.class.st index 576bf78..b8808bd 100644 --- a/src/Approvaltests-Tests/SimpleTest.class.st +++ b/src/Approvaltests-Tests/SimpleTest.class.st @@ -1,13 +1,22 @@ Class { #name : #SimpleTest, #superclass : #TestCase, + #classVars : [ + 'TestVerifyApproved' + ], #category : #'Approvaltests-Tests' } +{ #category : #'as yet unclassified' } +SimpleTest class >> _testVerify_Approved [ ^42 +] + { #category : #tests } SimpleTest >> test3Is3 [ -self assert: 3 equals: 3 + TestVerifyApproved := 10 atRandom. + +self assert: 3 equals: 3. ] { #category : #tests } @@ -15,5 +24,5 @@ SimpleTest >> testVerify [ "Approvals verify: 'Hello, world.'" - self assert: true. + Approvals verify: 'Hello, world.'. ] diff --git a/src/Approvaltests/ApprovalNamer.class.st b/src/Approvaltests/ApprovalNamer.class.st index 70ec44c..a99646b 100644 --- a/src/Approvaltests/ApprovalNamer.class.st +++ b/src/Approvaltests/ApprovalNamer.class.st @@ -4,7 +4,28 @@ Class { #category : #Approvaltests } -{ #category : #'as yet unclassified' } +{ #category : #accessing } +ApprovalNamer class >> findTestMethod: aContext [ + | aReceiver | + + aContext ifNil: [ ^nil ]. + + aReceiver := aContext receiver. + ^(aReceiver isKindOf: TestCase) + ifTrue:[ aReceiver ] + ifFalse:[self findTestMethod: aContext sender] + +] + +{ #category : #accessing } +ApprovalNamer class >> getApprovedText [ + | methodName sender | + sender := self findTestMethod: thisContext sender. + methodName := '_' , sender selector , '_Approved'. + ^ sender class perform: methodName asSymbol +] + +{ #category : #accessing } ApprovalNamer >> approvalName [ | className methodName testName sender| @@ -24,19 +45,6 @@ ApprovalNamer >> approvedFileName [ ^ sourceDirectory , '/Approvaltests-Tests/' , name , '.approved' ] -{ #category : #'as yet unclassified' } -ApprovalNamer >> findTestMethod: aContext [ - | aReceiver | - - aContext ifNil: [ ^nil ]. - - aReceiver := aContext receiver. - ^(aReceiver isKindOf: TestCase) - ifTrue:[ aReceiver ] - ifFalse:[self findTestMethod: aContext sender] - -] - { #category : #'as yet unclassified' } ApprovalNamer >> receivedFileName [ ] diff --git a/src/Approvaltests/Approvals.class.st b/src/Approvaltests/Approvals.class.st index c43dfab..d3ce14d 100644 --- a/src/Approvaltests/Approvals.class.st +++ b/src/Approvaltests/Approvals.class.st @@ -18,10 +18,10 @@ Approvals class >> verify: anObject index: anInteger [ ] -{ #category : #'as yet unclassified' } +{ #category : #accessing } Approvals class >> verify: anObject options: anOptions [ - self verify: anObject options: Options new. + self assert:anObject equals: ApprovalNamer getApprovedText. ]