Removed class PPAbstractParseTest.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 01 Nov 2014 00:34:30 +0000
changeset 404 8da796db7f95
parent 403 7063d523b064
child 405 0470a5e6e712
Removed class PPAbstractParseTest. It was a duplicate of PPAbstractParserTest.
tests/Make.proto
tests/Make.spec
tests/PPAbstractParseTest.st
tests/PPMappingTest.st
tests/abbrev.stc
tests/bc.mak
tests/libInit.cc
tests/stx_goodies_petitparser_tests.st
tests/tests.rc
--- a/tests/Make.proto	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/Make.proto	Sat Nov 01 00:34:30 2014 +0000
@@ -127,7 +127,6 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)PPAbstractParseTest.$(O) PPAbstractParseTest.$(H): PPAbstractParseTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPAbstractParserTest.$(O) PPAbstractParserTest.$(H): PPAbstractParserTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPArithmeticParser.$(O) PPArithmeticParser.$(H): PPArithmeticParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPContextMementoTest.$(O) PPContextMementoTest.$(H): PPContextMementoTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -138,7 +137,7 @@
 $(OUTDIR)PPComposedTest.$(O) PPComposedTest.$(H): PPComposedTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCompositeParserTest.$(O) PPCompositeParserTest.$(H): PPCompositeParserTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPExtensionTest.$(O) PPExtensionTest.$(H): PPExtensionTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PPMappingTest.$(O) PPMappingTest.$(H): PPMappingTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParseTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPMappingTest.$(O) PPMappingTest.$(H): PPMappingTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPObjectTest.$(O) PPObjectTest.$(H): PPObjectTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPParserTest.$(O) PPParserTest.$(H): PPParserTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPPredicateTest.$(O) PPPredicateTest.$(H): PPPredicateTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/tests/Make.spec	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/Make.spec	Sat Nov 01 00:34:30 2014 +0000
@@ -50,7 +50,6 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
-	PPAbstractParseTest \
 	PPAbstractParserTest \
 	PPArithmeticParser \
 	PPContextMementoTest \
@@ -75,7 +74,6 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)PPAbstractParseTest.$(O) \
     $(OUTDIR_SLASH)PPAbstractParserTest.$(O) \
     $(OUTDIR_SLASH)PPArithmeticParser.$(O) \
     $(OUTDIR_SLASH)PPContextMementoTest.$(O) \
--- a/tests/PPAbstractParseTest.st	Sat Nov 01 00:30:28 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-"{ Package: 'stx:goodies/petitparser/tests' }"
-
-TestCase subclass:#PPAbstractParseTest
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	category:'PetitTests-Core'
-!
-
-
-!PPAbstractParseTest class methodsFor:'accessing'!
-
-packageNamesUnderTest
-	^ #('PetitParser' 'PetitTests')
-! !
-
-!PPAbstractParseTest class methodsFor:'testing'!
-
-isAbstract
-	^ self name = #PPAbstractParseTest
-! !
-
-!PPAbstractParseTest methodsFor:'utilities'!
-
-assert: aParser fail: aCollection
-	self assert: aParser fail: aCollection end: 0
-!
-
-assert: aParser fail: aCollection end: anInteger
-	| stream result |
-	self 
-		assert: aParser isPetitParser
-		description: 'Parser invalid'.
-	stream := aCollection asPetitStream.
-	result := aParser parse: stream.
-	self 
-		assert: result isPetitFailure
-		description: 'Parser did not fail'.
-	self
-		assert: stream position = anInteger
-		description: 'Parser failed at wrong position'
-!
-
-assert: aParser parse: aCollection
-	self assert: aParser parse: aCollection to: nil end: aCollection size 
-!
-
-assert: aParser parse: aCollection end: anInteger
-	self assert: aParser parse: aCollection to: nil end: anInteger
-!
-
-assert: aParser parse: aCollection to: anObject
-	self assert: aParser parse: aCollection to: anObject end: aCollection size 
-!
-
-assert: aParser parse: aParseObject to: aTargetObject end: anInteger
-        | stream result |
-        self 
-                assert: aParser isPetitParser
-                description: 'Parser invalid'.
-        stream := aParseObject asPetitStream.
-        result := aParser parse: stream.
-        aTargetObject isNil
-                ifTrue: [ self deny: result isPetitFailure ]
-                ifFalse: [ self assert: result = aTargetObject ].
-        self 
-                assert: stream position = anInteger
-                description: 'Parser accepted at wrong position'
-
-    "Modified: / 18-12-2010 / 18:01:30 / Jan Kurs <kurs.jan@post.cz>"
-!
-
-assert: aParser parse: aParserObject toToken: from stop: to
-	| token |
-	token := PPToken on: aParserObject start: from stop: to.
-	^ self assert: aParser parse: aParserObject to: token
-!
-
-assert: aParser parse: aParserObject toToken: from stop: to end: end
-	| token |
-	token := PPToken on: aParserObject start: from stop: to.
-	^ self assert: aParser parse: aParserObject to: token end: end
-! !
-
-!PPAbstractParseTest class methodsFor:'documentation'!
-
-version
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPAbstractParseTest.st,v 1.3 2012-05-04 22:09:07 vrany Exp $'
-!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPAbstractParseTest.st,v 1.3 2012-05-04 22:09:07 vrany Exp $'
-!
-
-version_SVN
-    ^ '§Id: PPAbstractParseTest.st 4 2010-12-18 17:02:23Z kursjan §'
-! !
-
--- a/tests/PPMappingTest.st	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/PPMappingTest.st	Sat Nov 01 00:34:30 2014 +0000
@@ -1,6 +1,6 @@
 "{ Package: 'stx:goodies/petitparser/tests' }"
 
