src/TestletTestCaseProxy.st
author vranyj1
Thu, 23 Jun 2011 21:36:25 +0000
branchjk_new_structure
changeset 865 82615f7deade
parent 859 56bc5e063b7d
child 877 f5a5b93e1c78
permissions -rw-r--r--
Few fixes...
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     1
"{ Package: 'stx:libjava' }"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     2
859
56bc5e063b7d Common code from JUnitTestCaseProxy and TestletTestCaseProxy moved to a common superclass
vranyj1
parents: 855
diff changeset
     3
JavaTestCaseProxy subclass:#TestletTestCaseProxy
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
     4
	instanceVariableNames:'harness'
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     5
	classVariableNames:'TestCases'
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     6
	poolDictionaries:''
859
56bc5e063b7d Common code from JUnitTestCaseProxy and TestletTestCaseProxy moved to a common superclass
vranyj1
parents: 855
diff changeset
     7
	category:'Languages-Java-Tests-Proxies'
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     8
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
     9
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    10
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    11
!TestletTestCaseProxy class methodsFor:'accessing'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    12
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    13
lookupHierarchyRoot
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    14
    ^ TestletTestCaseProxy
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    15
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    16
    "Created: / 01-03-2011 / 11:41:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    17
    "Modified: / 01-03-2011 / 14:54:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    18
    "Modified: / 29-04-2011 / 10:25:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    19
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    20
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    21
selector: aSymbol
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    22
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    23
    ^super selector: aSymbol
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    24
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    25
    "Created: / 01-03-2011 / 11:55:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    26
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    27
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    28
!TestletTestCaseProxy class methodsFor:'private'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    29
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    30
testSelectors
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    31
    "testlet always has only one test method, but maybe for the future.."
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    32
820
beb45cce2856 Mauve test integration works.. and that's the bad news, there are sooo many failures.. so back to the beginning, let's fix natives..
hlopkmar
parents: 761
diff changeset
    33
    ^ #( #'test(Lgnu.testlet.TestHarness;)' ).
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    34
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    35
    "Created: / 01-03-2011 / 10:49:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    36
    "Modified: / 03-03-2011 / 00:34:39 / Marcel Hlopko <hlopik@gmail.com>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    37
    "Modified: / 04-03-2011 / 00:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
820
beb45cce2856 Mauve test integration works.. and that's the bad news, there are sooo many failures.. so back to the beginning, let's fix natives..
hlopkmar
parents: 761
diff changeset
    38
    "Modified: / 29-05-2011 / 22:54:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    39
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    40
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    41
!TestletTestCaseProxy class methodsFor:'queries'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    42
854
e165b3da9adb Fixes for running tests in separate processes (required since VM often crash)
vranyj1
parents: 853
diff changeset
    43
isTestlet
e165b3da9adb Fixes for running tests in separate processes (required since VM often crash)
vranyj1
parents: 853
diff changeset
    44
	^ true
e165b3da9adb Fixes for running tests in separate processes (required since VM often crash)
vranyj1
parents: 853
diff changeset
    45
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    46
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    47
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    48
!TestletTestCaseProxy class methodsFor:'subclass creation'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    49
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    50
for: javaClass 
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    51
    "Answers a new (anonymous) testcase proxy for
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    52
     given javaClass"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    53
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    54
    self assert: javaClass isJavaClass description: 'Not a java class'.
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    55
    self assert: javaClass isTestletLike
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    56
        description: 'Not a testcase-like class'.
859
56bc5e063b7d Common code from JUnitTestCaseProxy and TestletTestCaseProxy moved to a common superclass
vranyj1
parents: 855
diff changeset
    57
    ^self forClassNamed: javaClass name
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    58
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    59
    "Created: / 01-03-2011 / 10:30:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    60
    "Modified: / 03-03-2011 / 00:20:49 / Marcel Hlopko <hlopik@gmail.com>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    61
    "Modified: / 29-04-2011 / 10:21:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
