--- a/TestCase.st	Tue Sep 04 21:06:35 2001 +0200
+++ b/TestCase.st	Tue Oct 16 13:41:47 2001 +0200
@@ -14,10 +14,13 @@
     "ensure, that the sunit extensions are loaded"
 
     (Class implements:#sunitName) ifFalse:[
-        Smalltalk fileIn:'extensions.st' inPackage:(self package)
+	(Smalltalk fileIn:'extensions.st' inPackage:(self package))
+	ifFalse:[
+	    (Smalltalk fileIn:'source/extensions.st' inPackage:(self package))
+	]
     ].    
     TestFailure isLoaded ifFalse:[
-        TestFailure autoload
+	TestFailure autoload
     ].
 
     "
@@ -40,12 +43,12 @@
 !
 
 suite
-        | testSelectors result |
-        testSelectors := self sunitSelectors select: [:each | 'test*' match: each].
-        testSelectors sort.
-        result := TestSuite new.
-        testSelectors do: [:each | result addTest: (self selector: each)].
-        ^result
+	| testSelectors result |
+	testSelectors := self sunitSelectors select: [:each | 'test*' match: each].
+	testSelectors sort.
+	result := TestSuite new.
+	testSelectors do: [:each | result addTest: (self selector: each)].
+	^result
 
     "Modified: / 21.6.2000 / 10:05:24 / Sames"
 ! !
@@ -141,12 +144,12 @@
 !TestCase methodsFor:'Private'!
 
 executeShould: aBlock inScopeOf: anExceptionalEvent 
-        [[aBlock value]
-                on: anExceptionalEvent
-                do: [:ex | ^true]]
-                        on: TestResult error
-                        do: [:ex | ^false].
-        ^false.
+	[[aBlock value]
+		on: anExceptionalEvent
+		do: [:ex | ^true]]
+			on: TestResult error
+			do: [:ex | ^false].
+	^false.
 
     "Modified: / 21.6.2000 / 10:03:03 / Sames"
 !
@@ -166,12 +169,12 @@
 !
 
 openDebuggerOnFailingTestMethod
-        "SUnit has halted one step in front of the failing test method. 
-        Step over the 'self halt' and send into 'self perform: testSelector' 
-        to see the failure from the beginning"
+	"SUnit has halted one step in front of the failing test method. 
+	Step over the 'self halt' and send into 'self perform: testSelector' 
+	to see the failure from the beginning"
 
-        "/ self halt.
-        self perform: testSelector asSymbol
+	"/ self halt.
+	self perform: testSelector asSymbol
 
     "Modified: / 21.6.2000 / 10:03:37 / Sames"
 !
@@ -188,15 +191,15 @@
 !
 
 runCase
-        self setUp.
-        [self perform: testSelector asSymbol] valueNowOrOnUnwindDo: [self tearDown]
+	self setUp.
+	[self perform: testSelector asSymbol] valueNowOrOnUnwindDo: [self tearDown]
 
     "Modified: / 21.6.2000 / 10:04:18 / Sames"
 !
 
 runCaseAsFailure
-        self setUp.
-        [[self openDebuggerOnFailingTestMethod] valueNowOrOnUnwindDo: [self tearDown]] fork
+	self setUp.
+	[[self openDebuggerOnFailingTestMethod] valueNowOrOnUnwindDo: [self tearDown]] fork
 
     "Modified: / 21.6.2000 / 10:04:33 / Sames"
 !
@@ -210,6 +213,6 @@
 !TestCase class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.12 2001-09-04 13:07:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.13 2001-10-16 11:41:47 cg Exp $'
 ! !
 TestCase initialize!