--- a/src/JavaFieldRefTests.st Mon May 23 12:42:27 2011 +0000
+++ b/src/JavaFieldRefTests.st Mon May 23 14:53:35 2011 +0000
@@ -11,307 +11,274 @@
!JavaFieldRefTests methodsFor:'permission tests'!
testAccessingPPFromOutside
- | javaClassRef javaFieldRef initString throwedException |
-
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'packagePrivateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException messageText = 'IllegalAccessError').
- self disableMockedExceptionThrowing.
+ | javaFieldRef initString |
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ should:
+ [
+ javaFieldRef := self
+ getFieldRefNamed: 'packagePrivateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 14-04-2011 / 15:05:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:40:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPPFromPackage
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+
- self enableMockedExceptionThrowing.
- self shouldnt:
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'stx.libjava.tests.mocks.Crate').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'packagePrivateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'packagePrivateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef owner: (Java classForName: 'stx.libjava.tests.mocks.Crate').
javaFieldRef resolve. ]
- raise: Error.
- self disableMockedExceptionThrowing.
+ raise: Error
+ .
"Created: / 14-04-2011 / 15:08:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:41:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPPFromSubclass
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
+
- self enableMockedExceptionThrowing.
+
+
+initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
self shouldnt:
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef
- owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'packagePrivateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ [ javaFieldRef := self
+ getFieldRefNamed: 'packagePrivateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
javaFieldRef resolve. ]
raise: Error.
- self disableMockedExceptionThrowing.
"Created: / 14-04-2011 / 15:08:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:42:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPrivateFromOutside
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
+
+
+
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil namedAndTyped: (self getName: 'privateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ should:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'privateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 13-04-2011 / 14:44:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:42:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPrivateFromOutsideInNonPublic
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
+
+
+
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil namedAndTyped: (self getName: 'privateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
+ self
+ should:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'privateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 13-04-2011 / 14:47:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:43:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPrivateFromSubclass
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.SubclassOfPublicClass').
- javaFieldRef := JavaFieldRef2 in: nil namedAndTyped: (self getName: 'privateField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ should:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'privateField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 13-04-2011 / 14:49:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:45:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingProtectedFromOutside
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
+
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'protectedField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ should:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'protectedField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 13-04-2011 / 14:44:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:46:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingProtectedFromOutsideInNonPublic
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
+
+
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'protectedMethod'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
+ self
+ should:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'protectedField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+
+ javaFieldRef resolve. ]
+ raise: Error
+ suchThat: [:e | e messageText = 'IllegalAccessError' ].
"Created: / 13-04-2011 / 14:47:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:46:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingProtectedFromPackage
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
- self shouldnt:
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'stx.libjava.tests.mocks.Crate').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'protectedField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'protectedField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef owner: (Java classForName: 'stx.libjava.tests.mocks.Crate').
javaFieldRef resolve. ]
- raise: Error.
- self disableMockedExceptionThrowing.
+ raise: Error
+ .
"Created: / 14-04-2011 / 15:09:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:48:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingProtectedFromSubclass
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef
- owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'protectedField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException isNil).
- self disableMockedExceptionThrowing.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'protectedField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef
+ owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
+ javaFieldRef resolve. ]
+ raise: Error
+ .
"Created: / 13-04-2011 / 14:49:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-testAccessingPublic
- | javaClassRef javaFieldRef initString |
-
- self enableMockedExceptionThrowing.
- self shouldnt:
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ]
- raise: Error.
- self disableMockedExceptionThrowing.
-
- "Created: / 13-04-2011 / 14:44:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:49:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPublicFromOutside
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
- self shouldnt:
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef
+ owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
javaFieldRef resolve. ]
- raise: Error.
- self disableMockedExceptionThrowing.
+ raise: Error
+ .
"Created: / 13-04-2011 / 14:44:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:51:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPublicFromOutsideInNonPublic
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException notNil
- and: [ throwedException messageText = 'IllegalAccessError' ]).
- self disableMockedExceptionThrowing.
+ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
+ self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef
+ owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
+ javaFieldRef resolve. ]
+ raise: Error
+ .
"Created: / 13-04-2011 / 14:48:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:22:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:52:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testAccessingPublicFromSubclass
- | javaClassRef javaFieldRef initString throwedException |
+ | javaFieldRef initString |
- self enableMockedExceptionThrowing.
-
- [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.SubclassOfPublicClass').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
- javaFieldRef resolve. ] on: Error
- do: [:e | throwedException := e ].
- self assertTrue: (throwedException isNil).
- self disableMockedExceptionThrowing.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ self
+ shouldnt:
+ [ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ javaFieldRef
+ owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
+ javaFieldRef resolve. ]
+ raise: Error
+ .
"Created: / 13-04-2011 / 14:49:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:22:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:52:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaFieldRefTests methodsFor:'resolving static tests'!
testResolvingStatic
- | javaClassRef javaFieldRef initString result expectedResult |
+ | javaFieldRef initString result expectedResult |
initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicStaticField'
- descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ javaFieldRef := self
+ getFieldRefNamed: 'publicStaticField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
result := javaFieldRef resolveStatic.
expectedResult := (Java
classForName: 'stx.libjava.tests.mocks.PublicClass') staticFields
@@ -319,57 +286,60 @@
self assertTrue: (result = expectedResult).
"Created: / 28-04-2011 / 22:00:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:32:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaFieldRefTests methodsFor:'resolving tests'!
testCorrectInstanceCreation
- | javaClassRef initString javaFieldRef |
+ | initString javaFieldRef |
initString := 'Ljava/lang/String;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := self getFieldRefwithNameAndType: (self getName: 'value' descriptor: '[C')
- andWithClassRef: javaClassRef.
+ javaFieldRef := self
+ getFieldRefNamed: 'value'
+ typed: '[C'
+ inClass: initString.
self assertTrue: (javaFieldRef isResolved not).
self assertTrue: (javaFieldRef valueCache isNil).
self assertTrue: (javaFieldRef name = 'value').
self assertTrue: (javaFieldRef descriptor = '[C').
- self assertTrue: (javaFieldRef classRef name = 'Ljava/lang/String;').
+ self assertTrue: (javaFieldRef classRef name = initString).
"Created: / 08-04-2011 / 14:01:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 12-05-2011 / 19:02:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:28:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testCorrectResolving
- | javaClassRef initString javaFieldRef expectedResult result |
+ | initString javaFieldRef expectedResult result |
initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
+ self assertTrue: (javaFieldRef isResolved not).
+ javaFieldRef resolve.
+ self assertTrue: (javaFieldRef isResolved).
result := javaFieldRef resolve.
expectedResult := (Java
classForName: 'stx.libjava.tests.mocks.PublicClass') fields
at: 3.
self assertTrue: (result = expectedResult).
+ self assertTrue: (javaFieldRef offset = 3).
+ self assertTrue: (javaFieldRef type = 'java.lang.String').
"Created: / 08-04-2011 / 14:07:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:20:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:29:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testInvalidation
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
- initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
self assertTrue: (javaFieldRef isResolved not).
javaFieldRef resolve.
self assertTrue: (javaFieldRef isResolved).
@@ -379,18 +349,17 @@
self assertTrue: (javaFieldRef classRef isResolved not).
"Created: / 08-04-2011 / 14:09:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:20:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:30:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testInvalidationForClassNegative
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
self assertTrue: (javaFieldRef isResolved not).
javaFieldRef resolve.
self assertTrue: (javaFieldRef isResolved).
@@ -398,18 +367,17 @@
self assertTrue: (javaFieldRef isResolved).
"Created: / 08-04-2011 / 16:23:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:20:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:31:18 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testInvalidationForClassPositive
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
+ javaFieldRef := self
+ getFieldRefNamed: 'publicField'
+ typed: 'Ljava/lang/String;'
+ inClass: initString.
self assertTrue: (javaFieldRef isResolved not).
javaFieldRef resolve.
self assertTrue: (javaFieldRef isResolved).
@@ -417,25 +385,20 @@
self assertTrue: (javaFieldRef isResolved not).
"Created: / 08-04-2011 / 16:23:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 16:31:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testResolving
- | javaClassRef javaFieldRef initString |
+ | javaFieldRef initString |
+ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
+ javaFieldRef := self getFieldRefNamed: 'publicField' typed:'Ljava/lang/String;' inClass:initString.
- initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
- javaClassRef := self getClassRefFor: initString.
- javaClassRef owner: (Java classForName: 'java.lang.Object').
- javaFieldRef := JavaFieldRef2 in: nil
- namedAndTyped: (self getName: 'publicField' descriptor: 'Ljava/lang/String;')
- inClassIdentifiedByRef: javaClassRef.
self assertTrue: (javaFieldRef isResolved not).
javaFieldRef resolve.
- self assertTrue: (javaClassRef isResolved).
self assertTrue: (javaFieldRef isResolved).
"Created: / 08-04-2011 / 14:04:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 10-05-2011 / 16:21:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 23-05-2011 / 15:53:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaFieldRefTests class methodsFor:'documentation'!