--- a/PPExtensionTest.st	Tue Mar 04 15:34:13 2014 +0100
+++ b/PPExtensionTest.st	Tue Mar 04 15:34:17 2014 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:goodies/petitparser' }"
 
-PPAbstractParseTest subclass:#PPExtensionTest
+PPAbstractParserTest subclass:#PPExtensionTest
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -17,6 +17,17 @@
 	self assert: parser fail: 'b'
 !
 
+testChoice
+	| parser |
+	parser := #(1 2) asChoiceParser.
+	self assert: parser parse: #(1) to: 1.
+	self assert: parser parse: #(2) to: 2.
+	self assert: parser parse: #(1 2) to: 1 end: 1.
+	self assert: parser parse: #(2 1) to: 2 end: 1.
+	self assert: parser fail: #().
+	self assert: parser fail: #(3)
+!
+
 testClosure
 	| parser |
 	parser := [ :stream | stream upTo: $s ] asParser.
@@ -61,13 +72,22 @@
 
 testRange
         | parser |
-        parser := $a ppMinus: $c.
+        parser := ($a to: $c) asParser.
         self assert: parser parse: 'a' to: $a.
         self assert: parser parse: 'b' to: $b.
         self assert: parser parse: 'c' to: $c.
         self assert: parser fail: 'd'
+!
 
-    "Modified: / 19-12-2010 / 18:15:45 / Jan Kurs <kurs.jan@post.cz>"
+testSequence
+	| parser |
+	parser := #(1 2) asSequenceParser.
+	self assert: parser parse: #(1 2) to: #(1 2).
+	self assert: parser parse: #(1 2 3) to: #(1 2) end: 2.
+	self assert: parser fail: #().
+	self assert: parser fail: #(1).
+	self assert: parser fail: #(1 1).
+	self assert: parser fail: #(1 1 2)
 !
 
 testString
@@ -121,13 +141,14 @@
 !PPExtensionTest class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPExtensionTest.st,v 1.3 2012-05-04 22:10:26 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPExtensionTest.st,v 1.4 2014-03-04 14:34:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPExtensionTest.st,v 1.3 2012-05-04 22:10:26 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPExtensionTest.st,v 1.4 2014-03-04 14:34:17 cg Exp $'
 !
 
 version_SVN
-    ^ '§Id: PPExtensionTest.st 5 2010-12-19 17:38:27Z kursjan §'
+    ^ '$Id: PPExtensionTest.st,v 1.4 2014-03-04 14:34:17 cg Exp $'
 ! !
+