--- a/mercurial/HGStXTests.st	Tue Aug 05 23:02:02 2014 +0100
+++ b/mercurial/HGStXTests.st	Tue Aug 12 22:15:22 2014 +0100
@@ -96,13 +96,7 @@
         ]
     ].
     Class withoutUpdatingChangesDo:[
-        classes do:[:cls|
-            Smalltalk removeClass: cls.
-            cls isJavaClass ifTrue:[ 
-                JavaVM registry unregisterClass: cls.
-            ].
-        ].
-
+        classes do:[:cls|cls removeFromSystem].
         methods do:[:m|m mclass removeSelector: m selector]
     ].
 "/    Delay waitForSeconds: 1.
@@ -118,7 +112,7 @@
     ]
 
     "Created: / 16-11-2012 / 19:00:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 04-08-2014 / 01:32:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-08-2014 / 20:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_infrastructure
@@ -1742,12 +1736,12 @@
 class Foo {
 }
 '.
-    JavaVM registry registerClasses: classes.
+    JavaVM registry registerClasses: classes andWait: true.
     
 
     pm := HGPackageWorkingCopy named: #'mocks:hg/p5'.
     ct := pm commitTask.
-    ct message:'test_commit_java_01'.
+    ct message: testSelector.
     ct do.
     "
     repo workingCopy browse
@@ -1759,7 +1753,7 @@
     self assert: (changeset / 'java' / 'src' / 'mocks' / 'hg' / 'p5' / 'Foo.java' ) notNil.
 
     "Created: / 04-08-2014 / 01:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-08-2014 / 22:48:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-08-2014 / 20:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_commit_java_01b
@@ -1786,18 +1780,20 @@
 
 @stx.libjava.annotation.Package("mocks:hg/p5")
 public class Foo {
-    public class Bar {
-        public class Baz {
+    public static class Bar {
+        public Object foo() {
+            return new Object() { public int bar() { return 10; } };
         }
+
     }
 }
 '.
-    JavaVM registry registerClasses: classes.
+    JavaVM registry registerClasses: classes andWait: true.
     
 
     pm := HGPackageWorkingCopy named: #'mocks:hg/p5'.
     ct := pm commitTask.
-    ct message:'test_commit_java_01'.
+    ct message: testSelector.
     ct do.
     "
     repo workingCopy browse
@@ -1809,6 +1805,7 @@
     self assert: (changeset / 'java' / 'src' / 'mocks' / 'hg' / 'p5' / 'Foo.java' ) notNil.
 
     "Created: / 04-08-2014 / 01:43:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-08-2014 / 20:07:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGStXTests methodsFor:'tests - commit - nested'!