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.
JavaLookupTests.st
changeset 3040 ff90519ce3ac
parent 2976 a384a02381c0
child 3041 7a326f9f8aad 
--- a/JavaLookupTests.st	Wed Mar 19 11:12:50 2014 +0000
+++ b/JavaLookupTests.st	Wed Mar 19 11:48:10 2014 +0000
@@ -1,6 +1,6 @@
 "
  Copyright (c) 2010-2011 Jan Vrany, Jan Kurs & Marcel Hlopko,
-                         SWING Research Group, Czech Technical University 
+                         SWING Research Group, Czech Technical University
                          in Prague
 
  Permission is hereby granted, free of charge, to any person
@@ -38,7 +38,7 @@
 copyright
 "
  Copyright (c) 2010-2011 Jan Vrany, Jan Kurs & Marcel Hlopko,
-                         SWING Research Group, Czech Technical University 
+                         SWING Research Group, Czech Technical University
                          in Prague
 
  Permission is hereby granted, free of charge, to any person
@@ -85,11 +85,11 @@
 !JavaLookupTests class methodsFor:'resources'!
 
 resources
-    ^ Array with: JavaLookupTestsResource.
+    ^ Array with: JavaTestsResource.
 
     "Created: / 11-04-2011 / 19:38:11 / kursjan <kursjan@fit.cvut.cz>"
     "Modified: / 29-08-2011 / 23:35:06 / Jan Kurs <kursjan@fit.cvut.cz>"
-    "Modified: / 29-10-2012 / 07:47:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:27:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLookupTests methodsFor:'running'!
@@ -111,96 +111,105 @@
 !JavaLookupTests methodsFor:'support'!
 
 javaTestClass
-    ^ JAVA cz cvut fit swing methodLookup Object.
+    ^ JAVA stx libjava tests mocks interop Object.
 
     "Created: / 05-09-2011 / 20:13:48 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 30-11-2012 / 22:16:24 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 personManipulatorClass
     "Person Manipulator can interact with Person class defined in Java"
-    
-    ^ JAVA cz cvut fit swing methodLookup PersonManipulator.
+
+    ^ JAVA stx libjava tests mocks interop PersonManipulator.
 
     "Created: / 06-09-2011 / 21:48:16 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 30-11-2012 / 22:16:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setManipulatorClass
     "Person Manipulator can interact with Person class defined in Java"
-    
-    ^ JAVA cz cvut fit swing methodLookup SetManipulator.
+
+    ^ JAVA stx libjava tests mocks interop SetManipulator.
 
     "Created: / 25-09-2011 / 16:41:02 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 30-11-2012 / 22:13:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLookupTests methodsFor:'tests - java extensions'!
 
 test_java_extension_01
 
-    Compiler compile: 'fooPerson ^ 0' forClass: JAVA cz cvut fit swing methodLookup Person theClass.
-    self assert: JAVA cz cvut fit swing methodLookup Person new fooPerson == 0.
+    Compiler compile: 'fooPerson ^ 0' forClass: JAVA stx libjava tests mocks interop Person theClass.
+    self assert: JAVA stx libjava tests mocks interop Person new fooPerson == 0.
 
     "Created: / 04-10-2013 / 15:07:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_java_extension_02_1
 
-    Compiler compile: 'fooIPerson1 ^ 1' forClass: JAVA cz cvut fit swing methodLookup IPerson1 theClass.
-    self assert: JAVA cz cvut fit swing methodLookup Person new fooIPerson1 == 1.
+    Compiler compile: 'fooIPerson1 ^ 1' forClass: JAVA stx libjava tests mocks interop IPerson1 theClass.
+    self assert: JAVA stx libjava tests mocks interop Person new fooIPerson1 == 1.
 
     "Created: / 04-10-2013 / 15:13:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_java_extension_02_2
 
-    Compiler compile: 'fooIPerson2 ^ 2' forClass: JAVA cz cvut fit swing methodLookup IPerson2 theClass.
-    self assert: JAVA cz cvut fit swing methodLookup Person new fooIPerson2 == 2
+    Compiler compile: 'fooIPerson2 ^ 2' forClass: JAVA stx libjava tests mocks interop IPerson2 theClass.
+    self assert: JAVA stx libjava tests mocks interop Person new fooIPerson2 == 2
 
     "Created: / 04-10-2013 / 15:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:28:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_java_extension_03
 
-    Compiler compile: 'fooIPersonSuper ^ 3' forClass: JAVA cz cvut fit swing methodLookup IPersonSuper theClass.
-    self assert: JAVA cz cvut fit swing methodLookup Person new fooIPersonSuper == 3
+    Compiler compile: 'fooIPersonSuper ^ 3' forClass: JAVA stx libjava tests mocks interop IPersonSuper theClass.
+    self assert: JAVA stx libjava tests mocks interop Person new fooIPersonSuper == 3
 
     "Created: / 04-10-2013 / 15:11:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_java_extension_04
 
