--- a/tests/PPTokenTest.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/tests/PPTokenTest.st	Fri Oct 03 02:33:08 2014 +0100
@@ -19,11 +19,9 @@
 testCollection
 	| input result |
 	input := 'foo    '.
-	result := self 
-		parse: input
-		using: self identifier.
-	self assert: (result collection = input).
-	self assert: (result collection == input)
+	result := self parse: input using: self identifier.
+	self assert: result collection equals: input.
+	self assert: result collection == input
 !
 
 testInitialize
@@ -38,31 +36,25 @@
 testPrinting
 	| result |
 	result := PPToken on: 'var'.
-	self assert: (result printString findString: 'PPToken[1,3]') > 0
+	self assert: (result printString includesSubstring: 'PPToken[1,3]')
 !
 
 testSize
 	| result |
-	result := self 
-		parse: 'foo'
-		using: self identifier.
-	self assert: result size = 3
+	result := self parse: 'foo' using: self identifier.
+	self assert: result size equals: 3
 !
 
 testStart
 	| result |
-	result := self 
-		parse: 'foo'
-		using: self identifier.
-	self assert: result start = 1
+	result := self parse: 'foo' using: self identifier.
+	self assert: result start equals: 1
 !
 
 testStop
 	| result |
-	result := self 
-		parse: 'foo'
-		using: self identifier.
-	self assert: result stop = 3
+	result := self parse: 'foo' using: self identifier.
+	self assert: result stop equals: 3
 !
 
 testValue
@@ -75,11 +67,11 @@
 
 testEquality
 	| token1 token2 |
-	token1 := self  parse: 'foo' using: self identifier.
-	token2 := self  parse: 'foo' using: self identifier.
+	token1 := self parse: 'foo' using: self identifier.
+	token2 := self parse: 'foo' using: self identifier.
 	self deny: token1 == token2.
-	self assert: token1 = token2.
-	self assert: token1 hash = token2 hash.
+	self assert: token1 equals: token2.
+	self assert: token1 hash equals: token2 hash
 ! !
 
 !PPTokenTest methodsFor:'testing-copying'!
@@ -88,41 +80,30 @@
 	| result other |
 	result := PPToken on: 'abc'.
 	other := result copyFrom: 2 to: 2.
-	
-	self assert: other size = 1.
-	self assert: other start = 2.
-	self assert: other stop = 2.
-	self assert: other collection = result collection
+	self assert: other size equals: 1.
+	self assert: other start equals: 2.
+	self assert: other stop equals: 2.
+	self assert: other collection equals: result collection
 ! !
 
 !PPTokenTest methodsFor:'testing-querying'!
 
 testColumn
-        | input parser result cr |
-
-        cr := Smalltalk isSmalltalkX 
-                ifTrue:[ Character return]
-                ifFalse:[ Character cr ].
-        input := '1' , (String with:cr) , '12' , (String with: cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        parser := #any asParser token star.
-        result := parser parse: input.
-        result 
-                with:  #(1 2 1 2 3 4 1 2 3 4 1 2 3 4)
-                do: [ :token :line | self assert: token column = line ]
+	| input parser result |
+	input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123'
+		, (String with: Character lf) , '1234'.
+	parser := #any asParser token star.
+	result := parser parse: input.
+	result with: #(1 2 1 2 3 4 1 2 3 4 1 2 3 4) do: [ :token :line | self assert: token column equals: line ]
 !
 
 testLine
-        | input parser result cr|
-
-        cr := Smalltalk isSmalltalkX 
-            ifTrue:[Character return] 
-            ifFalse:[Character cr].
-        input := '1' , (String with: cr) , '12' , (String with: cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        parser := #any asParser token star.
-        result := parser parse: input.
-        result 
-                with: #(1 1 2 2 2 2 3 3 3 3 4 4 4 4) 
-                do: [ :token :line | self assert: token line = line ]
+	| input parser result |
+	input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123'
+		, (String with: Character lf) , '1234'.
+	parser := #any asParser token star.
+	result := parser parse: input.
+	result with: #(1 1 2 2 2 2 3 3 3 3 4 4 4 4) do: [ :token :line | self assert: token line equals: line ]
 ! !
 
 !PPTokenTest methodsFor:'testing-values'!
@@ -130,20 +111,16 @@
 testInputValue
 	| input result |
 	input := 'foo'.
-	result := self 
-		parse: input
-		using: self identifier.
-	self assert: result inputValue = input.
+	result := self parse: input using: self identifier.
+	self assert: result inputValue equals: input.
 	self deny: result inputValue == input
 !
 
 testParsedValue
 	| input result |
 	input := 'foo'.
-	result := self 
-		parse: input
-		using: self identifier.
-	self assert: result parsedValue = #($f $o $o)
+	result := self parse: input using: self identifier.
+	self assert: result parsedValue equals: #($f $o $o)
 ! !
 
 !PPTokenTest methodsFor:'utilities'!