Replace assert = in packages starting by R.

Replace: - assert: = by assert: equals: - deny = by deny: equals: - assert: == by assert: identicalTo: - deny: == by deny: identicalTo:
pharo-project · Nov 20, 2019 · 73477ed · 73477ed
1 parent d883cd3
commit 73477ed
Show file tree

Hide file tree

Showing 24 changed files with 607 additions and 593 deletions.
diff --git a/src/RPackage-Tests/RPackageIncrementalTest.class.st b/src/RPackage-Tests/RPackageIncrementalTest.class.st
@@ -685,27 +685,26 @@ RPackageIncrementalTest >> testMethodPackageResolution [
 	a1 := self createNewClassNamed: a1Name inPackage: p1.
 	a1 compileSilently: 'method ^ #methodDefinedInP2'.
 	a1 class compileSilently: 'method ^ #methodDefinedInP2'.
-	
-	p1 addMethod:  (a1>>#method).
-	p1 addMethod:  (a1 class>>#method).
-	
-	self assert: (a1 >> #method) package == p1.
-	self assert: (a1 class >> #method) package == p1.
+
+	p1 addMethod: a1 >> #method.
+	p1 addMethod: a1 class >> #method.
+
+	self assert: (a1 >> #method) package identicalTo: p1.
+	self assert: (a1 class >> #method) package identicalTo: p1
 ]
 
 { #category : #'test package belonging' }
 RPackageIncrementalTest >> testPackageOfClassForClassesNotDefinedInPackageButJustExtendingIt [
-	| p1 p2 a2  |
+	| p1 p2 a2 |
 	p1 := self createNewPackageNamed: 'P1'.
 	p2 := self createNewPackageNamed: 'P2'.
 
 	a2 := self createNewClassNamed: #A2InPackageP2 inPackage: p2.
 	a2 compileSilently: 'methodDefinedInP1 ^ #methodDefinedInP1'.
-	p1 addMethod: (a2>>#methodDefinedInP1).
-	
+	p1 addMethod: a2 >> #methodDefinedInP1.
+
 	self assert: a2 package equals: p2.
-	p1 extensionMethods do: 
-		[:each | self deny: each methodClass package = p1 ].
+	p1 extensionMethods do: [ :each | self deny: each methodClass package equals: p1 ]
 	"the package of a class which is extended inside a package p, is not p
 	but the package where the class was defined"
 ]

diff --git a/src/RPackage-Tests/RPackageReadOnlyCompleteSetupTest.class.st b/src/RPackage-Tests/RPackageReadOnlyCompleteSetupTest.class.st
@@ -251,16 +251,12 @@ RPackageReadOnlyCompleteSetupTest >> testExtensionMethods [
 	self assert: (extensionMethods includes: a2 class >> #classSideMethodDefinedInP3).
 	cpt := 0.
 	package
-		metaclassExtensionSlicesDo: [ :className :listOfSelectors | 
-			(className = a2 name and: [ listOfSelectors includes: #classSideMethodDefinedInP3 ])
-				ifTrue: [ cpt := cpt + 1 ] ].
+		metaclassExtensionSlicesDo: [ :className :listOfSelectors | (className = a2 name and: [ listOfSelectors includes: #classSideMethodDefinedInP3 ]) ifTrue: [ cpt := cpt + 1 ] ].
 	self assert: cpt equals: 1.
 	cpt := 0.
 	package
-		classExtensionSlicesDo: [ :className :listOfSelectors | 
-			(className = a2 name and: [ listOfSelectors includes: #methodDefinedInP3 ])
-				ifTrue: [ cpt := cpt + 1 ] ].
-	self assert: cpt = 1
+		classExtensionSlicesDo: [ :className :listOfSelectors | (className = a2 name and: [ listOfSelectors includes: #methodDefinedInP3 ]) ifTrue: [ cpt := cpt + 1 ] ].
+	self assert: cpt equals: 1
 ]
 
 { #category : #'test situation' }

diff --git a/src/RPackage-Tests/RPackageRenameTest.class.st b/src/RPackage-Tests/RPackageRenameTest.class.st
@@ -31,8 +31,8 @@ RPackageRenameTest >> tearDown [
 { #category : #tests }
 RPackageRenameTest >> testRenamePackage [
 	"Test that we do rename the package as expected."
-	| package workingCopy class |
 
+	| package workingCopy class |
 	package := RPackageOrganizer default registerPackageNamed: 'Test1'.
 	workingCopy := MCWorkingCopy forPackage: (MCPackage new name: 'Test1').
 	class := Object
@@ -49,17 +49,16 @@ RPackageRenameTest >> testRenamePackage [
 	self assert: (package includesClass: class).
 	self assert: (package classTagNamed: #TAG ifAbsent: [ nil ]) notNil.
 	self assert: ((package classTagNamed: #TAG ifAbsent: [ nil ]) includesClass: class).
-	self assert: class category = #'TestRename-TAG'.	
+	self assert: class category equals: #'TestRename-TAG'.
 	self deny: (Smalltalk organization includesCategory: #Test1).
 	self deny: (MCWorkingCopy hasPackageNamed: #Test1).
-	
+
 	"cleaning"
 	workingCopy := MCWorkingCopy forPackage: (MCPackage new name: 'TestRename').
 	self assert: workingCopy modified.
-	workingCopy unload.	
+	workingCopy unload.
 	self deny: (RPackageOrganizer default includesPackageNamed: #TestRename).
-	self deny: (MCWorkingCopy hasPackageNamed: #TestRename).
-
+	self deny: (MCWorkingCopy hasPackageNamed: #TestRename)
 ]
 
 { #category : #tests }

diff --git a/src/RPackage-Tests/RPackageTraitTest.class.st b/src/RPackage-Tests/RPackageTraitTest.class.st
@@ -87,37 +87,38 @@ RPackageTraitTest >> setUp [
 RPackageTraitTest >> testPackageOfClassMethodFromTraitExtensionIsExtendingPackage [
 	"The package of a method defined in atrait but package in another package than the extended trait is the 
 	package containing the extension."
-	
+
 	"The package of a method in A1 (which is coming from the trait T1 used by A1) is the package of T1"
-	self assert: ((a1>>#traitMethodExtendedFromP4) packageFromOrganizer: self packageClass organizer) = p4.
+
+	self assert: (a1 >> #traitMethodExtendedFromP4 packageFromOrganizer: self packageClass organizer) equals: p4.
 	"The package of a method in A1 (which is coming from the trait T1 used by A1 but extended in package T2) is the package of T2"
-	self assert: ((a1>>#traitMethodExtendedFromP6) packageFromOrganizer: self packageClass organizer) = p6.
+	self assert: (a1 >> #traitMethodExtendedFromP6 packageFromOrganizer: self packageClass organizer) equals: p6
 ]
 
 { #category : #tests }
 RPackageTraitTest >> testPackageOfClassMethodFromTraitIsTraitPackage [
-
 	"test that a class method coming from a trait is packaged in the trait package"
-	self assert: ((a1>>#traitMethodDefinedInP4) packageFromOrganizer: self packageClass organizer) = p4.
-	self assert: ((a1>>#traitMethodDefinedInP5) packageFromOrganizer: self packageOrganizerClass default) = p5.
+
+	self assert: (a1 >> #traitMethodDefinedInP4 packageFromOrganizer: self packageClass organizer) equals: p4.
+	self assert: (a1 >> #traitMethodDefinedInP5 packageFromOrganizer: self packageOrganizerClass default) equals: p5
 ]
 
 { #category : #tests }
 RPackageTraitTest >> testPackageOfClassMethodIsClassPackage [
 	"The package of a local method (not defined in a trait) is the package of its class"
-	
-	self assert: ((a1>>#localMethodDefinedInP1) packageFromOrganizer: self packageClass organizer) = p4.
-	self assert: ((a1>>#anotherLocalMethodDefinedInP1) packageFromOrganizer: self packageOrganizerClass default) = p4.
-	self assert: ((a1>>#anotherLocalMethodDefinedInP1) packageFromOrganizer: self packageClass organizer) = p4.
+
+	self assert: (a1 >> #localMethodDefinedInP1 packageFromOrganizer: self packageClass organizer) equals: p4.
+	self assert: (a1 >> #anotherLocalMethodDefinedInP1 packageFromOrganizer: self packageOrganizerClass default) equals: p4.
+	self assert: (a1 >> #anotherLocalMethodDefinedInP1 packageFromOrganizer: self packageClass organizer) equals: p4
 ]
 
 { #category : #tests }
 RPackageTraitTest >> testPackageOfTraitMethodIsTraitPackage [
 	"The package of a trait method is the package of its trait."
 
-	self assert: ((a1 >> #traitMethodDefinedInP5) packageFromOrganizer: self packageClass organizer) = p5.
-	self assert: ((a1 >> #traitMethodDefinedInP5)packageFromOrganizer: self packageOrganizerClass default) = p5.
-	self assert: ((a1>>#traitMethodDefinedInP4) packageFromOrganizer: self packageClass organizer) = p4.
+	self assert: (a1 >> #traitMethodDefinedInP5 packageFromOrganizer: self packageClass organizer) equals: p5.
+	self assert: (a1 >> #traitMethodDefinedInP5 packageFromOrganizer: self packageOrganizerClass default) equals: p5.
+	self assert: (a1 >> #traitMethodDefinedInP4 packageFromOrganizer: self packageClass organizer) equals: p4
 ]
 
 { #category : #tests }

diff --git a/src/Random-Tests/RandomTest.class.st b/src/Random-Tests/RandomTest.class.st
@@ -34,13 +34,14 @@ RandomTest >> testDistribution [
 
 { #category : #tests }
 RandomTest >> testIfCompletelyBroken [
-
 	"If the results are not these values (accounting for precision of printing) 
 	then something is horribly wrong"
-
-	gen seed: 2345678901.
-	self assert: (((1 to: 10) collect: [:i | gen next round: 15]) = #(0.149243269650845 0.331633021743797 0.756196448000239 0.393701540023881 0.941783181364547 0.549929193942775 0.659962596213428 0.991354559078512 0.696074432551895 0.922987899707159)).	
 
+	gen seed: 2345678901.
+	self
+		assert: ((1 to: 10) collect: [ :i | gen next round: 15 ])
+		equals:
+			#(0.149243269650845 0.331633021743797 0.756196448000239 0.393701540023881 0.941783181364547 0.549929193942775 0.659962596213428 0.991354559078512 0.696074432551895 0.922987899707159)
 ]
 
 { #category : #tests }

diff --git a/src/Refactoring-Tests-Core/RBChildrenToSiblingsTest.class.st b/src/Refactoring-Tests-Core/RBChildrenToSiblingsTest.class.st
@@ -62,7 +62,7 @@ RBChildrenToSiblingsTest >> testModelChildrenToSibling [
 	| refactoring class subclass superclass |
 	class := model classNamed: #ConcreteSuperclass.
 	subclass := model classNamed: #ConcreteSubclass.
-	refactoring := RBChildrenToSiblingsRefactoring 
+	refactoring := RBChildrenToSiblingsRefactoring
 		model: model
 		name: #AbstractSuperclass
 		class: class
@@ -75,18 +75,38 @@ RBChildrenToSiblingsTest >> testModelChildrenToSibling [
 	self assert: subclass classSide superclass equals: superclass classSide.
 	self assert: (superclass parseTreeFor: #same) equals: (self parseMethod: 'same ^self initialize isKindOf: AbstractSuperclass').
 	self assert: (superclass parseTreeFor: #different) equals: (self parseMethod: 'different self subclassResponsibility').
-	self assert: (superclass parseTreeFor: #initialize) equals: (self parseMethod: 'initialize
+	self
+		assert: (superclass parseTreeFor: #initialize)
+		equals:
+			(self
+				parseMethod:
+					'initialize
 							instVarName1 := instVarName2 := ClassVarName1 := ClassVarName2 := 0').
 	self assert: (superclass directlyDefinesInstanceVariable: 'instVarName1').
 	self assert: (superclass directlyDefinesInstanceVariable: 'instVarName2').
 	self assert: (superclass directlyDefinesClassVariable: 'ClassVarName1').
 	self assert: (superclass directlyDefinesClassVariable: 'ClassVarName2').
 	self assert: (superclass classSide directlyDefinesInstanceVariable: 'classInstVarName1').
-	self assert: (superclass classSide parseTreeFor: #foo) equals: (self parseMethod: 'foo
+	self
+		assert: (superclass classSide parseTreeFor: #foo)
+		equals:
+			(self
+				parseMethod:
+					'foo
 							^classInstVarName1 + ClassVarName1 + ClassVarName2').
-	self assert: (superclass classSide parseTreeFor: #new) equals: (self parseMethod: 'new
+	self
+		assert: (superclass classSide parseTreeFor: #new)
+		equals:
+			(self
+				parseMethod:
+					'new
 							^super new initialize').
-	self assert: (superclass classSide parseTreeFor: #bar) equals: (self parseMethod: 'bar
+	self
+		assert: (superclass classSide parseTreeFor: #bar)
+		equals:
+			(self
+				parseMethod:
+					'bar
 							self subclassResponsibility').
 	self deny: (class directlyDefinesInstanceVariable: 'instVarName1').
 	self deny: (class directlyDefinesInstanceVariable: 'instVarName2').
@@ -96,8 +116,18 @@ RBChildrenToSiblingsTest >> testModelChildrenToSibling [
 	self deny: (class directlyDefinesMethod: #same).
 	self deny: (class directlyDefinesMethod: #initialize).
 	self deny: (class classSide directlyDefinesMethod: #new).
-	self assert: (class parseTreeFor: #different) equals: (self parseMethod: 'different
+	self
+		assert: (class parseTreeFor: #different)
+		equals:
+			(self
+				parseMethod:
+					'different
 							^instVarName1 + instVarName2').
-	self assert: (class classSide parseTreeFor: #bar) = (self parseMethod: 'bar
+	self
+		assert: (class classSide parseTreeFor: #bar)
+		equals:
+			(self
+				parseMethod:
+					'bar
 							^self printString')
 ]
diff --git a/src/Refactoring-Tests-Core/RBCreateAccessorsForVariableTest.class.st b/src/Refactoring-Tests-Core/RBCreateAccessorsForVariableTest.class.st
@@ -13,28 +13,22 @@ RBCreateAccessorsForVariableTest >> setUp [
 { #category : #tests }
 RBCreateAccessorsForVariableTest >> testExistingInstanceVariableAccessors [
 	| ref |
-	ref := RBCreateAccessorsForVariableRefactoring 
-		variable: 'name'
-		class: RBLintRuleTestData
-		classVariable: false.
+	ref := RBCreateAccessorsForVariableRefactoring variable: 'name' class: RBLintRuleTestData classVariable: false.
 	self executeRefactoring: ref.
 	self assertEmpty: ref changes changes.
-	self assert: ref setterMethod == #name:.
-	self assert: ref getterMethod == #name
+	self assert: ref setterMethod identicalTo: #name:.
+	self assert: ref getterMethod identicalTo: #name
 ]
 
 { #category : #tests }
 RBCreateAccessorsForVariableTest >> testNewClassVariableAccessors [
 	| ref class |
-	ref := RBCreateAccessorsForVariableRefactoring 
-		variable: 'Foo1'
-		class: RBLintRuleTestData
-		classVariable: true.
+	ref := RBCreateAccessorsForVariableRefactoring variable: 'Foo1' class: RBLintRuleTestData classVariable: true.
 	self executeRefactoring: ref.
 	class := ref model metaclassNamed: #RBLintRuleTestData.
 	self denyEmpty: ref changes changes.
-	self assert: ref setterMethod == #foo1:.
-	self assert: ref getterMethod == #foo1.
+	self assert: ref setterMethod identicalTo: #foo1:.
+	self assert: ref getterMethod identicalTo: #foo1.
 	self assert: (class parseTreeFor: #foo1) equals: (self parseMethod: 'foo1 ^Foo1').
 	self assert: (class parseTreeFor: #foo1:) equals: (self parseMethod: 'foo1: anObject Foo1 := anObject')
 ]
@@ -46,8 +40,8 @@ RBCreateAccessorsForVariableTest >> testNewInstanceVariableAccessors [
 	self executeRefactoring: ref.
 	class := ref model classNamed: #RBLintRuleTestData.
 	self denyEmpty: ref changes changes.
-	self assert: ref setterMethod == #foo1:.
-	self assert: ref getterMethod == #foo1.
+	self assert: ref setterMethod identicalTo: #foo1:.
+	self assert: ref getterMethod identicalTo: #foo1.
 	self assert: (class parseTreeFor: #foo1) equals: (self parseMethod: 'foo1 ^foo1').
 	self assert: (class parseTreeFor: #foo1:) equals: (self parseMethod: 'foo1: anObject foo1 := anObject')
 ]

diff --git a/src/Refactoring-Tests-Core/RBExtractMethodTest.class.st b/src/Refactoring-Tests-Core/RBExtractMethodTest.class.st
@@ -132,23 +132,34 @@ RBExtractMethodTest >> testExtractMethodThatNeedsTemporaryVariable [
 
 { #category : #tests }
 RBExtractMethodTest >> testExtractWithRenamingOfParameters [
-	| refactoring class|
-	refactoring := RBExtractMethodRefactoring
-		extract: (78 to: 197)
-		from: #displayName
-		in: RBLintRuleTestData.
+	| refactoring class |
+	refactoring := RBExtractMethodRefactoring extract: (78 to: 197) from: #displayName in: RBLintRuleTestData.
 	self setupMethodNameFor: refactoring toReturn: #foo:.
-	refactoring parameterMap: (Dictionary new at: #nameStream put: #newParameter; yourself ).
+	refactoring
+		parameterMap:
+			(Dictionary new
+				at: #nameStream put: #newParameter;
+				yourself).
 	self executeRefactoring: refactoring.
 	class := refactoring model classNamed: #RBLintRuleTestData.
 
- 	self assert: (class parseTreeFor: #displayName) = (self parseMethod: 'displayName
+	self
+		assert: (class parseTreeFor: #displayName)
+		equals:
+			(self
+				parseMethod:
+					'displayName
 	| nameStream |
 	nameStream := WriteStream on: (String new: 64).
 	self foo: nameStream.
 	^nameStream contents').
 	"Extracted method with renamed parameters"
-	self assert: (class parseTreeFor: #foo:) = (self parseMethod: 'foo: newParameter 	newParameter nextPutAll: self name;
+	self
+		assert: (class parseTreeFor: #foo:)
+		equals:
+			(self
+				parseMethod:
+					'foo: newParameter 	newParameter nextPutAll: self name;
 		nextPutAll: '' (''.
 	self problemCount printOn: newParameter.
 	newParameter nextPut: $).')