--- a/JavaJUnitTests.st Sat Feb 02 01:23:18 2013 +0100
+++ b/JavaJUnitTests.st Sat Feb 16 19:08:45 2013 +0100
@@ -1,11 +1,11 @@
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
SWING Research Group, Czech Technical University in Prague
- Parts of the code written by Claus Gittinger are under following
- license:
-
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
@@ -13,31 +13,10 @@
other person. No title to or ownership of the software is
hereby transferred.
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
"
"{ Package: 'stx:libjava' }"
@@ -45,7 +24,7 @@
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
- category:'Languages-Java-Tests'
+ category:'Languages-Java-Tests-Libraries'
!
!JavaJUnitTests class methodsFor:'documentation'!
@@ -53,12 +32,12 @@
copyright
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
SWING Research Group, Czech Technical University in Prague
- Parts of the code written by Claus Gittinger are under following
- license:
-
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
@@ -66,48 +45,10 @@
other person. No title to or ownership of the software is
hereby transferred.
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
-
-"
-!
-
-documentation
-"
- A test case that tests whether JUnit 3.x works under
- stx:libjava.
-
- [author:]
- Jan Vrany <jan.vrany@fit.cvut.cz>
-
- [instance variables:]
-
- [class variables:]
-
- [see also:]
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
"
! !
@@ -138,29 +79,27 @@
!JavaJUnitTests methodsFor:'tests - jUnit 3.x'!
test_junit3x_01
+ | runner junit3testcase result |
- | runner junit3testcase result |
"/ Java effectiveClassPath
-
runner := Java classForName: 'org.junit.runner.JUnitCore'.
self assert: runner notNil.
junit3testcase := Java classForName: 'stx.libjava.tests.JUnit3Tests'.
self assert: junit3testcase notNil.
-
- "signature: Result runClass(java.lang.Class[] classes)"
+ "signature: Result runClass(java.lang.Class[] classes)"
result := runner
- perform:#'runClasses([Ljava/lang/Class;)Lorg/junit/runner/Result;'
+ perform: #'runClasses([Ljava/lang/Class;)Lorg/junit/runner/Result;'
with: (Array with: (JavaVM javaClassObjectForClass: junit3testcase)).
-
- "
- result getFailures
+ "
+ result getFailures
"
self assert: result getRunCount = 4.
self assert: result getFailureCount = 2.
- self assert: result wasSuccessful == 0"false"
+ self assert: result wasSuccessful not.
"Created: / 06-02-2011 / 12:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-04-2011 / 23:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 09-10-2011 / 16:56:54 / m"
! !
!JavaJUnitTests methodsFor:'tests - jUnit 4.x'!
@@ -169,29 +108,39 @@
| runner junit4testcase result |
"/ Java effectiveClassPath
-
- runner := Java classForName:'org.junit.runner.JUnitCore'.
- self assert:runner notNil.
- junit4testcase := Java classForName:'stx.libjava.tests.JUnit4Tests'.
- self assert:junit4testcase notNil.
+ runner := Java classForName: 'org.junit.runner.JUnitCore'.
+ self assert: runner notNil.
+ junit4testcase := Java classForName: 'stx.libjava.tests.JUnit4Tests'.
+ self assert: junit4testcase notNil.
"signature: Result runClass(java.lang.Class[] classes)"
result := runner
- perform:#'runClasses([Ljava/lang/Class;)Lorg/junit/runner/Result;'
- with:(Array with:(JavaVM javaClassObjectForClass:junit4testcase)).
+ perform: #'runClasses([Ljava/lang/Class;)Lorg/junit/runner/Result;'
+ with: (Array with: (JavaVM javaClassObjectForClass: junit4testcase)).
"
result getFailures
"
- self assert:result getRunCount = 3.
- self assert:result getFailureCount = 1.
- self assert:result wasSuccessful == 0
+ self assert: result getRunCount = 3.
+ self assert: result getFailureCount = 1.
+ self assert: result wasSuccessful not.
"Created: / 06-02-2011 / 12:14:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 28-02-2011 / 17:27:16 / Marcel Hlopko <hlopik@gmail.com>"
"Modified: / 07-04-2011 / 23:02:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 09-10-2011 / 16:57:01 / m"
! !
!JavaJUnitTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header: /cvs/stx/stx/libjava/JavaJUnitTests.st,v 1.2 2013-02-16 18:08:32 vrany Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
- ^ '$Id: JavaJUnitTests.st,v 1.1 2011-08-18 19:06:53 vrany Exp $'
+ ^ '§Id§'
! !
+