-    Compiler compile: 'fooIPerson ^ 3' forClass: JAVA cz cvut fit swing methodLookup IPerson1 theClass.
-    Compiler compile: 'fooIPerson ^ 4' forClass: JAVA cz cvut fit swing methodLookup IPerson2 theClass.
-    self should:[self assert: JAVA cz cvut fit swing methodLookup Person new fooIPerson] raise: Object ambiguousMessageSignal
+    Compiler compile: 'fooIPerson ^ 3' forClass: JAVA stx libjava tests mocks interop IPerson1 theClass.
+    Compiler compile: 'fooIPerson ^ 4' forClass: JAVA stx libjava tests mocks interop IPerson2 theClass.
+    self should:[self assert: JAVA stx libjava tests mocks interop Person new fooIPerson] raise: Object ambiguousMessageSignal
 
     "Created: / 04-10-2013 / 15:43:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:29:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_java_extension_05
 
-    Compiler compile: 'fooIPerson1_05 ^ 50' forClass: JAVA cz cvut fit swing methodLookup IPerson1 theClass.
-    self assert: JAVA cz cvut fit swing methodLookup Director new fooIPerson1_05 == 50.
+    Compiler compile: 'fooIPerson1_05 ^ 50' forClass: JAVA stx libjava tests mocks interop IPerson1 theClass.
+    self assert: JAVA stx libjava tests mocks interop Director new fooIPerson1_05 == 50.
 
     "Created: / 04-10-2013 / 20:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 11:29:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLookupTests methodsFor:'tests - java lookup'!
 
 test3
     "I am not sure with this test :)"
-    self shouldnt: [(Java classForName: 'cz.cvut.fit.swing.methodLookup.Object') new isNumber] raise: Exception.
-    self assert: (Java classForName: 'cz.cvut.fit.swing.methodLookup.Object') new isNumber = false.
+    self shouldnt: [(Java classForName: 'stx.libjava.tests.mocks.interop.Object') new isNumber] raise: Exception.
+    self assert: (Java classForName: 'stx.libjava.tests.mocks.interop.Object') new isNumber = false.
 
     "Created: / 11-04-2011 / 19:43:37 / kursjan <kursjan@fit.cvut.cz>"
 !
 
 testBasic
-    self 
+    self
         shouldnt:[ (Java classForName:'java.lang.Object') new hash ]
         raise:Exception.
-    self 
+    self
         shouldnt:[ (Java classForName:'java.lang.Object') new toString ]
         raise:Exception.
 
@@ -258,7 +267,7 @@
 !
 
 testDoesNotUnderstand
-    self 
+    self
         should:[ (Java classForName:'java.lang.Object') new bafickyBaf ]
         raise:MessageNotUnderstood.
 
@@ -267,8 +276,8 @@
 !
 
 testInterfaceMethodsWithNarrowerReturnType
-    "when a class A implements an interface I, and overridden method has narrower 
-    return type (e.g. method in I should return java.lang.Object, but overridden 
+    "when a class A implements an interface I, and overridden method has narrower
+    return type (e.g. method in I should return java.lang.Object, but overridden
     method in A declares return type of java.lang.String), java compiler generates
     synthetic method with the same name and return type declared in I, which just
     delegates to overridden method. This situation should not be considered
@@ -281,8 +290,8 @@
 
 testMultipleParameters
     "test multiple parameters"
-    
-    self 
+
+    self
         assert: (self javaTestClass new foo) = 0
 
     "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
@@ -291,8 +300,8 @@
 
 testMultipleParameters1
     "test multiple parameters"
-    
-    self 
+
+    self
         assert: (self javaTestClass new foo: 1) = 1
 
     "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
@@ -301,8 +310,8 @@
 
 testMultipleParameters2
     "test multiple parameters"
-    
-    self 
+
+    self
         assert: (self javaTestClass new foo: 1 and: 2) = 2
 
     "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
@@ -328,7 +337,7 @@
 
     self assert: false message:'Solution wanted'
 
-"/    self 
+"/    self
 "/        should:[r := self javaTestClass new overloadedMethod: nil]
 "/        raise: AmbiguousMessage
 
@@ -522,7 +531,7 @@
     "/ !!!!!! The three assertions in a row is by purpose !!!!!!
     "/ Do not remove them. The reason is that with JIT on,
     "/ the JIT compiler recompiles method each time a reference
-    "/ is resolved. This should cover different code paths.             
+    "/ is resolved. This should cover different code paths.
 
     self assert:(self personManipulatorClass new getPersonName: person) = 'Anne'.
     self assert:(self personManipulatorClass new getPersonName: person) = 'Anne'.
hg/stx-libjava