src/JavaTestsLoader.st
branchjk_new_structure
changeset 857 98433a9afe3f
parent 852 37bd4bf93eb6
child 860 7c3f4b090534
--- a/src/JavaTestsLoader.st	Wed Jun 15 08:47:24 2011 +0000
+++ b/src/JavaTestsLoader.st	Mon Jun 20 18:22:22 2011 +0000
@@ -48,13 +48,14 @@
 
     JavaTestsResource new setUp.
     cp := JavaTestsResource classpathForMauve.
-    self loadIn: cp matching: pattern.
+    ^self loadIn: cp matching: pattern.
 
     "
         JavaTestsLoader loadMauve:'gnu.testlet.java.lang.String.*'
     "
 
     "Created: / 12-06-2011 / 21:56:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-06-2011 / 19:00:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 loadMauveToFix
@@ -85,16 +86,22 @@
 
 loadIn: directories matching: pattern
 
+    | classes |
+    
     JavaInitializedResource new setUp.  
     JavaLibrariesResource new setUp.
     JavaTestsResource new setUp.
+    classes := OrderedCollection new.
 
     directories do:
             [:each|
             each asFilename exists ifTrue:
-                [JavaClassReader loadClassesIn: each matching: pattern]]
+                [classes addAll: (JavaClassReader loadClassesIn: each matching: pattern)]].
+
+    ^classes
 
     "Created: / 11-06-2011 / 16:05:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-06-2011 / 19:02:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaTestsLoader class methodsFor:'documentation'!