hg/stx-libjava: src/JavaClassRefTests.st@f4ebf5cf3f89 (annotated)

877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	1	"
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	2	COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	3
1155 d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	4	New code and modifications done at SWING Research Group [1]:
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	5
877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	6	COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	7	SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	8
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	9	This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	10	only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	11	inclusion of the above copyright notice. This software may not
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	12	be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	13	other person. No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	14	hereby transferred.
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	15
1155 d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	16	[1] Code written at SWING Research Group contains a signature
d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	17	of one of the above copright owners. For exact set of such code,
d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	18	see the differences between this version and version stx:libjava
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	19	as of 1.9.2010
877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	20	"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	21	"{ Package: 'stx:libjava' }"
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	22
1515 f4ebf5cf3f89 - JavaClassReaderTests vranyj1 parents: 1245 diff changeset	23	JavaRefsAndConstantPoolTestCase subclass:#JavaClassRefTests
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	24	instanceVariableNames:''
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	25	classVariableNames:''
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	26	poolDictionaries:''
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	27	category:'Languages-Java-Tests-RuntimeConstantPool'
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	28	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	29
877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	30	!JavaClassRefTests class methodsFor:'documentation'!
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	31
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	32	copyright
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	33	"
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	34	COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	35
1155 d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	36	New code and modifications done at SWING Research Group [1]:
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	37
877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	38	COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	39	SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	40
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	41	This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	42	only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	43	inclusion of the above copyright notice. This software may not
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	44	be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	45	other person. No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	46	hereby transferred.
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	47
1155 d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	48	[1] Code written at SWING Research Group contains a signature
d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	49	of one of the above copright owners. For exact set of such code,
d6f6d5fc0343 vranyj1 parents: 1152 diff changeset	50	see the differences between this version and version stx:libjava
1152 040cba55a7d2 Copyright fixes vranyj1 parents: 1021 diff changeset	51	as of 1.9.2010
877 f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	52
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	53	"
f5a5b93e1c78 Cleanup phase 1 vranyj1 parents: 817 diff changeset	54	! !
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	55
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	56	!JavaClassRefTests methodsFor:'arrays'!
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	57
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	58	testCorrectArrayCreation
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	59	\|classRef result expectedResult \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	60
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	61	classRef := self getClassRefNamed: '[Ljava/lang/Object;'.
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	62	result := classRef resolve.
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	63	expectedResult := JavaVM javaArrayClassFor: (Java classForName: 'java.lang.Object').
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	64	self assertTrue: (result = expectedResult).
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	65
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	66	"Created: / 23-05-2011 / 21:15:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	67	!
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	68
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	69	testCorrectMultiArrayCreation
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	70	\| classRef result expectedResult \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	71
1021 8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon.. hlopkmar parents: 877 diff changeset	72	classRef := self getClassRefNamed: '[[Ljava/lang/Object;'.
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	73	result := classRef resolve.
1021 8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon.. hlopkmar parents: 877 diff changeset	74	expectedResult := JavaVM javaArrayClassFor: (JavaVM
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon.. hlopkmar parents: 877 diff changeset	75	javaArrayClassFor: (Java classForName: 'java.lang.Object')).
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon.. hlopkmar parents: 877 diff changeset	76	self assertTrue: (result name = expectedResult name).
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	77
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	78	"Created: / 23-05-2011 / 21:15:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	79	! !
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	80
777 e6e61412ae43 refactoring tests.. and more needed hlopkmar parents: 773 diff changeset	81	!JavaClassRefTests methodsFor:'permission tests'!
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	82
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	83	testAccessingNonPublicFromInside
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	84	\| javaClassRef initString throwedException \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	85
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	86	self enableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	87
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	88	[ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	89	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	90	javaClassRef owner: (Java classForName: 'stx.libjava.tests.mocks.Crate').
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	91	javaClassRef resolve. ] on: Error
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	92	do: [:e \| throwedException := e ].
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	93	self assertTrue: (throwedException isNil).
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	94	self disableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	95
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	96	"Created: / 13-04-2011 / 13:42:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	97	"Modified: / 23-05-2011 / 17:58:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	98	!
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	99
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	100	testAccessingNonPublicFromOutside
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	101	\| javaClassRef initString throwedException \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	102
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	103	self enableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	104
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	105	[ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	106	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	107	javaClassRef owner: (Java classForName: 'java.lang.Object').
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	108	javaClassRef resolve. ] on: Error
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	109	do: [:e \| throwedException := e ].
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	110	self assertTrue: (throwedException notNil
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	111	and: [ throwedException messageText = 'IllegalAccessError' ]).
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	112	self disableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	113
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	114	"Created: / 13-04-2011 / 13:37:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	115	"Modified: / 23-05-2011 / 17:58:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	116	!
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	117
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	118	testAccessingPublic
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	119	\| javaClassRef initString \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	120
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	121	self enableMockedExceptionThrowing.
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	122	self shouldnt:
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	123	[ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	124	javaClassRef := self getClassRefNamed: initString.
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	125	javaClassRef owner: (Java classForName: 'java.lang.Object').
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	126	javaClassRef resolve. ]
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	127	raise: Error.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	128	self disableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	129
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	130	"Created: / 13-04-2011 / 13:36:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	131	"Modified: / 23-05-2011 / 17:58:24 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	132	!
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	133
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	134	testNonPublicClassPresent
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	135	\| javaClassRef initString \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	136
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	137	self enableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	138	initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	139	javaClassRef := self getClassRefNamed: initString.
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	140	javaClassRef owner: (Java
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	141	classForName: 'stx.libjava.tests.mocks.SubclassOfNonPublicClass').
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	142	javaClassRef resolve.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	143	self assertTrue: (javaClassRef valueCache notNil).
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	144	self disableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	145
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	146	"Created: / 13-04-2011 / 13:38:49 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	147	"Modified: / 23-05-2011 / 17:58:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	148	!
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	149
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	150	testPublicClassPresent
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	151	\| javaClassRef initString \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	152
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	153	self enableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	154	initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	155	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	156	javaClassRef owner: (Java classForName: 'java.lang.Object').
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	157	javaClassRef resolve.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	158	self assertTrue: (javaClassRef valueCache notNil).
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	159	self disableMockedExceptionThrowing.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	160
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	161	"Created: / 13-04-2011 / 13:39:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	162	"Modified: / 23-05-2011 / 17:58:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	163	! !
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	164
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	165	!JavaClassRefTests methodsFor:'primitives'!
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	166
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	167	testAllPrimitiveArrayClasses
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	168	\| classRef descriptor \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	169
1226 bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	170	#( $B $D $F $I $J $S $Z ) do:
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	171	[:each \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	172	descriptor := '[' , each.
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	173	classRef := self getClassRefNamed: descriptor.
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	174	self assertTrue: ((JavaDescriptor readFromString: descriptor) javaClass
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	175	= classRef resolve) ].
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	176
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	177	"Created: / 23-05-2011 / 20:49:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	178	!
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	179
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	180	testAllPrimitiveClasses
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	181	\| classRef \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	182
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	183	#( $B $C $D $F $I $J $S $Z )
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	184	do:
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	185	[:each \|
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	186
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	187	classRef := self getClassRefNamed: each asString.
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	188	self assertTrue: ((JavaDescriptor baseTypes at: each) = classRef resolve) ].
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	189
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	190	"Created: / 23-05-2011 / 20:48:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	191	!
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	192
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	193	testAllPrimitiveMultiArrayClasses
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	194	\| classRef descriptor \|
1226 bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	195	#( $B $D $F $I $J $S $Z ) do: [
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	196	:each \|
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	197	descriptor := '[[[[' , each.
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	198	classRef := self getClassRefNamed: descriptor.
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	199	self assertTrue: ((JavaDescriptor readFromString: descriptor) javaClass name
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	200	= classRef resolve name)
bd1d5c4ca4a8 fixes to make resolving tests pass hlopkmar parents: 1155 diff changeset	201	].
817 3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	202
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	203	"Created: / 23-05-2011 / 20:50:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	204	! !
3f2405c6ef88 its nice to work after jv :) after writing tests I surprisedly realized, that he already implemented primitives and primitive arrays in JavaClassRef2 :) hlopkmar parents: 816 diff changeset	205
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	206	!JavaClassRefTests methodsFor:'resolving static tests'!
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	207
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	208	testCorrectStaticResolving
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	209	\| javaClassRef initString result expectedResult \|
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	210	initString := 'Lstx/libjava/tests/mocks/ClassWithInnerClasses$InnerStatic;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	211	javaClassRef := self getClassRefNamed: initString.
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	212	javaClassRef
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	213	owner: (Java classForName: 'stx.libjava.tests.mocks.ClassWithInnerClasses').
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	214	expectedResult := Java
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	215	classForName: 'stx.libjava.tests.mocks.ClassWithInnerClasses$InnerStatic'.
1245 7cf4e252749a resolving unified.. dont forget to update librun hlopkmar parents: 1226 diff changeset	216	result := javaClassRef resolve.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	217	self assertTrue: (result = expectedResult).
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	218
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	219	"Created: / 28-04-2011 / 21:51:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1245 7cf4e252749a resolving unified.. dont forget to update librun hlopkmar parents: 1226 diff changeset	220	"Modified: / 08-12-2011 / 19:24:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	221	! !
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	222
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	223	!JavaClassRefTests methodsFor:'resolving tests'!
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	224
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	225	testCorrectInstanceCreation
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	226	\| javaClassRef initString \|
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	227
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	228	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	229	javaClassRef := self getClassRefNamed: initString.
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	230	self assertFalse: (javaClassRef isResolved).
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	231	self assertTrue: (javaClassRef valueCache isNil).
fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	232	self assertTrue: (javaClassRef name = initString).
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	233
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	234	"Created: / 08-04-2011 / 14:01:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	235	"Modified: / 23-05-2011 / 17:58:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	236	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	237
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	238	testCorrectResolving
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	239	\| javaClassRef initString result expectedResult \|
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	240
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	241	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	242	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	243	javaClassRef owner: (Java classForName: 'java.lang.Object').
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	244	expectedResult := Java classForName: 'java.lang.String'.
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	245	result := javaClassRef resolve.
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	246	self assertTrue: (result = expectedResult).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	247
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	248	"Created: / 08-04-2011 / 14:07:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	249	"Modified: / 23-05-2011 / 17:58:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	250	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	251
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	252	testInvalidation
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	253	\| javaClassRef initString \|
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	254
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	255	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	256	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	257	javaClassRef owner: (Java classForName: 'java.lang.Object').
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	258	self assertTrue: (javaClassRef isResolved not).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	259	javaClassRef resolve.
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	260	self assertTrue: (javaClassRef isResolved).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	261	javaClassRef invalidate.
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	262	self assertTrue: (javaClassRef isResolved not).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	263
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	264	"Created: / 08-04-2011 / 14:09:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	265	"Modified: / 23-05-2011 / 17:58:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	266	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	267
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	268	testInvalidationForClassNegative
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	269	\| javaClassRef initString \|
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	270
771 fb8026dda011 Merged with /trunk vranyj1 parents: 764 diff changeset	271	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	272	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	273	javaClassRef owner: (Java classForName: 'java.lang.Object').
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	274	self assertTrue: (javaClassRef isResolved not).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	275	javaClassRef resolve.
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	276	self assertTrue: (javaClassRef isResolved).
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	277	javaClassRef invalidateForClass: 'Ljava/lang/Object;'.
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	278	self assertTrue: (javaClassRef isResolved).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	279
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	280	"Created: / 08-04-2011 / 16:21:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	281	"Modified: / 23-05-2011 / 17:58:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	282	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	283
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	284	testInvalidationForClassPositive
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	285	\| javaClassRef initString \|
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	286
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	287	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	288	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	289	javaClassRef owner: (Java classForName: 'java.lang.Object').
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	290	self assertTrue: (javaClassRef isResolved not).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	291	javaClassRef resolve.
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	292	self assertTrue: (javaClassRef isResolved).
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	293	javaClassRef invalidateForClass: initString.
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	294	self assertTrue: (javaClassRef isResolved not).
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	295
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	296	"Created: / 08-04-2011 / 16:21:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	297	"Modified: / 23-05-2011 / 17:57:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	298	!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	299
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	300	testResolving
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	301	\| javaClassRef initString \|
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	302
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	303	initString := 'Ljava/lang/String;'.
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	304	javaClassRef := self getClassRefNamed: initString.
761 43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	305	javaClassRef owner: (Java classForName: 'java.lang.Object').
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	306	self assertTrue: (javaClassRef isResolved not).
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	307	javaClassRef resolve.
43e017ec7958 Merged with /branches/jk vranyj1 parents: 758 diff changeset	308	self assertTrue: (javaClassRef isResolved).
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	309
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	310	"Created: / 08-04-2011 / 14:04:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
816 4e3072021201 all tests fixed.. updated interfaceMethodRef to checkPermissions (which were not checked until now ehm) hlopkmar parents: 777 diff changeset	311	"Modified: / 23-05-2011 / 17:57:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758 be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	312	! !
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	313
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	314	!JavaClassRefTests class methodsFor:'documentation'!
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	315
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	316	version_SVN
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	317	^ '$Id$'
be8e84381ce0 Merged with /branches/jk vranyj1 parents: diff changeset	318	! !

author	vranyj1
	Fri, 06 Jul 2012 20:58:09 +0000
branch	jk_new_structure
changeset 1515	f4ebf5cf3f89
parent 1245	7cf4e252749a
child 1532	ae63ecbd509e
permissions	-rw-r--r--