Skip to content

Commit

Permalink
Replace assert = in Ring.
Browse files Browse the repository at this point in the history
Replace:

- assert: = by assert: equals:
- deny = by deny: equals:
- assert: == by assert: identicalTo:
- deny: == by deny: identicalTo:
  • Loading branch information
jecisc committed Nov 20, 2019
1 parent 66988bf commit 077df2e
Show file tree
Hide file tree
Showing 34 changed files with 968 additions and 1,137 deletions.
24 changes: 11 additions & 13 deletions src/Manifest-Tests/RGMethodDefinitionTest.extension.st
Expand Up @@ -25,23 +25,21 @@ RGMethodDefinitionTest >> testManifestReadOn [

{ #category : #'*Manifest-Tests' }
RGMethodDefinitionTest >> testReadFrom [

| st rg |
rg := (Point>>#x) asRingDefinition.
st := String streamContents: [:s |

rg storeOn: s.
s contents].
self assert: (Object readFrom: st) = rg
rg := (Point >> #x) asRingDefinition.
st := String
streamContents: [ :s |
rg storeOn: s.
s contents ].
self assert: (Object readFrom: st) equals: rg
]

{ #category : #'*Manifest-Tests' }
RGMethodDefinitionTest >> testStoreOn [

| st |
st := String streamContents: [:s |

(Point>>#x) asRingDefinition storeOn: s.
s contents].
self assert: st = '(RGMethodDefinition className: ''Point'' selector: #x isMetaSide: false)'
st := String
streamContents: [ :s |
(Point >> #x) asRingDefinition storeOn: s.
s contents ].
self assert: st equals: '(RGMethodDefinition className: ''Point'' selector: #x isMetaSide: false)'
]
Expand Up @@ -19,8 +19,8 @@ RGNamespaceTest >> testCreatingNamespace [
addClass: newClass.

self assert: newNamespace isNamespace.
self assert: (newNamespace packageNamed: #'Collections-Sequenceable') == newPackage.
self assert: (newNamespace classNamed: #OrderedCollection) == newClass.
self assert: (newNamespace packageNamed: #'Collections-Sequenceable') identicalTo: newPackage.
self assert: (newNamespace classNamed: #OrderedCollection) identicalTo: newClass.
self assertEmpty: newNamespace methods.
self assertEmpty: newNamespace pools.
self assertEmpty: newNamespace globalVariables.
Expand Down
Expand Up @@ -10,29 +10,27 @@ Class {
{ #category : #testing }
RGPackageDefinitionTest >> testAddingClass [
| newPackage newClass |

newPackage:= RGPackageDefinition named: #'Collections-Sequenceable'.
newClass:= RGClassDefinition named: #OrderedCollection.
newPackage := RGPackageDefinition named: #'Collections-Sequenceable'.
newClass := RGClassDefinition named: #OrderedCollection.
newPackage addClass: newClass.
self assert: (newPackage hasClasses).
self assert: (newClass package == newPackage).
self assert: ((newPackage classNamed: #OrderedCollection) == newClass)

self assert: newPackage hasClasses.
self assert: newClass package identicalTo: newPackage.
self assert: (newPackage classNamed: #OrderedCollection) identicalTo: newClass
]

{ #category : #testing }
RGPackageDefinitionTest >> testAddingPackage [
| newPackage childPackage |

newPackage:= RGPackageDefinition named: #'Collections'.
newPackage := RGPackageDefinition named: #Collections.
newPackage addPackageNamed: #'Collections-Sequenceable'.

self assert: (newPackage includesPackageNamed: #'Collections-Sequenceable').
self assert: (newPackage packages size = 1).
childPackage:= newPackage packageNamed: #'Collections-Sequenceable'.
self assert: (childPackage parent = newPackage parent).
self assert: (childPackage package = newPackage).
self assert: newPackage packages size equals: 1.

childPackage := newPackage packageNamed: #'Collections-Sequenceable'.
self assert: childPackage parent equals: newPackage parent.
self assert: childPackage package equals: newPackage
]

{ #category : #testing }
Expand All @@ -41,10 +39,10 @@ RGPackageDefinitionTest >> testNewPackage [
newPackage := RGPackageDefinition named: 'Collections-Sequenceable'.

self assert: newPackage isPackage.
self assert: newPackage name = 'Collections-Sequenceable'.
self assert: newPackage name equals: 'Collections-Sequenceable'.
self assertEmpty: newPackage classes.
self assertEmpty: newPackage traits.
self assertEmpty: newPackage packages.
self assert: newPackage package isNil.
self assert: newPackage parent == Smalltalk globals
self assert: newPackage parent identicalTo: Smalltalk globals
]
61 changes: 30 additions & 31 deletions src/Ring-Definitions-Tests-Containers/RGSliceTest.class.st
Expand Up @@ -9,48 +9,47 @@ Class {

{ #category : #testing }
RGSliceTest >> testAddingClasses [
| newSlice newClass newTrait |

newSlice:= RGSlice named: 'Foo'.
newClass:= RGClassDefinition named: #OrderedCollection.
newTrait:= RGTraitDefinition named: #TSortable.

newSlice addClassNamed: #SortedCollection;
addClass: newClass;
addTrait: newTrait.
self assert: (newSlice classes size = 3).
self assert: (newSlice traits size = 1).
| newSlice newClass newTrait |
newSlice := RGSlice named: 'Foo'.
newClass := RGClassDefinition named: #OrderedCollection.
newTrait := RGTraitDefinition named: #TSortable.

newSlice
addClassNamed: #SortedCollection;
addClass: newClass;
addTrait: newTrait.

self assert: newSlice classes size equals: 3.
self assert: newSlice traits size equals: 1.
self assert: (newSlice includesClassNamed: #OrderedCollection).
self assert: ((newSlice classNamed: #OrderedCollection) == newClass).
self assert: ((newSlice traitNamed: #TSortable) == newTrait).
self assert: (newSlice classNamed: #OrderedCollection) identicalTo: newClass.
self assert: (newSlice traitNamed: #TSortable) identicalTo: newTrait.
self assert: (newClass isIncludedInContainer: newSlice).
self assert: (newTrait isIncludedInContainer: newSlice).
self assert: (newSlice allClasses size = 3).
self assert: (newSlice allTraits size = 1).
self assert: (newClass parent = newSlice).
self assert: (newClass rootEnvironment = newSlice environment)
self assert: newSlice allClasses size equals: 3.
self assert: newSlice allTraits size equals: 1.
self assert: newClass parent equals: newSlice.
self assert: newClass rootEnvironment equals: newSlice environment
]

{ #category : #testing }
RGSliceTest >> testNestingContainers [
| newSlice newSlice2 newClass newTrait newClass2 |

newSlice:= RGSlice named: #Root.
newSlice2:= RGSlice named: #Child.
newSlice := RGSlice named: #Root.
newSlice2 := RGSlice named: #Child.
newSlice2 environment: newSlice.

newSlice addClassNamed: #OrderedCollection.
newClass:= newSlice classNamed: #OrderedCollection.
newClass := newSlice classNamed: #OrderedCollection.
newSlice addTraitNamed: #TSortable.
newTrait:= newSlice traitNamed: #TSortable.
newTrait := newSlice traitNamed: #TSortable.
newSlice2 addClassNamed: #SortedCollection.
newClass2:= newSlice classNamed: #SortedCollection.
self assert: (newSlice classes size = 2).
self assert: (newSlice2 classes size = 1).
self assert: (newSlice2 environment = newSlice).
self assert: (newSlice2 rootEnvironment = newSlice environment)
newClass2 := newSlice classNamed: #SortedCollection.

self assert: newSlice classes size equals: 2.
self assert: newSlice2 classes size equals: 1.
self assert: newSlice2 environment equals: newSlice.
self assert: newSlice2 rootEnvironment equals: newSlice environment
]

{ #category : #testing }
Expand All @@ -60,5 +59,5 @@ RGSliceTest >> testNewSlice [

self assert: newSlice isSlice.
self assertEmpty: newSlice classes.
self assert: newSlice environment == Smalltalk globals
self assert: newSlice environment identicalTo: Smalltalk globals
]

0 comments on commit 077df2e

Please sign in to comment.