--- a/packages/PackageSmalltalkManipulationTestCases.st	Tue May 13 00:37:50 2003 +0200
+++ b/packages/PackageSmalltalkManipulationTestCases.st	Tue May 13 08:04:48 2003 +0200
@@ -111,6 +111,9 @@
     "tests that new classes are automatically included in workingPackage"
      | packagedClass |
     [
+        "prerequisites"
+        self assert:(Smalltalk classNamed:#QWERTZ2) isNil.
+
         self createClassNamed:#QWERTZ2.
         self assert:(packageManager workingPackage includesPackagedClassNamed:#QWERTZ2).
         packagedClass := (packageManager workingPackage packagedClassNamed:#QWERTZ2).
@@ -163,9 +166,6 @@
 testClassRedefine
     "tests that new classes are automatically included in workingPackage"
      | packagedClass packageTestCases workingPackage newPackage |
-    Error handle:[:ex |
-        self halt.
-    ] do:[
     [
         packageTestCases := packageManager newPackageNamed:#'packageTestCases'.
         workingPackage := packageManager workingPackage.
@@ -197,11 +197,10 @@
         packageManager moveClass:QWERTZ2 toPackage:packageTestCases.
     ] ensure:[
         packageManager unloadPackageNamed:#'packageTestCases'.
-        QWERTZ2 ifNotNil:[
-            QWERTZ2 removeFromSystem.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
         ].
     ]
-    ]
 !
 
 testMethodCreation
@@ -248,6 +247,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -284,6 +286,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -326,6 +331,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -375,6 +383,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -424,6 +435,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 ! !
 
@@ -615,6 +629,9 @@
 
     ] ensure:[
         packageManager unloadPackageNamed:#'packageTestCases'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -654,6 +671,9 @@
     ] ensure:[
         packageManager workingPackage:packageManager defaultPackage.
         packageManager unloadPackageNamed:#'packageTestCases'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -716,6 +736,9 @@
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
         packageManager unloadPackageNamed:#'package2'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -795,6 +818,9 @@
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
         packageManager unloadPackageNamed:#'package2'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -855,6 +881,9 @@
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
         packageManager unloadPackageNamed:#'package2'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -909,6 +938,9 @@
     ] ensure:[
         packageManager unloadPackageNamed:#'package1'.
         packageManager unloadPackageNamed:#'package2'.
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[ 
+            (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
     ]
 !
 
@@ -919,16 +951,23 @@
     "This one tests if the methods are still kept within the pacakge as packagedMethods"
     "WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DONT correct during the debugger otherwise changes made could be removed!!!!!!"
      | package1 package2 packagedMethod1 method1  |
+
     [
+        "prerequisites"
+        self assert:(Smalltalk classNamed:#QWERTZ2) isNil.
+
         package1 := packageManager newPackageNamed:#'package1'.
         package2 := packageManager newPackageNamed:#'package2'.
 
-        self createClassNamed:#QWERTZ2.
+        self createClassNamed:#QWERTZ2.   
         self createMethodFor:QWERTZ2 source:'testBasicMethodCreation 1 + 1'.
         self createMethodFor:QWERTZ2 source:'testBasicMethodCreation2 1 + 1'.
         method1 := QWERTZ2 compiledMethodAt:#testBasicMethodCreation.
 
         packageManager moveClass:QWERTZ2 toPackage:package1.
+        self assert:(package1 definesSelector:method1 name forClassNamed:#QWERTZ2). 
+        self assert:(package1 isDependentOnMethodNamed:method1 name forClassNamed:#QWERTZ2). 
+
         "This blocks method1 from package1"
         packageManager addMethod:method1 toPackage:package2.
 
@@ -965,6 +1004,9 @@
 
 
     ] ensure:[
+        (Smalltalk classNamed:#QWERTZ2) ifNotNil:[
+                (Smalltalk classNamed:#QWERTZ2) removeFromSystem.
+        ].
         packageManager unloadPackageNamed:#'package1'.
         packageManager unloadPackageNamed:#'package2'.
     ]
@@ -973,5 +1015,5 @@
 !PackageSmalltalkManipulationTestCases class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/packages/PackageSmalltalkManipulationTestCases.st,v 1.2 2003-05-12 11:11:42 james Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/packages/PackageSmalltalkManipulationTestCases.st,v 1.3 2003-05-13 06:04:48 james Exp $'
 ! !