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 815 f98e7173ef67
parent 773 ff7dbe5581a3
child 816 4e3072021201 
--- a/src/JavaInterfaceMethodRefTests.st	Mon May 23 14:53:35 2011 +0000
+++ b/src/JavaInterfaceMethodRefTests.st	Mon May 23 15:27:40 2011 +0000
@@ -11,14 +11,13 @@
 !JavaInterfaceMethodRefTests methodsFor:'javaInterfaceMethodRef tests'!
 
 testCorrectInstanceCreation
-    | javaClassRef  initString  javaMethodRef |
+    | initString  javaMethodRef |
 
     initString := 'Ljava/lang/Runnable;'.
-    javaClassRef := self getClassRefFor: initString.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     self assertTrue: (javaMethodRef isResolved not).
     self assertTrue: (javaMethodRef valueCache isNil).
     self assertTrue: (javaMethodRef name = 'run').
@@ -26,102 +25,105 @@
     self assertTrue: (javaMethodRef classRef name = 'Ljava/lang/Runnable;').
 
     "Created: / 08-04-2011 / 14:01:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:19:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testCorrectResolving
-    | javaClassRef  initString  javaMethodRef  expectedResult  result |
+    | initString  javaMethodRef  expectedResult  result |
 
     initString := 'Ljava/lang/Runnable;'.
-    javaClassRef := self getClassRefFor: initString.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2        in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     result := javaMethodRef resolve.
     expectedResult := (Java classForName: 'java.lang.Runnable') 
                 methodDictionary at: #'run()V'.
     self assertTrue: (result = expectedResult).
 
     "Created: / 08-04-2011 / 14:07:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:18:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidation
-    | javaClassRef  javaMethodRef |
+    | javaMethodRef  initString|
+
+   initString :='Ljava/lang/Runnable;'.
 
-    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
     self assertTrue: (javaMethodRef isResolved).
-    self assertTrue: (javaClassRef isResolved).
+    self assertTrue: (javaMethodRef classRef isResolved).
     javaMethodRef invalidate.
     self assertTrue: (javaMethodRef isResolved not).
-    self assertTrue: (javaClassRef isResolved not).
+    self assertTrue: (javaMethodRef classRef isResolved not).
 
     "Created: / 08-04-2011 / 14:09:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:19:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidationForClassNegative
-    | javaClassRef  javaMethodRef |
+    | javaMethodRef  initString|
+
+    initString :='Ljava/lang/Runnable;'.
 
-    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2        in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
     self assertTrue: (javaMethodRef isResolved).
-    self assertTrue: (javaClassRef isResolved).
+    self assertTrue: (javaMethodRef classRef isResolved).
     javaMethodRef invalidateForClass: 'Ljava/lang/Object;'.
     self assertTrue: (javaMethodRef isResolved).
-    self assertTrue: (javaClassRef isResolved).
+    self assertTrue: (javaMethodRef classRef isResolved).
 
     "Created: / 08-04-2011 / 16:23:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:20:18 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testInvalidationForClassPositive
-    | javaClassRef  javaMethodRef |
+    | javaMethodRef  initString|
+
+    initString :='Ljava/lang/Runnable;'.
 
-    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2               in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
     self assertTrue: (javaMethodRef isResolved).
-    self assertTrue: (javaClassRef isResolved).
+    self assertTrue: (javaMethodRef classRef isResolved).
     javaMethodRef invalidateForClass: 'Ljava/lang/Runnable;'.
     self assertTrue: (javaMethodRef isResolved not).
-    self assertTrue: (javaClassRef isResolved not).
+    self assertTrue: (javaMethodRef classRef isResolved not).
 
     "Created: / 08-04-2011 / 16:23:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:20:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 testResolving
-    | javaClassRef  javaMethodRef |
+    | javaMethodRef  initString|
+
+     initString :='Ljava/lang/Runnable;'.
 
-    javaClassRef := self getClassRefFor: 'Ljava/lang/Runnable;'.
-    javaClassRef owner: (Java classForName: 'java.lang.Object').
-    javaMethodRef := JavaInterfaceMethodRef2 in: nil
-                namedAndTyped: (self getName: 'run' descriptor: '()V')
-                inClassIdentifiedByRef: javaClassRef.
+    javaMethodRef := javaMethodRef := self 
+                getInterfaceMethodRefNamed: 'run'
+                typed: '()V'
+                inClass: initString.
     self assertTrue: (javaMethodRef isResolved not).
     javaMethodRef resolve.
-    self assertTrue: (javaClassRef isResolved).
+    self assertTrue: (javaMethodRef classRef isResolved).
     self assertTrue: (javaMethodRef isResolved).
 
     "Created: / 08-04-2011 / 14:04:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 16:22:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-05-2011 / 17:21:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaInterfaceMethodRefTests methodsFor:'permission tests'!
hg/stx-libjava