Mercurial Mercurial > hg > stx-libjava / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/JavaInterfaceMethodRefTests.st
branchjk_new_structure
changeset 771 fb8026dda011
parent 764 3c1d3f2d29a5
child 773 ff7dbe5581a3 
--- a/src/JavaInterfaceMethodRefTests.st	Tue May 10 07:31:14 2011 +0000
+++ b/src/JavaInterfaceMethodRefTests.st	Tue May 10 21:04:10 2011 +0000
@@ -14,10 +14,10 @@
     | javaClassRef  initString  javaMethodRef |
 
     initString := 'Ljava/lang/Runnable;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2 in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     self assertTrue: (javaMethodRef isResolved not).
     self assertTrue: (javaMethodRef valueCache isNil).
@@ -26,17 +26,17 @@
     self assertTrue: (javaMethodRef classRef name = 'Ljava/lang/Runnable;').
 
     "Created: / 08-04-2011 / 14:01:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testCorrectResolving
     | javaClassRef  initString  javaMethodRef  expectedResult  result |
 
     initString := 'Ljava/lang/Runnable;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2        in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     result := javaMethodRef resolve.
     expectedResult := (Java classForName: 'java.lang.Runnable') 
@@ -44,16 +44,16 @@
     self assertTrue: (result = expectedResult).
 
     "Created: / 08-04-2011 / 14:07:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidation
     | javaClassRef  javaMethodRef |
 
-    javaClassRef := JavaClassRef2 for: 'Ljava/lang/Runnable;'.
+    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2 in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
@@ -64,16 +64,16 @@
     self assertTrue: (javaClassRef isResolved not).
 
     "Created: / 08-04-2011 / 14:09:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidationForClassNegative
     | javaClassRef  javaMethodRef |
 
-    javaClassRef := JavaClassRef2 for: 'Ljava/lang/Runnable;'.
+    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2        in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
@@ -84,16 +84,16 @@
     self assertTrue: (javaClassRef isResolved).
 
     "Created: / 08-04-2011 / 16:23:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidationForClassPositive
     | javaClassRef  javaMethodRef |
 
-    javaClassRef := JavaClassRef2 for: 'Ljava/lang/Runnable;'.
+    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2               in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
@@ -104,16 +104,16 @@
     self assertTrue: (javaClassRef isResolved not).
 
     "Created: / 08-04-2011 / 16:23:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testResolving
     | javaClassRef  javaMethodRef |
 
-    javaClassRef := JavaClassRef2 for: 'Ljava/lang/Runnable;'.
+    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'run' descriptor: '()V')
+    javaMethodRef := JavaInterfaceMethodRef2 in: nil
+                namedAndTyped: (self getName: 'run' descriptor: '()V')
                 inClassIdentifiedByRef: javaClassRef.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
@@ -121,7 +121,7 @@
     self assertTrue: (javaMethodRef isResolved).
 
     "Created: / 08-04-2011 / 14:04:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 12:17:24 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaInterfaceMethodRefTests methodsFor:'permission tests'!
