# HG changeset patch # User Jan Vrany # Date 1357313032 0 # Node ID 10990021296abff50ec63e50814824f15dfbb800 # Parent 7fa6a6a8f1d8d6835cf79ed4d874442bdda1186b Fixes in tests. JavaCompiler>>#compile: has been changed to return an array of compiled classes. Tests were updated to reflect this change. diff -r 7fa6a6a8f1d8 -r 10990021296a experiments/ClassReloadingTests.st --- a/experiments/ClassReloadingTests.st Wed Jan 02 18:51:13 2013 +0100 +++ b/experiments/ClassReloadingTests.st Fri Jan 04 15:23:52 2013 +0000 @@ -90,10 +90,10 @@ ! compileAndRegister: sourceCode - |compiledClass| + |compiledClasses| - compiledClass := self compile: sourceCode. - ^ self register: compiledClass. + compiledClasses := self compile: sourceCode. + ^ self register: compiledClasses. "Created: / 16-12-2012 / 16:59:19 / Marcel Hlopko " ! @@ -107,13 +107,18 @@ "Created: / 16-12-2012 / 16:35:01 / Marcel Hlopko " ! -register: compiledClass +register: aClassOrArray - JavaVM registry registerClass: compiledClass. - ^JavaVM registry classNamed: compiledClass name + ^aClassOrArray isArray ifTrue:[ + JavaVM registry registerClasses: aClassOrArray . + JavaVM registry classNamed: aClassOrArray anElement name. + ] ifFalse:[ + JavaVM registry registerClass: aClassOrArray. + JavaVM registry classNamed: aClassOrArray name + ]. "Created: / 16-12-2012 / 17:02:04 / Marcel Hlopko " - "Modified: / 16-12-2012 / 23:56:00 / Jan Vrany " + "Modified: / 04-01-2013 / 14:54:58 / Jan Vrany " ! testInfrastructure @@ -157,7 +162,7 @@ callerClass | callerClass | - callerClass := JavaCompiler + callerClass := (JavaCompiler compile: ' package classReloadingTests; public class Caller { @@ -165,13 +170,14 @@ return c.toString(); } } -'. +') anElement. callerClass ifNil: [ self error: 'callerClass is expected to be not nil in these tests' ]. ^ callerClass. "Created: / 06-12-2012 / 21:41:35 / Marcel Hlopko " "Modified: / 18-12-2012 / 14:00:12 / Marcel Hlopko " + "Modified: / 04-01-2013 / 14:51:47 / Jan Vrany " ! compileAndRegisterChangingClassParent