859
56bc5e063b7d Common code from JUnitTestCaseProxy and TestletTestCaseProxy moved to a common superclass
vranyj1
parents: 855
diff changeset
    62
    "Modified: / 21-06-2011 / 17:08:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    63
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    64
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    65
!TestletTestCaseProxy methodsFor:'accessing'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    66
855
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    67
nameForHDTestReport
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    68
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    69
    ^(self class javaClassName copyReplaceAll:$/ with: $.) copyTo: (self class javaClassName lastIndexOf: $/) - 1.
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    70
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    71
    "Created: / 01-04-2011 / 16:10:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    72
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    73
!
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    74
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    75
selectorForHDTestReport
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    76
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    77
    ^self class javaClassName copyFrom: 
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    78
		(self class javaClassName lastIndexOf: $/) + 1
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    79
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    80
809b1dc41615 use nameForHDTestReport and selectorForHDTestReport to identify test
vranyj1
parents: 854
diff changeset
    81
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    82
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
    83
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    84
!TestletTestCaseProxy methodsFor:'error handling'!
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    85
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    86
doesNotUnderstand: aMessage
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    87
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    88
    aMessage selector == #'check(Z)V' ifTrue: [
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    89
        aMessage arg1 == 0 ifTrue:
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    90
            [TestResult failure sunitSignalWith: 'Testlet failed']
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    91
    ] ifFalse:[ aMessage selector == #'check(ZLjava/lang/String;)V' ifTrue:[
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    92
        aMessage arg1 == 0 ifTrue:        
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    93
            [TestResult failure sunitSignalWith: (Java as_ST_String: aMessage arguments second)]
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    94
    ]].
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    95
    (harness respondsTo: aMessage selector) ifTrue:
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    96
        [^aMessage sendTo: harness].
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    97
    ^super doesNotUnderstand: aMessage
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    98
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
    99
    "Created: / 31-05-2011 / 16:30:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   100
! !
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   101
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   102
!TestletTestCaseProxy methodsFor:'private'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   103
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   104
harnessMock
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   105
    ^ (Java classForName: 'stx.libjava.tests.mocks.TestletHarnessMock') new.
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   106
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   107
    "Modified: / 29-04-2011 / 10:52:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   108
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   109
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   110
performTest
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   111
    | handlerBlock |
824
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   112
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   113
    handlerBlock := [:ex | TestResult failure sunitSignalWith: ex description].
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   114
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   115
    harness := self harnessMock.
820
beb45cce2856 Mauve test integration works.. and that's the bad news, there are sooo many failures.. so back to the beginning, let's fix natives..
hlopkmar
parents: 761
diff changeset
   116
    
824
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   117
    [ JavaVM unimplementedNativeMethodSignal 
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   118
        handle:
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   119
            handlerBlock
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   120
        do: [
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   121
            self javaClass new 
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   122
                perform: 'test(Lgnu/testlet/TestHarness;)V' sunitAsSymbol
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   123
                with: self
824
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   124
       ].
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   125
    ] on: JavaError do: [:ex | 
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   126
        TestResult failure sunitSignalWith: ex description
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   127
    ].
26e719a7e88c Few fixes and native methods
vranyj1
parents: 820
diff changeset
   128
826
db53b9c842d7 - TestletTestCaseProxy: debugging support improved.
vranyj1
parents: 824
diff changeset
   129
    "/((harness instVarNamed: 'passed') = 0 ) ifTrue: [ TestResult failure sunitSignalWith: 'Test failed' ].
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   130
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   131
    "Created: / 01-03-2011 / 14:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
820
beb45cce2856 Mauve test integration works.. and that's the bad news, there are sooo many failures.. so back to the beginning, let's fix natives..
hlopkmar
parents: 761
diff changeset
   132
    "Modified: / 29-05-2011 / 23:19:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
853
aa9af509e506 TestletTestCaseProxy: added classvar to specify whether run the test in separate process
vranyj1
parents: 826
diff changeset
   133
    "Modified: / 13-06-2011 / 17:03:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   134
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   135
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   136
!TestletTestCaseProxy class methodsFor:'documentation'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   137
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   138
version_SVN
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   139
    ^ '$Id$'
43e017ec7958 Merged with /branches/jk
vranyj1
parents:
diff changeset
   140
! !