@@ -132,20 +132,20 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'privateMethod'
+    javaMethodRef := JavaMethodRef2 in: nil
+                namedAndTyped: (self getName: 'privateMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
             do: [:e | throwedException := e ].
     self assertTrue: (throwedException notNil 
-                and: [ throwedException messageText = 'IllegalAccessError'  ]).
+                and: [ throwedException messageText = 'IllegalAccessError' ]).
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:44:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 23:09:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPrivateFromOutsideInNonPublic
@@ -154,10 +154,10 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'privateMethod'
+    javaMethodRef := JavaMethodRef2        in: nil
+                namedAndTyped: (self getName: 'privateMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
@@ -167,7 +167,7 @@
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:47:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 14-04-2011 / 14:11:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPrivateFromSubclass
@@ -176,20 +176,20 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.SubclassOfPublicClass').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'privateMethod'
+    javaMethodRef := JavaMethodRef2               in: nil
+                namedAndTyped: (self getName: 'privateMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
             do: [:e | throwedException := e ].
-   self assertTrue: (throwedException notNil 
-                   and: [ throwedException messageText = 'IllegalAccessError' ]).
+    self assertTrue: (throwedException notNil 
+                and: [ throwedException messageText = 'IllegalAccessError' ]).
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:49:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 14-04-2011 / 00:03:40 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingProtectedFromOutside
@@ -198,10 +198,10 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'protectedMethod'
+    javaMethodRef := JavaMethodRef2                      in: nil
+                namedAndTyped: (self getName: 'protectedMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
@@ -211,7 +211,7 @@
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:44:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 14-04-2011 / 14:12:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingProtectedFromOutsideInNonPublic
@@ -220,10 +220,10 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'protectedMethod'
+    javaMethodRef := JavaMethodRef2                             in: nil
+                namedAndTyped: (self getName: 'protectedMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
@@ -233,7 +233,7 @@
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:47:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 14-04-2011 / 14:11:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingProtectedFromSubclass
@@ -242,10 +242,11 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
-    javaClassRef owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'protectedMethod'
+    javaClassRef := self getClassRefFor: initString.
+    javaClassRef 
+        owner: (Java classForName: 'stx.libjava.tests.mocks.SubclassOfPublicClass').
+    javaMethodRef := JavaMethodRef2 in: nil
+                namedAndTyped: (self getName: 'protectedMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
@@ -254,25 +255,27 @@
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:49:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 23:18:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPublic
-    | javaClassRef javaMethodRef initString |
+    | javaClassRef  javaMethodRef  initString |
 
     self enableMockedExceptionThrowing.
     self shouldnt: 
             [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-            javaClassRef := JavaClassRef2 for: initString.
+            javaClassRef := self getClassRefFor: initString.
             javaClassRef owner: (Java classForName: 'java.lang.Object').
-            javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'publicMethod' descriptor: '()Ljava/lang/String;')
-                inClassIdentifiedByRef: javaClassRef.
-            javaMethodRef resolve.]
+            javaMethodRef := JavaMethodRef2 in: nil
+                        namedAndTyped: (self getName: 'publicMethod'
+                                descriptor: '()Ljava/lang/String;')
+                        inClassIdentifiedByRef: javaClassRef.
+            javaMethodRef resolve. ]
         raise: Error.
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:44:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPublicFromOutside
@@ -281,10 +284,10 @@
     self enableMockedExceptionThrowing.
     self shouldnt: 
             [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-            javaClassRef := JavaClassRef2 for: initString.
+            javaClassRef := self getClassRefFor: initString.
             javaClassRef owner: (Java classForName: 'java.lang.Object').
-            javaMethodRef := JavaMethodRef2 
-                        namedAndTyped: (JavaNameAndType2 name: 'publicMethod'
+            javaMethodRef := JavaMethodRef2        in: nil
+                        namedAndTyped: (self getName: 'publicMethod'
                                 descriptor: '()Ljava/lang/String;')
                         inClassIdentifiedByRef: javaClassRef.
             javaMethodRef resolve. ]
@@ -292,6 +295,7 @@
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:44:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPublicFromOutsideInNonPublic
@@ -300,19 +304,20 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'publicMethod'
+    javaMethodRef := JavaMethodRef2                       in: nil
+                namedAndTyped: (self getName: 'publicMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
             do: [:e | throwedException := e ].
-    self assertTrue: (throwedException notNil and:[throwedException messageText = 'IllegalAccessError']).
+    self assertTrue: (throwedException notNil 
+                and: [ throwedException messageText = 'IllegalAccessError' ]).
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:48:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2011 / 23:04:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testAccessingPublicFromSubclass
@@ -321,18 +326,19 @@
     self enableMockedExceptionThrowing.
     
     [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
-    javaClassRef := JavaClassRef2 for: initString.
+    javaClassRef := self getClassRefFor: initString.
     javaClassRef owner: (Java classForName: 'java.lang.SubclassOfPublicClass').
-    javaMethodRef := JavaMethodRef2 
-                namedAndTyped: (JavaNameAndType2 name: 'publicMethod'
+    javaMethodRef := JavaMethodRef2 in: nil
+                namedAndTyped: (self getName: 'publicMethod'
                         descriptor: '()Ljava/lang/String;')
                 inClassIdentifiedByRef: javaClassRef.
     javaMethodRef resolve. ] on: Error
             do: [:e | throwedException := e ].
-    self assertTrue: (throwedException isNil                ).
+    self assertTrue: (throwedException isNil).
     self disableMockedExceptionThrowing.
 
     "Created: / 13-04-2011 / 14:49:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 10-05-2011 / 16:22:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaInterfaceMethodRefTests class methodsFor:'documentation'!
@@ -340,3 +346,4 @@
 version_SVN
     ^ '$Id$'
 ! !
+
hg/stx-libjava