- F reads approval from method

approvals · Jan 31, 2024 · 3767da9 · 3767da9
1 parent 217869e
commit 3767da9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 52 deletions.
diff --git a/src/Approvaltests-Tests/ApprovalNamerTest.class.st b/src/Approvaltests-Tests/ApprovalNamerTest.class.st
@@ -6,10 +6,7 @@ Class {
 
 { #category : #tests }
 ApprovalNamerTest >> testApprovedFile [
-	"a comment"
-	| namer approvedFileName |
-
-	namer := ApprovalNamer new.
-	approvedFileName := namer approvedFileName, '.txt'.
-	self assert: (File exists: approvedFileName).
+	| approvedFileName |
+	approvedFileName := ApprovalNamer approvalName.
+	self assert: approvedFileName equals: 'ApprovalNamerTest.testApprovedFile'
 ]
diff --git a/src/Approvaltests-Tests/RepositoryTest.class.st b/src/Approvaltests-Tests/RepositoryTest.class.st
@@ -3,21 +3,3 @@ Class {
 	#superclass : #TestCase,
 	#category : #'Approvaltests-Tests'
 }
-
-{ #category : #tests }
-RepositoryTest >> testAddingNonSmalltalkFiles [
-
-	| repo file  |
-	repo := IceRepository registry
-		        detect: [ :each |
-		        each name = 'ApprovalTests.pharo.StarterProject' ]
-		        ifNone: [ nil ].
-
-	file := ('src' , '/Approvaltests-Tests/'
-	         , 'ApprovalNamerTest.testApprovedFile.approved.txt')
-		        asFileReference.
-
-	repo addFileToIndex: file
-
-
-]
diff --git a/src/Approvaltests-Tests/SimpleTest.class.st b/src/Approvaltests-Tests/SimpleTest.class.st
@@ -7,16 +7,16 @@ Class {
 	#category : #'Approvaltests-Tests'
 }
 
-{ #category : #'as yet unclassified' }
-SimpleTest class >> _testVerify_Approved [ ^42
+{ #category : #accessing }
+SimpleTest class >> testVerify_Approved [ ^'Hello, world.'
 ]
 
 { #category : #tests }
 SimpleTest >> test3Is3 [
 
 	TestVerifyApproved := 10 atRandom.
 
-self assert: 3 equals: 4.
+self assert: 3 equals: 3.
 ]
 
 { #category : #tests }

diff --git a/src/Approvaltests/ApprovalNamer.class.st b/src/Approvaltests/ApprovalNamer.class.st
@@ -4,6 +4,17 @@ Class {
 	#category : #Approvaltests
 }
 
+{ #category : #accessing }
+ApprovalNamer class >> approvalName [
+	| className methodName testName sender|
+
+	sender := self findTestMethod: thisContext sender.
+	className :=  sender className.
+	methodName :=  sender selector.
+	testName := className , '.',  methodName .
+	^testName 
+]
+
 { #category : #accessing }
 ApprovalNamer class >> findTestMethod: aContext [
 	| aReceiver |
@@ -21,30 +32,6 @@ ApprovalNamer class >> findTestMethod: aContext [
 ApprovalNamer class >> getApprovedText [
 	| methodName sender |
 	sender := self findTestMethod: thisContext sender.
-	methodName := '_' , sender selector , '_Approved'.
+	methodName :=  sender selector , '_Approved'.
 	^ sender class perform: methodName asSymbol
 ]
-
-{ #category : #accessing }
-ApprovalNamer >> approvalName [
-	| className methodName testName sender|
-
-	sender := self findTestMethod: thisContext sender.
-	className :=  sender className.
-	methodName :=  sender selector.
-	testName := className , '.',  methodName .
-	^testName 
-]
-
-{ #category : #'as yet unclassified' }
-ApprovalNamer >> approvedFileName [
-
-	| name sourceDirectory |
-	name := self approvalName.
-	sourceDirectory := ApprovalTestsBridge sourceDirectory resolve pathString.
-	^ sourceDirectory , '/Approvaltests-Tests/' , name , '.approved'
-]
-
-{ #category : #'as yet unclassified' }
-ApprovalNamer >> receivedFileName [
-]