Skip to content

Commit

Permalink
Replace assert = in packages starting by S.
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
jecisc committed Nov 20, 2019
1 parent d883cd3 commit 248555e
Show file tree
Hide file tree
Showing 42 changed files with 606 additions and 702 deletions.
27 changes: 11 additions & 16 deletions src/STON-Tests/STONJSONTest.class.st
View file
Expand Up @@ -79,31 +79,26 @@ STONJSONTest >> testNull [
{ #category : #tests }
STONJSONTest >> testOrderedDictionary [
| odictClass odict json dict |

odictClass := Smalltalk at: #OrderedDictionary ifAbsent: [ ^ self skip ].

odict := odictClass newFrom: {
'a' -> 42 . 'b' -> 1. 'aa' -> 4. 'c' -> 23
}.

"assert that the order is not equal in the dictionary hash table".
self
assertCollection: odict asArray
hasSameElements: odict dictionary asArray;
deny: odict asArray = odict dictionary asArray.


odict := odictClass newFrom: {('a' -> 42) . ('b' -> 1) . ('aa' -> 4) . ('c' -> 23)}.

"assert that the order is not equal in the dictionary hash table"
self
assertCollection: odict asArray hasSameElements: odict dictionary asArray;
deny: odict asArray equals: odict dictionary asArray.

"ordered presevered when encoding:"
json := STONJSON toString: odict.
self assert: json equals: '{"a":42,"b":1,"aa":4,"c":23}'.

"lost when decoding"
dict := STONJSON fromString: json.

self
self
assertCollection: dict asArray hasSameElements: odict asArray;
assert: dict equals: odict dictionary;
deny: dict asArray = odict asArray

deny: dict asArray equals: odict asArray
]

{ #category : #tests }
Expand Down
162 changes: 87 additions & 75 deletions src/STON-Tests/STONReaderTest.class.st
View file
Expand Up @@ -17,18 +17,17 @@ STONReaderTest >> materialize: string [

{ #category : #tests }
STONReaderTest >> testAssociation [
self assert: (self materialize: '''foo'':1') = ('foo' -> 1).
self assert: (self materialize: '#bar:2') = (#bar -> 2).
self assert: (self materialize: '''foo bar'':#ok') = ('foo bar' -> #ok).
self assert: (self materialize: '123:456') = (123 -> 456).

self assert: (self materialize: '''foo'' : 1') = ('foo' -> 1).
self assert: (self materialize: '#bar : 2') = (#bar -> 2).
self assert: (self materialize: '''foo bar'' : #ok') = ('foo bar' -> #ok).
self assert: (self materialize: '123 : -456') = (123 -> -456).

self assert: (self materialize: '#foo : 1 : 2') = (#foo -> (1 -> 2))
self assert: (self materialize: '''foo'':1') equals: 'foo' -> 1.
self assert: (self materialize: '#bar:2') equals: #bar -> 2.
self assert: (self materialize: '''foo bar'':#ok') equals: 'foo bar' -> #ok.
self assert: (self materialize: '123:456') equals: 123 -> 456.

self assert: (self materialize: '''foo'' : 1') equals: 'foo' -> 1.
self assert: (self materialize: '#bar : 2') equals: #bar -> 2.
self assert: (self materialize: '''foo bar'' : #ok') equals: 'foo bar' -> #ok.
self assert: (self materialize: '123 : -456') equals: 123 -> -456.

self assert: (self materialize: '#foo : 1 : 2') equals: #foo -> (1 -> 2)
]

{ #category : #tests }
Expand All @@ -50,13 +49,12 @@ STONReaderTest >> testBoolean [

{ #category : #tests }
STONReaderTest >> testByteArray [
self assert: (self materialize: 'ByteArray[''010203'']') = #(1 2 3) asByteArray

self assert: (self materialize: 'ByteArray[''010203'']') equals: #(1 2 3) asByteArray
]

{ #category : #tests }
STONReaderTest >> testCharacter [
self assert: (self materialize: 'Character[''A'']') == $A.
self assert: (self materialize: 'Character[''A'']') identicalTo: $A
]

{ #category : #tests }
Expand Down Expand Up @@ -130,8 +128,15 @@ STONReaderTest >> testDate [
{ #category : #tests }
STONReaderTest >> testDateAndTime [
| dateAndTime |
dateAndTime := DateAndTime year: 2012 month: 1 day: 1 hour: 6 minute: 30 second: 15 offset: 1 hour.
self assert: (self materialize: 'DateAndTime[''2012-01-01T06:30:15+01:00'']') = dateAndTime
dateAndTime := DateAndTime
year: 2012
month: 1
day: 1
hour: 6
minute: 30
second: 15
offset: 1 hour.
self assert: (self materialize: 'DateAndTime[''2012-01-01T06:30:15+01:00'']') equals: dateAndTime
]

{ #category : #tests }
Expand All @@ -154,19 +159,24 @@ STONReaderTest >> testDeepStructure [
{ #category : #tests }
STONReaderTest >> testDictionary [
| collection |
collection := STON mapClass new at: 1 put: 1; at: 2 put: 2; yourself.
self assert: (self materialize: '{1:1,2:2}') = collection.
self assert: (self materialize: '{}') = STON mapClass new.

collection := STON mapClass new
at: 1 put: 1;
at: 2 put: 2;
yourself.
self assert: (self materialize: '{1:1,2:2}') equals: collection.
self assert: (self materialize: '{}') equals: STON mapClass new
]

{ #category : #tests }
STONReaderTest >> testDictionaryWithComplexKeys [
| collection reader |
collection := STON mapClass new at: true put: 1; at: #(foo) put: 2; yourself.
collection := STON mapClass new
at: true put: 1;
at: #(foo) put: 2;
yourself.
"allowing complex map keys used to be optional, now it is always the default"
reader := STONReader on: '{true:1,[#foo]:2}' readStream.
self assert: reader next = collection
self assert: reader next equals: collection
]

{ #category : #tests }
Expand Down Expand Up @@ -241,10 +251,12 @@ STONReaderTest >> testFraction [
{ #category : #tests }
STONReaderTest >> testIdentityDictionary [
| collection |
collection := IdentityDictionary new at: 1 put: 1; at: 2 put: 2; yourself.
self assert: (self materialize: 'IdentityDictionary{1:1,2:2}') = collection.
self assert: (self materialize: 'IdentityDictionary{}') = IdentityDictionary new.

collection := IdentityDictionary new
at: 1 put: 1;
at: 2 put: 2;
yourself.
self assert: (self materialize: 'IdentityDictionary{1:1,2:2}') equals: collection.
self assert: (self materialize: 'IdentityDictionary{}') equals: IdentityDictionary new
]

{ #category : #tests }
Expand All @@ -258,38 +270,41 @@ STONReaderTest >> testIllegalCharacterEscapes [

{ #category : #tests }
STONReaderTest >> testInteger [
self assert: (self materialize: '1') = 1.
self assert: (self materialize: '-1') = -1.
self assert: (self materialize: '0') = 0.
self assert: (self materialize: '1234567890') = 1234567890.
self assert: (self materialize: '-1234567890') = -1234567890
self assert: (self materialize: '1') equals: 1.
self assert: (self materialize: '-1') equals: -1.
self assert: (self materialize: '0') equals: 0.
self assert: (self materialize: '1234567890') equals: 1234567890.
self assert: (self materialize: '-1234567890') equals: -1234567890
]

{ #category : #tests }
STONReaderTest >> testJsonString [
"Allow double quotes for backwards JSON compatibility"

| string |
self assert: (self materialize: '"foo"') = 'foo'.
self assert: (self materialize: '"FOO"') = 'FOO'.
self assert: (self materialize: '"\u00E9l\u00E8ve en Fran\u00E7ais"') = 'élève en Français'.
string := String withAll: {
$". $'. $\. Character tab. Character cr. Character lf. Character newPage. Character backspace }.
self assert: (self materialize: '"\"\''\\\t\r\n\f\b"') = string.

| string |
self assert: (self materialize: '"foo"') equals: 'foo'.
self assert: (self materialize: '"FOO"') equals: 'FOO'.
self assert: (self materialize: '"\u00E9l\u00E8ve en Fran\u00E7ais"') equals: 'élève en Français'.
string := String withAll: {$" . $' . $\ . Character tab . Character cr . Character lf . Character newPage . Character backspace}.
self assert: (self materialize: '"\"\''\\\t\r\n\f\b"') equals: string
]
{ #category : #tests }
STONReaderTest >> testList [
self assert: STON listClass = Array.
self assert: (self materialize: '[1,2,3]') = (STON listClass with: 1 with: 2 with: 3).
self assert: (self materialize: '[]') = STON listClass new
self assert: STON listClass equals: Array.
self assert: (self materialize: '[1,2,3]') equals: (STON listClass with: 1 with: 2 with: 3).
self assert: (self materialize: '[]') equals: STON listClass new
]
{ #category : #tests }
STONReaderTest >> testMap [
self assert: (self materialize: '{#foo:1}') = (STON mapClass new at: #foo put: 1; yourself).
self assert: (self materialize: '{}') = STON mapClass new
self
assert: (self materialize: '{#foo:1}')
equals:
(STON mapClass new
at: #foo put: 1;
yourself).
self assert: (self materialize: '{}') equals: STON mapClass new
]
{ #category : #tests }
Expand Down Expand Up @@ -361,41 +376,41 @@ STONReaderTest >> testNull [
{ #category : #tests }
STONReaderTest >> testObject [
self assert: (self materialize: 'Point[1,2]') = (1@2).
self assert: (self materialize: 'Point[1.5,-0.5]') = (1.5 @ -0.5).
self assert: (self materialize: 'Point[1,2]') equals: 1 @ 2.
self assert: (self materialize: 'Point[1.5,-0.5]') equals: 1.5 @ -0.5
]
{ #category : #tests }
STONReaderTest >> testOrderedCollection [
| collection |
collection := OrderedCollection with: 1 with: 2 with: 3.
self assert: (self materialize: 'OrderedCollection[1,2,3]') = collection.
self assert: (self materialize: 'OrderedCollection[]') = OrderedCollection new.
self assert: (self materialize: 'OrderedCollection[1,2,3]') equals: collection.
self assert: (self materialize: 'OrderedCollection[]') equals: OrderedCollection new
]
{ #category : #tests }
STONReaderTest >> testPoint [
self assert: (self materialize: 'Point[1,2]') = (1@2)
self assert: (self materialize: 'Point[1,2]') equals: 1 @ 2
]
{ #category : #tests }
STONReaderTest >> testReferenceCycle [
| array |
array := (self materialize: '[1,@1]').
self assert: array class = STON listClass.
self assert: array size = 2.
self assert: array first = 1.
self assert: array second == array
array := self materialize: '[1,@1]'.
self assert: array class equals: STON listClass.
self assert: array size equals: 2.
self assert: array first equals: 1.
self assert: array second identicalTo: array
]
{ #category : #tests }
STONReaderTest >> testReferenceSharing [
| one array |
one := { #one }.
array := (self materialize: '[[#one],@2,@2]').
self assert: array = (STON listClass with: one with: one with: one).
self assert: array first == array second.
self assert: array first == array third
one := {#one}.
array := self materialize: '[[#one],@2,@2]'.
self assert: array equals: (STON listClass with: one with: one with: one).
self assert: array first identicalTo: array second.
self assert: array first identicalTo: array third
]
{ #category : #tests }
Expand Down Expand Up @@ -450,19 +465,17 @@ STONReaderTest >> testStreaming [
{ #category : #tests }
STONReaderTest >> testString [
| string |
self assert: (self materialize: '''foo''') = 'foo'.
self assert: (self materialize: '''FOO''') = 'FOO'.
self assert: (self materialize: '''\u00E9l\u00E8ve en Fran\u00E7ais''') = 'élève en Français'.
string := String withAll: {
$". $'. $\. $/. Character tab. Character cr. Character lf. Character newPage. Character backspace }.
self assert: (self materialize: '''\"\''\\\/\t\r\n\f\b''') = string.

self assert: (self materialize: '''foo''') equals: 'foo'.
self assert: (self materialize: '''FOO''') equals: 'FOO'.
self assert: (self materialize: '''\u00E9l\u00E8ve en Fran\u00E7ais''') equals: 'élève en Français'.
string := String withAll: {$" . $' . $\ . $/ . Character tab . Character cr . Character lf . Character newPage . Character backspace}.
self assert: (self materialize: '''\"\''\\\/\t\r\n\f\b''') equals: string
]

{ #category : #tests }
STONReaderTest >> testSymbol [
self assert: (self materialize: '#''foo''') = #foo.
self assert: (self materialize: '#foo') = #foo
self assert: (self materialize: '#''foo''') equals: #foo.
self assert: (self materialize: '#foo') equals: #foo
]

{ #category : #tests }
Expand Down Expand Up @@ -512,7 +525,7 @@ STONReaderTest >> testUser [
(user := STONTestUser new)
username: 'john@foo.com';
password: 'secret1'.
self assert: (self materialize: 'STONTestUser{#username:''john@foo.com'',#password:''secret1'',#enabled:true}') = user
self assert: (self materialize: 'STONTestUser{#username:''john@foo.com'',#password:''secret1'',#enabled:true}') equals: user
]

{ #category : #tests }
Expand All @@ -521,19 +534,18 @@ STONReaderTest >> testUser2 [
(user := STONTestUser2 new)
username: 'john@foo.com';
password: 'secret1'.
self assert: (self materialize: 'STONTestUser2{#username:''john@foo.com'',#password:''secret1'',#enabled:true}') = user
self assert: (self materialize: 'STONTestUser2{#username:''john@foo.com'',#password:''secret1'',#enabled:true}') equals: user
]

{ #category : #tests }
STONReaderTest >> testWhitespace [
| whitespace |
whitespace := { Character space. Character tab. Character cr. Character lf }.
self assert: (self materialize: whitespace, '123') = 123

whitespace := {Character space . Character tab . Character cr . Character lf}.
self assert: (self materialize: whitespace , '123') equals: 123
]

{ #category : #tests }
STONReaderTest >> testWideSymbol [
self assert: (self materialize: '#''яблоко''') = #яблоко.
self assert: (self materialize: '#яблоко') = #яблоко
self assert: (self materialize: '#''яблоко''') equals: #яблоко.
self assert: (self materialize: '#яблоко') equals: #яблоко
]
22 changes: 11 additions & 11 deletions src/STON-Tests/STONTest.class.st
View file
Expand Up @@ -52,8 +52,8 @@ STONTest class >> write: object toFileNamed: path [
{ #category : #tests }
STONTest >> testFromString [
| object |
object := STON listClass withAll: { 1. 0. -1. true. false. nil }.
self assert: (STON fromString: '[1,0,-1,true,false,nil]') = object
object := STON listClass withAll: {1 . 0 . -1 . true . false . nil}.
self assert: (STON fromString: '[1,0,-1,true,false,nil]') equals: object
]

{ #category : #tests }
Expand All @@ -69,9 +69,9 @@ STONTest >> testFromStringWithComments [
STONTest >> testPrettyPrinting [
| object |
object := STONTestUser dummy.
self assert: (STON fromString: (STON toStringPretty: object)) = object.
self assert: (STON fromString: (STON toStringPretty: object)) equals: object.
object := STONTestDomainObject dummy.
self assert: (STON fromString: (STON toStringPretty: object)) = object
self assert: (STON fromString: (STON toStringPretty: object)) equals: object
]

{ #category : #tests }
Expand All @@ -97,17 +97,17 @@ STONTest >> testRoomExitCycles [
self assert: (object second at: #name) equals: 'Room 2'.
self assert: ((object first at: #exit) at: #name) equals: 'Exit 1'.
self assert: ((object second at: #exit) at: #name) equals: 'Exit 2'.
self assert: ((object first at: #exit) at: #origin) == object first.
self assert: ((object first at: #exit) at: #destination) == object second.
self assert: ((object second at: #exit) at: #origin) == object second.
self assert: ((object second at: #exit) at: #destination) == object first.
"Try writing again the parse model"
self assert: ((object first at: #exit) at: #origin) identicalTo: object first.
self assert: ((object first at: #exit) at: #destination) identicalTo: object second.
self assert: ((object second at: #exit) at: #origin) identicalTo: object second.
self assert: ((object second at: #exit) at: #destination) identicalTo: object first.
"Try writing again the parse model"
self assert: (STON toString: object) equals: ston
]

{ #category : #tests }
STONTest >> testToString [
| object |
object := STON listClass withAll: { 1. 0. -1. true. false. nil }.
self assert: (STON toString: object) = '[1,0,-1,true,false,nil]'
object := STON listClass withAll: {1 . 0 . -1 . true . false . nil}.
self assert: (STON toString: object) equals: '[1,0,-1,true,false,nil]'
]

0 comments on commit 248555e

Please sign in to comment.