--- a/src/TestletTestCaseProxy.st Tue Jun 21 08:26:44 2011 +0000
+++ b/src/TestletTestCaseProxy.st Tue Jun 21 16:12:27 2011 +0000
@@ -1,21 +1,10 @@
"{ Package: 'stx:libjava' }"
-TestCase subclass:#TestletTestCaseProxy
+JavaTestCaseProxy subclass:#TestletTestCaseProxy
instanceVariableNames:'harness'
classVariableNames:'TestCases'
poolDictionaries:''
- category:'Languages-Java-JUnit'
-!
-
-TestletTestCaseProxy class instanceVariableNames:'javaClassName shouldFork'
-
-"
- The following class instance variables are inherited by this class:
-
- TestCase - lastTestRunResultOrNil lastTestRunsPassedTests lastTestRunsFailedTests lastTestRunsErrorTests
- TestAsserter -
- Object -
-"
+ category:'Languages-Java-Tests-Proxies'
!
@@ -26,34 +15,10 @@
TestCases := Dictionary new.
"Created: / 01-03-2011 / 10:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-setJavaClassName: aSymbol
-
- javaClassName ifNotNil:
- [self error: 'Attempting to set java class name twice'].
- javaClassName := aSymbol.
-
- "Created: / 01-03-2011 / 10:43:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TestletTestCaseProxy class methodsFor:'accessing'!
-javaClass
-
- ^Java at: javaClassName
-
- "Created: / 01-03-2011 / 11:30:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 01-03-2011 / 14:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaClassName
-
- ^javaClassName
-
- "Created: / 01-03-2011 / 11:30:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
lookupHierarchyRoot
^ TestletTestCaseProxy
@@ -67,16 +32,6 @@
^super selector: aSymbol
"Created: / 01-03-2011 / 11:55:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-shouldFork
- ^ shouldFork ? false
-
- "Modified: / 13-06-2011 / 16:34:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-shouldFork:something
- shouldFork := something.
! !
!TestletTestCaseProxy class methodsFor:'private'!
@@ -97,14 +52,6 @@
isTestlet
^ true
-!
-
-isAbstract
- ^ self == TestletTestCaseProxy
-
- "Created: / 28-02-2011 / 22:32:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 01-03-2011 / 14:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 29-04-2011 / 10:21:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!TestletTestCaseProxy class methodsFor:'subclass creation'!
@@ -112,49 +59,20 @@
for: javaClass
"Answers a new (anonymous) testcase proxy for
given javaClass"
-
- | meta cls name |
self assert: javaClass isJavaClass description: 'Not a java class'.
self assert: javaClass isTestletLike
description: 'Not a testcase-like class'.
- name := javaClass name.
- TestCases at: name ifPresent: [:c | ^ c ].
- meta := Metaclass new.
- meta setSuperclass: TestletTestCaseProxy class.
- meta instSize: TestletTestCaseProxy class instSize.
- cls := meta new.
- cls setSuperclass: TestletTestCaseProxy.
- cls flags: TestletTestCaseProxy flags.
- cls instSize: TestletTestCaseProxy instSize.
- cls setJavaClassName: name.
- cls
- setName: ('TestletTestCase for: (Java classForName: ' , name storeString
- , ')') asSymbol.
- cls setCategory: javaClass category.
- TestCases at: name put: cls.
- ^ cls
+ ^self forClassNamed: javaClass name
"Created: / 01-03-2011 / 10:30:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 03-03-2011 / 00:20:49 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified: / 01-04-2011 / 16:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 29-04-2011 / 10:21:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 21-06-2011 / 17:08:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TestletTestCaseProxy methodsFor:'accessing'!
-javaClass
-
- | javaClass |
-
- self
- assert: (javaClass := self class javaClass) isJavaClass
- description: 'java class does not exists'.
- ^javaClass
-
- "Created: / 01-03-2011 / 14:48:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
nameForHDTestReport
^(self class javaClassName copyReplaceAll:$/ with: $.) copyTo: (self class javaClassName lastIndexOf: $/) - 1.