Mercurial Mercurial > hg > stx-goodies-petitparser / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
analyzer/tests/PPSearcherTest.st
changeset 402 1d7503124bc8
parent 210 d9e67752b114
child 425 0a5c4929af56 
--- a/analyzer/tests/PPSearcherTest.st	Thu Oct 30 23:52:47 2014 +0000
+++ b/analyzer/tests/PPSearcherTest.st	Sat Nov 01 00:12:10 2014 +0000
@@ -20,146 +20,112 @@
 	| result |
 	searcher
 		matches: PPPattern any
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher
-		execute: ($a asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
-	
-	result := searcher
-		execute: ($a asParser star)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 2.
-	
-	result := searcher
-		execute: ($a asParser , $b asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 3
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
+	result := searcher execute: $a asParser star initialAnswer: OrderedCollection new.
+	self assert: result size equals: 2.
+	result := searcher execute: $a asParser , $b asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 3
 !
 
 testClassPattern
 	| result |
-	searcher 
+	searcher
 		matches: (PPPattern class: PPLiteralObjectParser)
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher
-		execute: ($a asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
 	self assert: (result allSatisfy: [ :each | each class = PPLiteralObjectParser ]).
-	
-	result := searcher
-		execute: ('abc' asParser)
-		initialAnswer: OrderedCollection new.
+	result := searcher execute: 'abc' asParser initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: (#any asParser)
-		initialAnswer: OrderedCollection new.
+	result := searcher execute: #any asParser initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: ($a asParser / #any asParser , $b asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 2.
+	result := searcher execute: $a asParser / #any asParser , $b asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 2.
 	self assert: (result allSatisfy: [ :each | each class = PPLiteralObjectParser ])
 !
 
 testKindPattern
 	| result |
-	searcher 
+	searcher
 		matches: (PPPattern kind: PPLiteralParser)
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher
-		execute: ($a asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
 	self assert: (result allSatisfy: [ :each | each class = PPLiteralObjectParser ]).
-	
-	result := searcher
-		execute: ('abc' asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
+	result := searcher execute: 'abc' asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
 	self assert: (result allSatisfy: [ :each | each class = PPLiteralSequenceParser ]).
-	
-	result := searcher
-		execute: (#any asParser)
-		initialAnswer: OrderedCollection new.
+	result := searcher execute: #any asParser initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: ($a asParser / #any asParser , $b asParser)
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 2.
+	result := searcher execute: $a asParser / #any asParser , $b asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 2.
 	self assert: (result allSatisfy: [ :each | each class = PPLiteralObjectParser ])
 !
 
 testMatchesAny
 	| result |
 	searcher
-		matchesAnyOf: (Array 
-			with: $a asParser
-			with: $b asParser)
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher
-		execute: $a asParser , $b asParser , $c asParser
-		initialAnswer: OrderedCollection new.
-	
-	self assert: result size = 2.
-	self assert: result first literal = $a.
-	self assert: result last literal = $b
+		matchesAnyOf: (Array with: $a asParser with: $b asParser)
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser , $b asParser , $c asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 2.
+	self assert: result first literal equals: $a.
+	self assert: result last literal equals: $b
 !
 
 testMultiplePattern
 	| result |
 	searcher
 		matches: $a asParser
-		do: [ :parser :answer | answer first add: parser. answer ].
+		do: [ :parser :answer | 
+			answer first add: parser.
+			answer ].
 	searcher
 		matches: PPPattern any
-		do: [ :parser :answer | answer second add: parser. answer ].
-
+		do: [ :parser :answer | 
+			answer second add: parser.
+			answer ].
 	result := searcher
 		execute: $a asParser , $a asParser , $b asParser
-		initialAnswer: (Array 
-			with: OrderedCollection new 
-			with: OrderedCollection new).
-	
-	self assert: result first size = 2.
-	self assert: result first first literal = $a.
-	self assert: result first last literal = $a.
-	
-	self assert: result last size = 2.
-	self assert: result last first class = PPSequenceParser.
-	self assert: result last last literal = $b
+		initialAnswer: (Array with: OrderedCollection new with: OrderedCollection new).
+	self assert: result first size equals: 2.
+	self assert: result first first literal equals: $a.
+	self assert: result first last literal equals: $a.
+	self assert: result last size equals: 2.
+	self assert: result last first class equals: PPSequenceParser.
+	self assert: result last last literal equals: $b
 !
 
 testNamePattern
 	| result |
-	searcher 
+	searcher
 		matches: (PPPattern name: 'foo')
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher 
-		execute: ($a asParser)
-		initialAnswer: OrderedCollection new.
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: ($a asParser name: 'foo')
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
-	self assert: result first name = 'foo'.
-	
-	result := searcher
-		execute: ($a asParser name: 'bar') , ($b asParser name: 'foo')
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
-	self assert: result first name = 'foo'
+	result := searcher execute: ($a asParser name: 'foo') initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
+	self assert: result first name equals: 'foo'.
+	result := searcher execute: ($a asParser name: 'bar') , ($b asParser name: 'foo') initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
+	self assert: result first name equals: 'foo'
 !
 
 testNewPattern
@@ -172,11 +138,8 @@
 	| recursive |
 	recursive := PPDelegateParser new.
 	recursive setParser: recursive.
-	searcher 
-		matches: recursive 
-		do: [ :parser :answer | parser ].
-	
-	self assert: (searcher execute: recursive) = recursive.
+	searcher matches: recursive do: [ :parser :answer | parser ].
+	self assert: (searcher execute: recursive) equals: recursive.
 	self assert: (searcher execute: $a asParser) isNil.
 	self assert: (searcher execute: $a asParser / $b asParser star) isNil
 !
@@ -185,27 +148,18 @@
 	| pattern result |
 	searcher
 		matches: (pattern := PPPattern any) , pattern
-		do: [ :parser :answer | answer add: parser; yourself ].
-
-	result := searcher
-		execute: ($a asParser , $b asParser)
-		initialAnswer: OrderedCollection new.
+		do: [ :parser :answer | 
+			answer
+				add: parser;
+				yourself ].
+	result := searcher execute: $a asParser , $b asParser initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: $a asParser , $a asParser
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1.
-	
-	result := searcher
-		execute: ($a asParser , ($a asParser , $b asParser))
-		initialAnswer: OrderedCollection new.
+	result := searcher execute: $a asParser , $a asParser initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1.
+	result := searcher execute: $a asParser , ($a asParser , $b asParser) initialAnswer: OrderedCollection new.
 	self assert: result isEmpty.
-	
-	result := searcher
-		execute: ($b asParser , ($a asParser , $a asParser))
-		initialAnswer: OrderedCollection new.
-	self assert: result size = 1
+	result := searcher execute: $b asParser , ($a asParser , $a asParser) initialAnswer: OrderedCollection new.
+	self assert: result size equals: 1
 ! !
 
 !PPSearcherTest methodsFor:'testing-copy'!
@@ -560,5 +514,10 @@
 
 version_CVS
     ^ '$Header: /cvs/stx/stx/goodies/petitparser/analyzer/tests/PPSearcherTest.st,v 1.1 2014-03-04 15:43:09 cg Exp $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !
hg/stx-goodies-petitparser