-PPAbstractParseTest subclass:#PPMappingTest
+PPAbstractParserTest subclass:#PPMappingTest
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
--- a/tests/abbrev.stc	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/abbrev.stc	Sat Nov 01 00:34:30 2014 +0000
@@ -1,7 +1,6 @@
 # automagically generated by the project definition
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
-PPAbstractParseTest PPAbstractParseTest stx:goodies/petitparser/tests 'PetitTests-Core' 1
 PPAbstractParserTest PPAbstractParserTest stx:goodies/petitparser/tests 'PetitTests-Core' 1
 PPArithmeticParser PPArithmeticParser stx:goodies/petitparser/tests 'PetitTests-Examples' 0
 PPContextMementoTest PPContextMementoTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1
--- a/tests/bc.mak	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/bc.mak	Sat Nov 01 00:34:30 2014 +0000
@@ -73,7 +73,6 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)PPAbstractParseTest.$(O) PPAbstractParseTest.$(H): PPAbstractParseTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPAbstractParserTest.$(O) PPAbstractParserTest.$(H): PPAbstractParserTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPArithmeticParser.$(O) PPArithmeticParser.$(H): PPArithmeticParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPContextMementoTest.$(O) PPContextMementoTest.$(H): PPContextMementoTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -84,7 +83,7 @@
 $(OUTDIR)PPComposedTest.$(O) PPComposedTest.$(H): PPComposedTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCompositeParserTest.$(O) PPCompositeParserTest.$(H): PPCompositeParserTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPExtensionTest.$(O) PPExtensionTest.$(H): PPExtensionTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PPMappingTest.$(O) PPMappingTest.$(H): PPMappingTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParseTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPMappingTest.$(O) PPMappingTest.$(H): PPMappingTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPObjectTest.$(O) PPObjectTest.$(H): PPObjectTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPParserTest.$(O) PPParserTest.$(H): PPParserTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPPredicateTest.$(O) PPPredicateTest.$(H): PPPredicateTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/tests/libInit.cc	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/libInit.cc	Sat Nov 01 00:34:30 2014 +0000
@@ -27,7 +27,6 @@
 void _libstx_goodies_petitparser_tests_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libstx_goodies_petitparser_tests", _libstx_goodies_petitparser_tests_Init, "stx:goodies/petitparser/tests");
-_PPAbstractParseTest_Init(pass,__pRT__,snd);
 _PPAbstractParserTest_Init(pass,__pRT__,snd);
 _PPArithmeticParser_Init(pass,__pRT__,snd);
 _PPContextMementoTest_Init(pass,__pRT__,snd);
--- a/tests/stx_goodies_petitparser_tests.st	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/stx_goodies_petitparser_tests.st	Sat Nov 01 00:34:30 2014 +0000
@@ -88,7 +88,6 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        PPAbstractParseTest
         PPAbstractParserTest
         PPArithmeticParser
         PPContextMementoTest
--- a/tests/tests.rc	Sat Nov 01 00:30:28 2014 +0000
+++ b/tests/tests.rc	Sat Nov 01 00:34:30 2014 +0000
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2014\nCopyright eXept Software AG 1998-2014\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.4.0\0"
-      VALUE "ProductDate", "Sat, 01 Nov 2014 00:29:00 GMT\0"
+      VALUE "ProductDate", "Sat, 01 Nov 2014 00:33:33 GMT\0"
     END
 
   END