--- a/PPTokenTest.st	Tue Mar 04 15:34:23 2014 +0100
+++ b/PPTokenTest.st	Tue Mar 04 15:34:24 2014 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:goodies/petitparser' }"
 
-PPAbstractParseTest subclass:#PPTokenTest
+PPAbstractParserTest subclass:#PPTokenTest
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -26,6 +26,10 @@
 	self assert: (result collection == input)
 !
 
+testInitialize
+	PPToken initialize
+!
+
 testNew
 	self should: [ PPToken new ] raise: Error.
 	
@@ -34,7 +38,7 @@
 testPrinting
 	| result |
 	result := PPToken on: 'var'.
-	self assert: (result printString includesSubString: 'PPToken(var)')
+	self assert: (result printString findString: 'PPToken[1,3]') > 0
 !
 
 testSize
@@ -62,13 +66,9 @@
 !
 
 testValue
-	| input result |
-	input := 'foo'.
-	result := self 
-		parse: input
-		using: self identifier.
-	self assert: result value = input.
-	self deny: result value == input
+	| result |
+	result := PPToken on: 'var'.
+	self should: [ result value ] raise: Notification
 ! !
 
 !PPTokenTest methodsFor:'testing-comparing'!
@@ -98,12 +98,12 @@
 !PPTokenTest methodsFor:'testing-querying'!
 
 testColumn
-        | input parser result |
-        Smalltalk isSmalltalkX ifTrue:[
-            input := '1' , (String with: Character return) , '12' , (String with: Character return with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        ] ifFalse:[
-            input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        ].
+        | 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 
@@ -112,12 +112,12 @@
 !
 
 testLine
-        | input parser result |
-        Smalltalk isSmalltalkX ifTrue:[
-            input := '1' , (String with: Character return) , '12' , (String with: Character return with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        ] ifFalse:[
-            input := '1' , (String with: Character cr) , '12' , (String with: Character cr with: Character lf) , '123' , (String with: Character lf) , '1234'.
-        ].
+        | 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 
@@ -125,6 +125,27 @@
                 do: [ :token :line | self assert: token line = line ]
 ! !
 
+!PPTokenTest methodsFor:'testing-values'!
+
+testInputValue
+	| input result |
+	input := 'foo'.
+	result := self 
+		parse: input
+		using: self identifier.
+	self assert: result inputValue = 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)
+! !
+
 !PPTokenTest methodsFor:'utilities'!
 
 parse: aString using: aParser
@@ -134,13 +155,14 @@
 !PPTokenTest class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.4 2012-12-01 15:09:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.5 2014-03-04 14:34:24 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.4 2012-12-01 15:09:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPTokenTest.st,v 1.5 2014-03-04 14:34:24 cg Exp $'
 !
 
 version_SVN
-    ^ '§Id: PPTokenTest.st 4 2010-12-18 17:02:23Z kursjan §'
+    ^ '$Id: PPTokenTest.st,v 1.5 2014-03-04 14:34:24 cg Exp $'
 ! !
+